From 10778cdd6be8347c46a76130c6c0cd0a99e454cb Mon Sep 17 00:00:00 2001
From: fwannmacher <fwannmacher@debian-PC>
Date: Sun, 24 Jul 2016 15:13:10 -0300
Subject: [PATCH] - Converted CardImpl.cardNumber from int to String - Fixed
 Issue #1953 - Fixed Issue #1914 - Fixed Issue #739

---
 .../collection/viewer/MageBook.java           |  14 +-
 .../NaturalOrderCardNumberComparator.java     |  44 ++++
 .../client/util/NaturalOrderComparator.java   | 188 ++++++++++++++++++
 .../dl/sources/MagicCardsImageSource.java     |   2 +-
 .../card/dl/sources/MtgImageSource.java       |   2 +-
 .../dl/sources/MythicspoilerComSource.java    |   2 +-
 .../dl/sources/WizardCardsImageSource.java    |  18 +-
 .../plugins/card/images/CardDownloadData.java |  10 +-
 .../plugins/card/images/DownloadPictures.java |  16 +-
 .../mage/plugins/card/images/ImageCache.java  |   8 +-
 .../client/game/TokensMtgImageSourceTest.java |   8 +-
 Mage.Common/src/mage/view/CardView.java       |  16 +-
 Mage.Common/src/mage/view/SimpleCardView.java |   8 +-
 .../sets/ajanivsnicolbolas/AjaniVengeant.java |   2 +-
 .../sets/ajanivsnicolbolas/AjanisMantra.java  |   2 +-
 .../ajanivsnicolbolas/AjanisPridemate.java    |   2 +-
 .../ajanivsnicolbolas/BehemothSledge.java     |   2 +-
 .../ajanivsnicolbolas/BlazingSpecter.java     |   2 +-
 .../BrackwaterElemental.java                  |   2 +-
 .../sets/ajanivsnicolbolas/Briarhorn.java     |   2 +-
 .../sets/ajanivsnicolbolas/CanyonWildcat.java |   2 +-
 .../sets/ajanivsnicolbolas/Countersquall.java |   2 +-
 .../ajanivsnicolbolas/CruelUltimatum.java     |   2 +-
 .../CrumblingNecropolis.java                  |   2 +-
 .../sets/ajanivsnicolbolas/DeepAnalysis.java  |   2 +-
 .../sets/ajanivsnicolbolas/DimirCutpurse.java |   2 +-
 .../sets/ajanivsnicolbolas/ElderMastery.java  |   2 +-
 .../sets/ajanivsnicolbolas/EssenceWarden.java |   2 +-
 .../sets/ajanivsnicolbolas/EvolvingWilds.java |   2 +-
 .../sets/ajanivsnicolbolas/FireFieldOgre.java |   2 +-
 .../sets/ajanivsnicolbolas/FiremaneAngel.java |   2 +-
 .../ajanivsnicolbolas/FleetfootPanther.java   |   2 +-
 .../ajanivsnicolbolas/GraypeltRefuge.java     |   2 +-
 .../ajanivsnicolbolas/GrazingGladehart.java   |   2 +-
 .../sets/ajanivsnicolbolas/GriffinGuide.java  |   2 +-
 .../sets/ajanivsnicolbolas/GrixisCharm.java   |   2 +-
 .../ajanivsnicolbolas/HellfireMongrel.java    |   2 +-
 .../ajanivsnicolbolas/IcyManipulator.java     |   2 +-
 .../ajanivsnicolbolas/IgneousPouncer.java     |   2 +-
 .../mage/sets/ajanivsnicolbolas/JadeMage.java |   2 +-
 .../ajanivsnicolbolas/JhessianZombies.java    |   2 +-
 .../sets/ajanivsnicolbolas/JungleShrine.java  |   2 +-
 .../sets/ajanivsnicolbolas/KazanduRefuge.java |   2 +-
 .../mage/sets/ajanivsnicolbolas/KirdApe.java  |   2 +-
 .../ajanivsnicolbolas/LeadTheStampede.java    |   2 +-
 .../ajanivsnicolbolas/LightningHelix.java     |   2 +-
 .../mage/sets/ajanivsnicolbolas/LoamLion.java |   2 +-
 .../ajanivsnicolbolas/LoxodonHierarch.java    |   2 +-
 .../ajanivsnicolbolas/MarisisTwinclaws.java   |   2 +-
 .../sets/ajanivsnicolbolas/MorgueToad.java    |   2 +-
 .../mage/sets/ajanivsnicolbolas/Moroii.java   |   2 +-
 .../ajanivsnicolbolas/NacatlHuntPride.java    |   2 +-
 .../sets/ajanivsnicolbolas/NayaCharm.java     |   2 +-
 .../NicolBolasPlaneswalker.java               |   2 +-
 .../ajanivsnicolbolas/NightscapeFamiliar.java |   2 +-
 .../ajanivsnicolbolas/ObeliskOfGrixis.java    |   2 +-
 .../sets/ajanivsnicolbolas/PainSuffering.java |   2 +-
 .../sets/ajanivsnicolbolas/PrideOfLions.java  |   2 +-
 .../ajanivsnicolbolas/ProfaneCommand.java     |   2 +-
 .../ajanivsnicolbolas/QasaliPridemage.java    |   2 +-
 .../mage/sets/ajanivsnicolbolas/Recoil.java   |   2 +-
 .../ajanivsnicolbolas/RecumbentBliss.java     |   2 +-
 .../mage/sets/ajanivsnicolbolas/RiseFall.java |   2 +-
 .../sets/ajanivsnicolbolas/RuptureSpire.java  |   2 +-
 .../sets/ajanivsnicolbolas/SapseepForest.java |   2 +-
 .../ajanivsnicolbolas/SearingMeditation.java  |   2 +-
 .../sets/ajanivsnicolbolas/Shriekmaw.java     |   2 +-
 .../sets/ajanivsnicolbolas/SlaveOfBolas.java  |   2 +-
 .../ajanivsnicolbolas/SlaveringNulls.java     |   2 +-
 .../sets/ajanivsnicolbolas/SpiteMalice.java   |   2 +-
 .../sets/ajanivsnicolbolas/Spitemare.java     |   2 +-
 .../ajanivsnicolbolas/SteamcoreWeird.java     |   2 +-
 .../ajanivsnicolbolas/SurveillingSprite.java  |   2 +-
 .../sets/ajanivsnicolbolas/SylvanBounty.java  |   2 +-
 .../sets/ajanivsnicolbolas/SylvanRanger.java  |   2 +-
 .../TerramorphicExpanse.java                  |   2 +-
 .../ajanivsnicolbolas/TitanicUltimatum.java   |   2 +-
 .../sets/ajanivsnicolbolas/Undermine.java     |   2 +-
 .../sets/ajanivsnicolbolas/VaporSnag.java     |   2 +-
 .../VituGhaziTheCityTree.java                 |   2 +-
 .../sets/ajanivsnicolbolas/WildNacatl.java    |   2 +-
 .../sets/ajanivsnicolbolas/WoollyThoctar.java |   2 +-
 .../mage/sets/alliances/AesthirGlider2.java   |   2 +-
 .../sets/alliances/AgentOfStromgald2.java     |   2 +-
 .../mage/sets/alliances/ArcaneDenial1.java    |   2 +-
 .../mage/sets/alliances/ArcaneDenial2.java    |   2 +-
 .../src/mage/sets/alliances/Astrolabe1.java   |   2 +-
 .../src/mage/sets/alliances/Astrolabe2.java   |   2 +-
 .../mage/sets/alliances/BalduvianDead.java    |   2 +-
 .../sets/alliances/BalduvianWarMakers2.java   |   2 +-
 .../mage/sets/alliances/BountyOfTheHunt.java  |   2 +-
 .../mage/sets/alliances/CarrierPigeons2.java  |   2 +-
 .../mage/sets/alliances/DeadlyInsect1.java    |   2 +-
 .../mage/sets/alliances/DeadlyInsect2.java    |   2 +-
 .../src/mage/sets/alliances/ElvishBard.java   |   2 +-
 .../mage/sets/alliances/ElvishRanger1.java    |   2 +-
 .../mage/sets/alliances/ElvishRanger2.java    |   2 +-
 .../mage/sets/alliances/EnslavedScout2.java   |   2 +-
 .../src/mage/sets/alliances/FalseDemise1.java |   2 +-
 .../src/mage/sets/alliances/FalseDemise2.java |   2 +-
 .../mage/sets/alliances/FeastOrFamine1.java   |   2 +-
 .../mage/sets/alliances/FeastOrFamine2.java   |   2 +-
 .../mage/sets/alliances/FeveredStrength2.java |   2 +-
 .../mage/sets/alliances/FloodwaterDam.java    |   2 +-
 .../sets/alliances/GorillaBerserkers2.java    |   2 +-
 .../sets/alliances/GorillaChieftain1.java     |   2 +-
 .../sets/alliances/GorillaChieftain2.java     |   2 +-
 .../mage/sets/alliances/GorillaShaman2.java   |   2 +-
 .../mage/sets/alliances/GorillaWarCry1.java   |   2 +-
 .../mage/sets/alliances/GorillaWarCry2.java   |   2 +-
 .../sets/alliances/GuerrillaTactics1.java     |   2 +-
 .../sets/alliances/GuerrillaTactics2.java     |   2 +-
 .../sets/alliances/InsidiousBookworms2.java   |   2 +-
 .../mage/sets/alliances/KjeldoranOutpost.java |   2 +-
 .../mage/sets/alliances/LakeOfTheDead.java    |   2 +-
 .../sets/alliances/LimDulsHighGuard2.java     |   2 +-
 .../src/mage/sets/alliances/LimDulsVault.java |   2 +-
 .../sets/alliances/PhyrexianWarBeast2.java    |   2 +-
 .../src/mage/sets/alliances/Pillage.java      |   2 +-
 .../mage/sets/alliances/Reinforcements1.java  |   2 +-
 .../mage/sets/alliances/Reinforcements2.java  |   2 +-
 .../src/mage/sets/alliances/Reprisal1.java    |   2 +-
 .../src/mage/sets/alliances/Reprisal2.java    |   2 +-
 .../sets/alliances/RitualOfTheMachine.java    |   2 +-
 .../mage/sets/alliances/RoyalHerbalist2.java  |   2 +-
 .../mage/sets/alliances/SoldeviAdnate2.java   |   2 +-
 .../src/mage/sets/alliances/SoldeviSage2.java |   2 +-
 .../mage/sets/alliances/StormCauldron.java    |   2 +-
 .../src/mage/sets/alliances/StormCrow1.java   |   2 +-
 .../src/mage/sets/alliances/StormCrow2.java   |   2 +-
 .../src/mage/sets/alliances/StormShaman2.java |   2 +-
 .../mage/sets/alliances/SwampMosquito2.java   |   2 +-
 .../mage/sets/alliances/ThawingGlaciers.java  |   2 +-
 .../src/mage/sets/alliances/ThoughtLash.java  |   2 +-
 .../mage/sets/alliances/VisceridArmor1.java   |   2 +-
 .../mage/sets/alliances/VisceridArmor2.java   |   2 +-
 .../mage/sets/alliances/WanderingMage.java    |   2 +-
 .../src/mage/sets/alliances/WhipVine2.java    |   2 +-
 .../src/mage/sets/alliances/WildAesthir1.java |   2 +-
 .../src/mage/sets/alliances/WildAesthir2.java |   2 +-
 .../sets/alliances/YavimayaAncients1.java     |   2 +-
 .../sets/alliances/YavimayaAncients2.java     |   2 +-
 .../AbyssalGatekeeper.java                    |   2 +-
 .../AbyssalSpecter.java                       |   2 +-
 .../AkromaAngelOfWrath.java                   |   2 +-
 .../AngelOfMercy.java                         |   2 +-
 .../AngelicBenediction.java                   |   2 +-
 .../anthologydivinevsdemonic/AngelicPage.java |   2 +-
 .../AngelicProtector.java                     |   2 +-
 .../AngelsFeather.java                        |   2 +-
 .../anthologydivinevsdemonic/Angelsong.java   |   2 +-
 .../anthologydivinevsdemonic/BarrenMoor.java  |   2 +-
 .../BarterInBlood.java                        |   2 +-
 .../anthologydivinevsdemonic/BreedingPit.java |   2 +-
 .../anthologydivinevsdemonic/CacklingImp.java |   2 +-
 .../ChargingPaladin.java                      |   2 +-
 .../ConsumeSpirit.java                        |   2 +-
 .../anthologydivinevsdemonic/Corrupt.java     |   2 +-
 .../anthologydivinevsdemonic/CruelEdict.java  |   2 +-
 .../DaggerclawImp.java                        |   2 +-
 .../DarkBanishing.java                        |   2 +-
 .../anthologydivinevsdemonic/DarkRitual.java  |   2 +-
 .../DemonicTutor.java                         |   2 +-
 .../anthologydivinevsdemonic/DemonsHorn.java  |   2 +-
 .../DemonsJester.java                         |   2 +-
 .../sets/anthologydivinevsdemonic/Duress.java |   2 +-
 .../anthologydivinevsdemonic/DuskImp.java     |   2 +-
 .../FaithsFetters.java                        |   2 +-
 .../anthologydivinevsdemonic/FallenAngel.java |   2 +-
 .../anthologydivinevsdemonic/FoulImp.java     |   2 +-
 .../HealingSalve.java                         |   2 +-
 .../IcatianPriest.java                        |   2 +-
 .../anthologydivinevsdemonic/KuroPitlord.java |   2 +-
 .../LordOfThePit.java                         |   2 +-
 .../LuminousAngel.java                        |   2 +-
 .../MarbleDiamond.java                        |   2 +-
 .../OniPossession.java                        |   2 +-
 .../OtherworldlyJourney.java                  |   2 +-
 .../OvereagerApprentice.java                  |   2 +-
 .../anthologydivinevsdemonic/Pacifism.java    |   2 +-
 .../PromiseOfPower.java                       |   2 +-
 .../anthologydivinevsdemonic/ReiverDemon.java |   2 +-
 .../ReyaDawnbringer.java                      |   2 +-
 .../RighteousCause.java                       |   2 +-
 .../SecludedSteppe.java                       |   2 +-
 .../SerraAdvocate.java                        |   2 +-
 .../anthologydivinevsdemonic/SerraAngel.java  |   2 +-
 .../anthologydivinevsdemonic/SerrasBoon.java  |   2 +-
 .../SerrasEmbrace.java                        |   2 +-
 .../anthologydivinevsdemonic/SootImp.java     |   2 +-
 .../anthologydivinevsdemonic/Souldrinker.java |   2 +-
 .../StinkweedImp.java                         |   2 +-
 .../SustainerOfTheRealm.java                  |   2 +-
 .../TwilightShepherd.java                     |   2 +-
 .../UnholyStrength.java                       |   2 +-
 .../VenerableMonk.java                        |   2 +-
 .../AkkiCoalflinger.java                      |   2 +-
 .../AllosaurusRider.java                      |   2 +-
 .../AmbushCommander.java                      |   2 +-
 .../BoggartShenanigans.java                   |   2 +-
 .../anthologyelvesvsgoblins/Clickslither.java |   2 +-
 .../ElvishEulogist.java                       |   2 +-
 .../ElvishHarbinger.java                      |   2 +-
 .../ElvishPromenade.java                      |   2 +-
 .../ElvishWarrior.java                        |   2 +-
 .../EmberwildeAugur.java                      |   2 +-
 .../FlamewaveInvoker.java                     |   2 +-
 .../ForgottenCave.java                        |   2 +-
 .../GempalmIncinerator.java                   |   2 +-
 .../GempalmStrider.java                       |   2 +-
 .../anthologyelvesvsgoblins/GiantGrowth.java  |   2 +-
 .../GoblinBurrows.java                        |   2 +-
 .../anthologyelvesvsgoblins/GoblinCohort.java |   2 +-
 .../anthologyelvesvsgoblins/GoblinMatron.java |   2 +-
 .../GoblinRingleader.java                     |   2 +-
 .../GoblinSledder.java                        |   2 +-
 .../GoblinWarchief.java                       |   2 +-
 .../anthologyelvesvsgoblins/Harmonize.java    |   2 +-
 .../anthologyelvesvsgoblins/HeedlessOne.java  |   2 +-
 .../IbHalfheartGoblinTactician.java           |   2 +-
 .../ImperiousPerfect.java                     |   2 +-
 .../LlanowarElves.java                        |   2 +-
 .../LysAlanaHuntmaster.java                   |   2 +-
 .../anthologyelvesvsgoblins/MoggFanatic.java  |   2 +-
 .../MoggWarMarshal.java                       |   2 +-
 .../MoongloveExtract.java                     |   2 +-
 .../MudbuttonTorchrunner.java                 |   2 +-
 .../anthologyelvesvsgoblins/RagingGoblin.java |   2 +-
 .../anthologyelvesvsgoblins/RecklessOne.java  |   2 +-
 .../SiegeGangCommander.java                   |   2 +-
 .../SkirkDrillSergeant.java                   |   2 +-
 .../SkirkFireMarshal.java                     |   2 +-
 .../SkirkProspector.java                      |   2 +-
 .../anthologyelvesvsgoblins/SkirkShaman.java  |   2 +-
 .../SlateOfAncestry.java                      |   2 +-
 .../SpittingEarth.java                        |   2 +-
 .../StonewoodInvoker.java                     |   2 +-
 .../SylvanMessenger.java                      |   2 +-
 .../anthologyelvesvsgoblins/TarPitcher.java   |   2 +-
 .../sets/anthologyelvesvsgoblins/Tarfire.java |   2 +-
 .../TimberwatchElf.java                       |   2 +-
 .../TranquilThicket.java                      |   2 +-
 .../VoiceOfTheWoods.java                      |   2 +-
 .../anthologyelvesvsgoblins/Wellwisher.java   |   2 +-
 .../anthologyelvesvsgoblins/Wildsize.java     |   2 +-
 .../WirewoodHerald.java                       |   2 +-
 .../WirewoodLodge.java                        |   2 +-
 .../WirewoodSymbiote.java                     |   2 +-
 .../anthologyelvesvsgoblins/WoodElves.java    |   2 +-
 .../WrensRunVanquisher.java                   |   2 +-
 .../anthologygarrukvsliliana/AlbinoTroll.java |   2 +-
 .../anthologygarrukvsliliana/BadMoon.java     |   2 +-
 .../BaskingRootwalla.java                     |   2 +-
 .../anthologygarrukvsliliana/BeastAttack.java |   2 +-
 .../anthologygarrukvsliliana/Blastoderm.java  |   2 +-
 .../anthologygarrukvsliliana/Corrupt.java     |   2 +-
 .../Deathgreeter.java                         |   2 +-
 .../DrudgeSkeletons.java                      |   2 +-
 .../ElephantGuide.java                        |   2 +-
 .../anthologygarrukvsliliana/Enslave.java     |   2 +-
 .../FaerieMacabre.java                        |   2 +-
 .../FleshbagMarauder.java                     |   2 +-
 .../GarrukWildspeaker.java                    |   2 +-
 .../GenjuOfTheCedars.java                     |   2 +-
 .../GenjuOfTheFens.java                       |   2 +-
 .../GhostLitStalker.java                      |   2 +-
 .../anthologygarrukvsliliana/GiantGrowth.java |   2 +-
 .../anthologygarrukvsliliana/Harmonize.java   |   2 +-
 .../anthologygarrukvsliliana/HideousEnd.java  |   2 +-
 .../HowlingBanshee.java                       |   2 +-
 .../anthologygarrukvsliliana/IchorSlick.java  |   2 +-
 .../IndrikStomphowler.java                    |   2 +-
 .../anthologygarrukvsliliana/Invigorate.java  |   2 +-
 .../KeeningBanshee.java                       |   2 +-
 .../KrosanTusker.java                         |   2 +-
 .../anthologygarrukvsliliana/Lignify.java     |   2 +-
 .../anthologygarrukvsliliana/LilianaVess.java |   2 +-
 .../anthologygarrukvsliliana/Mutilate.java    |   2 +-
 .../anthologygarrukvsliliana/NaturesLore.java |   2 +-
 .../anthologygarrukvsliliana/Overrun.java     |   2 +-
 .../PhyrexianRager.java                       |   2 +-
 .../PlatedSlagwurm.java                       |   2 +-
 .../PollutedMire.java                         |   2 +-
 .../sets/anthologygarrukvsliliana/Rancor.java |   2 +-
 .../RavenousBaloth.java                       |   2 +-
 .../RavenousRats.java                         |   2 +-
 .../RiseFromTheGrave.java                     |   2 +-
 .../RudeAwakening.java                        |   2 +-
 .../SerratedArrows.java                       |   2 +-
 .../anthologygarrukvsliliana/SignInBlood.java |   2 +-
 .../SkeletalVampire.java                      |   2 +-
 .../SlipperyKarst.java                        |   2 +-
 .../anthologygarrukvsliliana/SnuffOut.java    |   2 +-
 .../StampedingWildebeests.java                |   2 +-
 .../TendrilsOfCorruption.java                 |   2 +-
 .../TreetopVillage.java                       |   2 +-
 .../TwistedAbomination.java                   |   2 +-
 .../UrborgSyphonMage.java                     |   2 +-
 .../anthologygarrukvsliliana/VampireBats.java |   2 +-
 .../ViciousHunger.java                        |   2 +-
 .../anthologygarrukvsliliana/VineTrellis.java |   2 +-
 .../anthologygarrukvsliliana/WallOfBone.java  |   2 +-
 .../anthologygarrukvsliliana/WildMongrel.java |   2 +-
 .../anthologygarrukvsliliana/Windstorm.java   |   2 +-
 .../WirewoodSavage.java                       |   2 +-
 .../anthologyjacevschandra/AEthersnipe.java   |   2 +-
 .../anthologyjacevschandra/AirElemental.java  |   2 +-
 .../AncestralVision.java                      |   2 +-
 .../anthologyjacevschandra/BottleGnomes.java  |   2 +-
 .../BrineElemental.java                       |   2 +-
 .../anthologyjacevschandra/ChandraNalaar.java |   2 +-
 .../ChartoothCougar.java                      |   2 +-
 .../anthologyjacevschandra/Condescend.java    |   2 +-
 .../anthologyjacevschandra/ConeOfFlame.java   |   2 +-
 .../anthologyjacevschandra/Counterspell.java  |   2 +-
 .../sets/anthologyjacevschandra/Daze.java     |   2 +-
 .../anthologyjacevschandra/Demonfire.java     |   2 +-
 .../ErrantEphemeron.java                      |   2 +-
 .../anthologyjacevschandra/FactOrFiction.java |   2 +-
 .../anthologyjacevschandra/FathomSeer.java    |   2 +-
 .../sets/anthologyjacevschandra/Fireball.java |   2 +-
 .../anthologyjacevschandra/Fireblast.java     |   2 +-
 .../sets/anthologyjacevschandra/Firebolt.java |   2 +-
 .../anthologyjacevschandra/Fireslinger.java   |   2 +-
 .../anthologyjacevschandra/FlameJavelin.java  |   2 +-
 .../FlamekinBrawler.java                      |   2 +-
 .../FlametongueKavu.java                      |   2 +-
 .../FlamewaveInvoker.java                     |   2 +-
 .../FledglingMawcor.java                      |   2 +-
 .../anthologyjacevschandra/FurnaceWhelp.java  |   2 +-
 .../sets/anthologyjacevschandra/Guile.java    |   2 +-
 .../sets/anthologyjacevschandra/Gush.java     |   2 +-
 .../anthologyjacevschandra/Hostility.java     |   2 +-
 .../anthologyjacevschandra/Incinerate.java    |   2 +-
 .../anthologyjacevschandra/IngotChewer.java   |   2 +-
 .../InnerFlameAcolyte.java                    |   2 +-
 .../anthologyjacevschandra/JaceBeleren.java   |   2 +-
 .../KeldonMegaliths.java                      |   2 +-
 .../sets/anthologyjacevschandra/MagmaJet.java |   2 +-
 .../sets/anthologyjacevschandra/ManOWar.java  |   2 +-
 .../anthologyjacevschandra/MartyrOfFrost.java |   2 +-
 .../anthologyjacevschandra/MindStone.java     |   2 +-
 .../anthologyjacevschandra/Mulldrifter.java   |   2 +-
 .../sets/anthologyjacevschandra/Ophidian.java |   2 +-
 .../anthologyjacevschandra/OxiddaGolem.java   |   2 +-
 .../anthologyjacevschandra/PyreCharger.java   |   2 +-
 .../QuicksilverDragon.java                    |   2 +-
 .../RakdosPitDragon.java                      |   2 +-
 .../sets/anthologyjacevschandra/Repulse.java  |   2 +-
 .../RiftwingCloudskate.java                   |   2 +-
 .../anthologyjacevschandra/SealOfFire.java    |   2 +-
 .../SlithFirewalker.java                      |   2 +-
 .../SoulbrightFlamekin.java                   |   2 +-
 .../anthologyjacevschandra/SpireGolem.java    |   2 +-
 .../WaterspoutDjinn.java                      |   2 +-
 .../anthologyjacevschandra/Willbender.java    |   2 +-
 .../mage/sets/antiquities/AmuletOfKroog.java  |   2 +-
 .../sets/antiquities/ArmageddonClock.java     |   2 +-
 .../mage/sets/antiquities/AshnodsAltar.java   |   2 +-
 .../sets/antiquities/AshnodsTransmogrant.java |   2 +-
 Mage.Sets/src/mage/sets/antiquities/Atog.java |   2 +-
 .../CircleOfProtectionArtifacts.java          |   2 +-
 .../mage/sets/antiquities/ClockworkAvian.java |   2 +-
 .../sets/antiquities/ColossusOfSardia.java    |   2 +-
 .../src/mage/sets/antiquities/CoralHelm.java  |   2 +-
 .../src/mage/sets/antiquities/Crumble.java    |   2 +-
 .../src/mage/sets/antiquities/Detonate.java   |   2 +-
 .../mage/sets/antiquities/DragonEngine.java   |   2 +-
 .../sets/antiquities/DwarvenWeaponsmith.java  |   2 +-
 .../mage/sets/antiquities/FeldonsCane.java    |   2 +-
 .../mage/sets/antiquities/GaeasAvenger.java   |   2 +-
 .../mage/sets/antiquities/GoblinArtisans.java |   2 +-
 .../sets/antiquities/GrapeshotCatapult.java   |   2 +-
 .../mage/sets/antiquities/HurkylsRecall.java  |   2 +-
 .../src/mage/sets/antiquities/JalumTome.java  |   2 +-
 .../sets/antiquities/MartyrsOfKorlis.java     |   2 +-
 .../src/mage/sets/antiquities/Millstone.java  |   2 +-
 .../sets/antiquities/MishrasFactory1.java     |   2 +-
 .../sets/antiquities/MishrasFactory2.java     |   2 +-
 .../sets/antiquities/MishrasFactory3.java     |   2 +-
 .../sets/antiquities/MishrasFactory4.java     |   2 +-
 .../sets/antiquities/MishrasWorkshop.java     |   2 +-
 .../sets/antiquities/ObeliskOfUndoing.java    |   2 +-
 .../src/mage/sets/antiquities/Onulet.java     |   2 +-
 .../mage/sets/antiquities/Ornithopter.java    |   2 +-
 .../src/mage/sets/antiquities/PrimalClay.java |   2 +-
 .../src/mage/sets/antiquities/Rakalite.java   |   2 +-
 .../mage/sets/antiquities/RocketLauncher.java |   2 +-
 .../mage/sets/antiquities/Shatterstorm.java   |   2 +-
 .../mage/sets/antiquities/StaffOfZegon.java   |   2 +-
 .../src/mage/sets/antiquities/StripMine1.java |   2 +-
 .../src/mage/sets/antiquities/StripMine2.java |   2 +-
 .../src/mage/sets/antiquities/StripMine3.java |   2 +-
 .../src/mage/sets/antiquities/StripMine4.java |   2 +-
 .../src/mage/sets/antiquities/SuChi.java      |   2 +-
 .../sets/antiquities/TawnossWeaponry.java     |   2 +-
 .../src/mage/sets/antiquities/TheRack.java    |   2 +-
 .../mage/sets/antiquities/TitaniasSong.java   |   2 +-
 .../src/mage/sets/antiquities/Triskelion.java |   2 +-
 .../src/mage/sets/antiquities/UrzasMine1.java |   2 +-
 .../src/mage/sets/antiquities/UrzasMine2.java |   2 +-
 .../src/mage/sets/antiquities/UrzasMine3.java |   2 +-
 .../src/mage/sets/antiquities/UrzasMine4.java |   2 +-
 .../src/mage/sets/antiquities/UrzasMiter.java |   2 +-
 .../sets/antiquities/UrzasPowerPlant1.java    |   2 +-
 .../sets/antiquities/UrzasPowerPlant2.java    |   2 +-
 .../sets/antiquities/UrzasPowerPlant3.java    |   2 +-
 .../sets/antiquities/UrzasPowerPlant4.java    |   2 +-
 .../mage/sets/antiquities/UrzasTower1.java    |   2 +-
 .../mage/sets/antiquities/UrzasTower2.java    |   2 +-
 .../mage/sets/antiquities/UrzasTower3.java    |   2 +-
 .../mage/sets/antiquities/UrzasTower4.java    |   2 +-
 .../mage/sets/antiquities/WallOfSpears.java   |   2 +-
 .../sets/antiquities/XenicPoltergeist.java    |   2 +-
 .../mage/sets/antiquities/YawgmothDemon.java  |   2 +-
 .../mage/sets/antiquities/YotianSoldier.java  |   2 +-
 .../src/mage/sets/apocalypse/LastStand.java   |   2 +-
 .../mage/sets/apocalypse/PhyrexianRager.java  |   2 +-
 .../mage/sets/apocalypse/PropheticBolt.java   |   2 +-
 .../sets/apocalypse/WhirlpoolWarrior.java     |   2 +-
 .../src/mage/sets/arabiannights/Aladdin.java  |   2 +-
 .../mage/sets/arabiannights/AladdinsLamp.java |   2 +-
 .../mage/sets/arabiannights/AladdinsRing.java |   2 +-
 .../mage/sets/arabiannights/ArmyOfAllah2.java |   2 +-
 .../mage/sets/arabiannights/BirdMaiden1.java  |   2 +-
 .../mage/sets/arabiannights/BirdMaiden2.java  |   2 +-
 .../sets/arabiannights/BottleOfSuleiman.java  |   2 +-
 .../src/mage/sets/arabiannights/BrassMan.java |   2 +-
 .../sets/arabiannights/CityInABottle.java     |   2 +-
 .../mage/sets/arabiannights/CityOfBrass.java  |   2 +-
 .../sets/arabiannights/CuombajjWitches.java   |   2 +-
 .../src/mage/sets/arabiannights/Cyclone.java  |   2 +-
 .../sets/arabiannights/DancingScimitar.java   |   2 +-
 .../src/mage/sets/arabiannights/Dandan.java   |   2 +-
 .../src/mage/sets/arabiannights/Desert.java   |   2 +-
 .../sets/arabiannights/DesertTwister.java     |   2 +-
 .../mage/sets/arabiannights/EbonyHorse.java   |   2 +-
 .../sets/arabiannights/ElephantGraveyard.java |   2 +-
 .../mage/sets/arabiannights/ErgRaiders1.java  |   2 +-
 .../mage/sets/arabiannights/ErgRaiders2.java  |   2 +-
 .../mage/sets/arabiannights/ErhnamDjinn.java  |   2 +-
 .../sets/arabiannights/FishliverOil2.java     |   2 +-
 .../mage/sets/arabiannights/FlyingCarpet.java |   2 +-
 .../mage/sets/arabiannights/FlyingMen.java    |   2 +-
 .../mage/sets/arabiannights/GhazbanOgre.java  |   2 +-
 .../sets/arabiannights/GiantTortoise1.java    |   2 +-
 .../sets/arabiannights/GiantTortoise2.java    |   2 +-
 .../sets/arabiannights/HasranOgress1.java     |   2 +-
 .../sets/arabiannights/HasranOgress2.java     |   2 +-
 .../sets/arabiannights/IfhBiffEfreet.java     |   2 +-
 .../arabiannights/IslandFishJasconius.java    |   2 +-
 .../mage/sets/arabiannights/JandorsRing.java  |   2 +-
 .../sets/arabiannights/JandorsSaddlebags.java |   2 +-
 .../mage/sets/arabiannights/JununEfreet.java  |   2 +-
 .../mage/sets/arabiannights/KhabalGhoul.java  |   2 +-
 .../src/mage/sets/arabiannights/KirdApe.java  |   2 +-
 .../arabiannights/LibraryOfAlexandria.java    |   2 +-
 .../mage/sets/arabiannights/MijaeDjinn.java   |   2 +-
 .../sets/arabiannights/MoorishCavalry1.java   |   2 +-
 .../sets/arabiannights/MoorishCavalry2.java   |   2 +-
 .../src/mage/sets/arabiannights/NafsAsp2.java |   2 +-
 .../src/mage/sets/arabiannights/Oasis.java    |   2 +-
 .../mage/sets/arabiannights/Oubliette2.java   |   2 +-
 .../src/mage/sets/arabiannights/Piety2.java   |   2 +-
 .../arabiannights/RepentantBlacksmith.java    |   2 +-
 .../src/mage/sets/arabiannights/RukhEgg2.java |   2 +-
 .../mage/sets/arabiannights/Sandstorm.java    |   2 +-
 .../sets/arabiannights/SerendibDjinn.java     |   2 +-
 .../sets/arabiannights/SerendibEfreet.java    |   2 +-
 .../src/mage/sets/arabiannights/Sindbad.java  |   2 +-
 .../sets/arabiannights/SorceressQueen.java    |   2 +-
 .../arabiannights/StoneThrowingDevils2.java   |   2 +-
 .../mage/sets/arabiannights/WyluliWolf1.java  |   2 +-
 .../mage/sets/arabiannights/WyluliWolf2.java  |   2 +-
 .../mage/sets/arabiannights/YdwenEfreet.java  |   2 +-
 .../mage/sets/archenemy/AEtherSpellbomb.java  |   2 +-
 .../src/mage/sets/archenemy/AgonyWarp.java    |   2 +-
 .../mage/sets/archenemy/ArchitectsOfWill.java |   2 +-
 .../mage/sets/archenemy/ArmadilloCloak.java   |   2 +-
 .../mage/sets/archenemy/ArtisanOfKozilek.java |   2 +-
 .../mage/sets/archenemy/AvatarOfDiscord.java  |   2 +-
 .../mage/sets/archenemy/AzoriusSignet.java    |   2 +-
 .../src/mage/sets/archenemy/BarrenMoor.java   |   2 +-
 .../src/mage/sets/archenemy/BatwingBrume.java |   2 +-
 .../mage/sets/archenemy/BeaconOfUnrest.java   |   2 +-
 .../mage/sets/archenemy/BituminousBlast.java  |   2 +-
 .../src/mage/sets/archenemy/BogWitch.java     |   2 +-
 .../mage/sets/archenemy/BranchingBolt.java    |   2 +-
 .../mage/sets/archenemy/BreathOfDarigaaz.java |   2 +-
 .../mage/sets/archenemy/CemeteryReaper.java   |   2 +-
 .../sets/archenemy/ChameleonColossus.java     |   2 +-
 .../mage/sets/archenemy/ChandrasOutrage.java  |   2 +-
 .../mage/sets/archenemy/ColossalMight.java    |   2 +-
 .../sets/archenemy/CorpseConnoisseur.java     |   2 +-
 .../src/mage/sets/archenemy/DimirSignet.java  |   2 +-
 .../src/mage/sets/archenemy/DragonFodder.java |   2 +-
 .../src/mage/sets/archenemy/DragonWhelp.java  |   2 +-
 .../sets/archenemy/DragonspeakerShaman.java   |   2 +-
 .../mage/sets/archenemy/DreamstoneHedron.java |   2 +-
 .../mage/sets/archenemy/DregscapeZombie.java  |   2 +-
 .../src/mage/sets/archenemy/Duplicant.java    |   2 +-
 .../sets/archenemy/EtherswornShieldmage.java  |   2 +-
 .../sets/archenemy/EverflowingChalice.java    |   2 +-
 .../mage/sets/archenemy/ExtractorDemon.java   |   2 +-
 .../src/mage/sets/archenemy/FeralHydra.java   |   2 +-
 .../src/mage/sets/archenemy/Fertilid.java     |   2 +-
 .../mage/sets/archenemy/FesteringGoblin.java  |   2 +-
 .../sets/archenemy/FieldmistBorderpost.java   |   2 +-
 .../src/mage/sets/archenemy/FierceEmpath.java |   2 +-
 .../src/mage/sets/archenemy/Fireball.java     |   2 +-
 .../mage/sets/archenemy/FiresOfYavimaya.java  |   2 +-
 .../mage/sets/archenemy/FlameblastDragon.java |   2 +-
 Mage.Sets/src/mage/sets/archenemy/Fog.java    |   2 +-
 .../mage/sets/archenemy/ForgottenAncient.java |   2 +-
 .../src/mage/sets/archenemy/FurnaceWhelp.java |   2 +-
 .../mage/sets/archenemy/GathanRaiders.java    |   2 +-
 .../mage/sets/archenemy/GraypeltRefuge.java   |   2 +-
 .../src/mage/sets/archenemy/GruulSignet.java  |   2 +-
 .../src/mage/sets/archenemy/Harmonize.java    |   2 +-
 .../mage/sets/archenemy/HellkiteCharger.java  |   2 +-
 .../mage/sets/archenemy/HeroesReunion.java    |   2 +-
 .../src/mage/sets/archenemy/HuntingMoa.java   |   2 +-
 .../sets/archenemy/IncrementalBlight.java     |   2 +-
 .../mage/sets/archenemy/InfectiousHorror.java |   2 +-
 .../src/mage/sets/archenemy/InfernoTrap.java  |   2 +-
 Mage.Sets/src/mage/sets/archenemy/Infest.java |   2 +-
 .../src/mage/sets/archenemy/Juggernaut.java   |   2 +-
 .../sets/archenemy/KaervekTheMerciless.java   |   2 +-
 .../sets/archenemy/KamahlFistOfKrosa.java     |   2 +-
 .../mage/sets/archenemy/KazanduRefuge.java    |   2 +-
 .../src/mage/sets/archenemy/KhalniGarden.java |   2 +-
 .../mage/sets/archenemy/KilnmouthDragon.java  |   2 +-
 .../src/mage/sets/archenemy/KrosanTusker.java |   2 +-
 .../src/mage/sets/archenemy/KrosanVerge.java  |   2 +-
 .../src/mage/sets/archenemy/LeafGilder.java   |   2 +-
 .../src/mage/sets/archenemy/LeoninAbunas.java |   2 +-
 .../mage/sets/archenemy/LightningGreaves.java |   2 +-
 .../mage/sets/archenemy/LlanowarReborn.java   |   2 +-
 .../mage/sets/archenemy/LodestoneGolem.java   |   2 +-
 .../mage/sets/archenemy/MagisterSphinx.java   |   2 +-
 .../sets/archenemy/MarchOfTheMachines.java    |   2 +-
 .../mage/sets/archenemy/MasterTransmuter.java |   2 +-
 .../src/mage/sets/archenemy/Metallurgeon.java |   2 +-
 .../sets/archenemy/MistveinBorderpost.java    |   2 +-
 .../sets/archenemy/MolimoMaroSorcerer.java    |   2 +-
 .../mage/sets/archenemy/MosswortBridge.java   |   2 +-
 .../mage/sets/archenemy/ObeliskOfEsper.java   |   2 +-
 .../src/mage/sets/archenemy/OblivionRing.java |   2 +-
 .../src/mage/sets/archenemy/PaleRecluse.java  |   2 +-
 .../src/mage/sets/archenemy/PathToExile.java  |   2 +-
 .../src/mage/sets/archenemy/Plummet.java      |   2 +-
 .../mage/sets/archenemy/PrimalCommand.java    |   2 +-
 .../mage/sets/archenemy/RakdosCarnarium.java  |   2 +-
 .../mage/sets/archenemy/RakdosGuildmage.java  |   2 +-
 .../src/mage/sets/archenemy/RakdosSignet.java |   2 +-
 Mage.Sets/src/mage/sets/archenemy/Rancor.java |   2 +-
 .../src/mage/sets/archenemy/Reanimate.java    |   2 +-
 .../sets/archenemy/ReassemblingSkeleton.java  |   2 +-
 .../sets/archenemy/RyuseiTheFallingStar.java  |   2 +-
 .../mage/sets/archenemy/SakuraTribeElder.java |   2 +-
 .../mage/sets/archenemy/SanctumGargoyle.java  |   2 +-
 .../mage/sets/archenemy/SavageTwister.java    |   2 +-
 .../mage/sets/archenemy/ScionOfDarkness.java  |   2 +-
 .../mage/sets/archenemy/SecludedSteppe.java   |   2 +-
 .../src/mage/sets/archenemy/SeethingSong.java |   2 +-
 .../sets/archenemy/SelesnyaGuildmage.java     |   2 +-
 .../sets/archenemy/ShinenOfLifesRoar.java     |   2 +-
 .../src/mage/sets/archenemy/Shriekmaw.java    |   2 +-
 .../src/mage/sets/archenemy/SignInBlood.java  |   2 +-
 .../mage/sets/archenemy/SkirkMarauder.java    |   2 +-
 .../sets/archenemy/SorcerersStrongbox.java    |   2 +-
 .../src/mage/sets/archenemy/SpiderUmbra.java  |   2 +-
 .../src/mage/sets/archenemy/SunDroplet.java   |   2 +-
 .../mage/sets/archenemy/SunderingTitan.java   |   2 +-
 .../mage/sets/archenemy/SynodCenturion.java   |   2 +-
 .../mage/sets/archenemy/TaureanMauler.java    |   2 +-
 .../src/mage/sets/archenemy/Terminate.java    |   2 +-
 .../sets/archenemy/TerramorphicExpanse.java   |   2 +-
 .../mage/sets/archenemy/TheloniteHermit.java  |   2 +-
 .../src/mage/sets/archenemy/ThranDynamo.java  |   2 +-
 .../src/mage/sets/archenemy/Thunderstaff.java |   2 +-
 .../mage/sets/archenemy/TorrentOfSouls.java   |   2 +-
 .../mage/sets/archenemy/TranquilThicket.java  |   2 +-
 .../sets/archenemy/TwistedAbomination.java    |   2 +-
 .../mage/sets/archenemy/TwoHeadedDragon.java  |   2 +-
 .../src/mage/sets/archenemy/UnbenderTine.java |   2 +-
 Mage.Sets/src/mage/sets/archenemy/Unmake.java |   2 +-
 .../mage/sets/archenemy/UrborgSyphonMage.java |   2 +-
 .../sets/archenemy/VerdelothTheAncient.java   |   2 +-
 .../sets/archenemy/VituGhaziTheCityTree.java  |   2 +-
 .../mage/sets/archenemy/VolcanicFallout.java  |   2 +-
 .../src/mage/sets/archenemy/WallOfRoots.java  |   2 +-
 .../src/mage/sets/archenemy/Watchwolf.java    |   2 +-
 .../mage/sets/archenemy/WickerboughElder.java |   2 +-
 .../sets/archenemy/ZombieInfestation.java     |   2 +-
 .../src/mage/sets/archenemy/Zombify.java      |   2 +-
 .../mage/sets/arenaleague/ArcLightning.java   |   2 +-
 .../mage/sets/arenaleague/Bonesplitter.java   |   2 +-
 .../src/mage/sets/arenaleague/Castigate.java  |   2 +-
 .../src/mage/sets/arenaleague/Chill.java      |   2 +-
 .../mage/sets/arenaleague/CoilingOracle.java  |   2 +-
 .../mage/sets/arenaleague/CreepingMold.java   |   2 +-
 .../mage/sets/arenaleague/DarksteelIngot.java |   2 +-
 .../mage/sets/arenaleague/DauthiSlayer.java   |   2 +-
 .../mage/sets/arenaleague/DiabolicEdict.java  |   2 +-
 .../src/mage/sets/arenaleague/Disenchant.java |   2 +-
 .../src/mage/sets/arenaleague/Dismiss.java    |   2 +-
 .../src/mage/sets/arenaleague/Duress.java     |   2 +-
 .../sets/arenaleague/ElvishAberration.java    |   2 +-
 .../mage/sets/arenaleague/EmpyrialArmor.java  |   2 +-
 .../sets/arenaleague/EnlightenedTutor.java    |   2 +-
 .../src/mage/sets/arenaleague/Fireball.java   |   2 +-
 .../src/mage/sets/arenaleague/Fling.java      |   2 +-
 .../mage/sets/arenaleague/GaeasBlessing.java  |   2 +-
 .../sets/arenaleague/GenjuOfTheSpires.java    |   2 +-
 .../src/mage/sets/arenaleague/GlacialRay.java |   2 +-
 .../sets/arenaleague/KarnSilverGolem.java     |   2 +-
 .../src/mage/sets/arenaleague/ManOWar.java    |   2 +-
 .../src/mage/sets/arenaleague/ManaLeak.java   |   2 +-
 .../sets/arenaleague/OkinaNightwatch.java     |   2 +-
 .../src/mage/sets/arenaleague/Pillage.java    |   2 +-
 .../mage/sets/arenaleague/PouncingJaguar.java |   2 +-
 .../src/mage/sets/arenaleague/Rewind.java     |   2 +-
 .../mage/sets/arenaleague/SerumVisions.java   |   2 +-
 .../mage/sets/arenaleague/SkirkMarauder.java  |   2 +-
 .../sets/arenaleague/SkitteringSkirge.java    |   2 +-
 .../arenaleague/SkyknightLegionnaire.java     |   2 +-
 .../src/mage/sets/arenaleague/Stupor.java     |   2 +-
 .../mage/sets/arenaleague/SurgingFlame.java   |   2 +-
 .../sets/arenaleague/UktabiOrangutan.java     |   2 +-
 .../mage/sets/arenaleague/WeeDragonauts.java  |   2 +-
 .../mage/sets/avacynrestored/AngelicWall.java |   2 +-
 .../mage/sets/avacynrestored/AngelsMercy.java |   2 +-
 .../sets/avacynrestored/BoneSplinters.java    |   2 +-
 .../sets/avacynrestored/BorderlandRanger.java |   2 +-
 .../mage/sets/avacynrestored/Demolish.java    |   2 +-
 .../avacynrestored/FleetingDistraction.java   |   2 +-
 .../sets/battleforzendikar/AltarsReap.java    |   2 +-
 .../sets/battleforzendikar/Anticipate.java    |   2 +-
 .../sets/battleforzendikar/BoneSplinters.java |   2 +-
 .../mage/sets/battleforzendikar/Dispel.java   |   2 +-
 .../DragonmasterOutcast.java                  |   2 +-
 .../sets/battleforzendikar/DutifulReturn.java |   2 +-
 .../sets/battleforzendikar/EvolvingWilds.java |   2 +-
 .../battleforzendikar/FelidarSovereign.java   |   2 +-
 .../ForerunnerOfSlaughter.java                |   2 +-
 .../mage/sets/battleforzendikar/Forest1.java  |   2 +-
 .../mage/sets/battleforzendikar/Forest10.java |  51 +++++
 .../mage/sets/battleforzendikar/Forest2.java  |   2 +-
 .../mage/sets/battleforzendikar/Forest3.java  |   2 +-
 .../mage/sets/battleforzendikar/Forest4.java  |   2 +-
 .../mage/sets/battleforzendikar/Forest5.java  |   2 +-
 .../mage/sets/battleforzendikar/Forest6.java  |  51 +++++
 .../mage/sets/battleforzendikar/Forest7.java  |  51 +++++
 .../mage/sets/battleforzendikar/Forest8.java  |  51 +++++
 .../mage/sets/battleforzendikar/Forest9.java  |  51 +++++
 .../sets/battleforzendikar/GiantMantis.java   |   2 +-
 .../battleforzendikar/GoblinWarPaint.java     |   2 +-
 .../battleforzendikar/InspiredCharge.java     |   2 +-
 .../mage/sets/battleforzendikar/Island1.java  |   2 +-
 .../mage/sets/battleforzendikar/Island10.java |  51 +++++
 .../mage/sets/battleforzendikar/Island2.java  |   2 +-
 .../mage/sets/battleforzendikar/Island3.java  |   2 +-
 .../mage/sets/battleforzendikar/Island4.java  |   2 +-
 .../mage/sets/battleforzendikar/Island5.java  |   2 +-
 .../mage/sets/battleforzendikar/Island6.java  |  51 +++++
 .../mage/sets/battleforzendikar/Island7.java  |  51 +++++
 .../mage/sets/battleforzendikar/Island8.java  |  51 +++++
 .../mage/sets/battleforzendikar/Island9.java  |  51 +++++
 .../sets/battleforzendikar/Mountain1.java     |   2 +-
 .../sets/battleforzendikar/Mountain10.java    |  51 +++++
 .../sets/battleforzendikar/Mountain2.java     |   2 +-
 .../sets/battleforzendikar/Mountain3.java     |   2 +-
 .../sets/battleforzendikar/Mountain4.java     |   2 +-
 .../sets/battleforzendikar/Mountain5.java     |   2 +-
 .../sets/battleforzendikar/Mountain6.java     |  51 +++++
 .../sets/battleforzendikar/Mountain7.java     |  51 +++++
 .../sets/battleforzendikar/Mountain8.java     |  51 +++++
 .../sets/battleforzendikar/Mountain9.java     |  51 +++++
 .../sets/battleforzendikar/PilgrimsEye.java   |   2 +-
 .../mage/sets/battleforzendikar/Plains1.java  |   2 +-
 .../mage/sets/battleforzendikar/Plains10.java |  51 +++++
 .../mage/sets/battleforzendikar/Plains2.java  |   2 +-
 .../mage/sets/battleforzendikar/Plains3.java  |   2 +-
 .../mage/sets/battleforzendikar/Plains4.java  |   2 +-
 .../mage/sets/battleforzendikar/Plains5.java  |   2 +-
 .../mage/sets/battleforzendikar/Plains6.java  |  51 +++++
 .../mage/sets/battleforzendikar/Plains7.java  |  51 +++++
 .../mage/sets/battleforzendikar/Plains8.java  |  51 +++++
 .../mage/sets/battleforzendikar/Plains9.java  |  51 +++++
 .../mage/sets/battleforzendikar/Plummet.java  |   2 +-
 .../battleforzendikar/RetreatToKazandu.java   |   2 +-
 .../battleforzendikar/RollingThunder.java     |   2 +-
 .../sets/battleforzendikar/SheerDrop.java     |   2 +-
 .../battleforzendikar/SmiteTheMonstrous.java  |   2 +-
 .../mage/sets/battleforzendikar/Swamp1.java   |   2 +-
 .../mage/sets/battleforzendikar/Swamp10.java  |  51 +++++
 .../mage/sets/battleforzendikar/Swamp2.java   |   2 +-
 .../mage/sets/battleforzendikar/Swamp3.java   |   2 +-
 .../mage/sets/battleforzendikar/Swamp4.java   |   2 +-
 .../mage/sets/battleforzendikar/Swamp5.java   |   2 +-
 .../mage/sets/battleforzendikar/Swamp6.java   |  51 +++++
 .../mage/sets/battleforzendikar/Swamp7.java   |  51 +++++
 .../mage/sets/battleforzendikar/Swamp8.java   |  51 +++++
 .../mage/sets/battleforzendikar/Swamp9.java   |  51 +++++
 .../sets/battleforzendikar/SylvanScrying.java |   2 +-
 .../battleforzendikar/TerritorialBaloth.java  |   2 +-
 .../battleforzendikar/VeteranWarleader.java   |   2 +-
 .../sets/blessedvscursed/AbattoirGhoul.java   |   2 +-
 .../blessedvscursed/AppetiteForBrains.java    |   2 +-
 .../sets/blessedvscursed/BarterInBlood.java   |   2 +-
 .../sets/blessedvscursed/BondsOfFaith.java    |   2 +-
 .../sets/blessedvscursed/ButcherGhoul.java    |   2 +-
 .../sets/blessedvscursed/ButchersCleaver.java |   2 +-
 .../blessedvscursed/CaptainOfTheMists.java    |   2 +-
 .../blessedvscursed/CathedralSanctifier.java  |   2 +-
 .../blessedvscursed/ChampionOfTheParish.java  |   2 +-
 .../sets/blessedvscursed/ChapelGeist.java     |   2 +-
 .../sets/blessedvscursed/CobbledWings.java    |   2 +-
 .../blessedvscursed/CompellingDeterrence.java |   2 +-
 .../sets/blessedvscursed/DearlyDeparted.java  |   2 +-
 .../sets/blessedvscursed/DiregrafCaptain.java |   2 +-
 .../sets/blessedvscursed/DiregrafGhoul.java   |   2 +-
 .../sets/blessedvscursed/DismalBackwater.java |   2 +-
 .../sets/blessedvscursed/DoomedTraveler.java  |   2 +-
 .../sets/blessedvscursed/DreadReturn.java     |   2 +-
 .../sets/blessedvscursed/DriverOfTheDead.java |   2 +-
 .../sets/blessedvscursed/ElderCathar.java     |   2 +-
 .../blessedvscursed/EmancipationAngel.java    |   2 +-
 .../sets/blessedvscursed/FalkenrathNoble.java |   2 +-
 .../sets/blessedvscursed/FiendHunter.java     |   2 +-
 .../blessedvscursed/ForbiddenAlchemy.java     |   2 +-
 .../blessedvscursed/GatherTheTownsfolk.java   |   2 +-
 .../blessedvscursed/GeistOfSaintTraft.java    |   2 +-
 .../sets/blessedvscursed/Ghoulraiser.java     |   2 +-
 .../blessedvscursed/GoldnightRedeemer.java    |   2 +-
 .../sets/blessedvscursed/Gravecrawler.java    |   2 +-
 .../sets/blessedvscursed/GryffVanguard.java   |   2 +-
 .../blessedvscursed/HarvesterOfSouls.java     |   2 +-
 .../blessedvscursed/HavengulRunebinder.java   |   2 +-
 .../sets/blessedvscursed/HumanFrailty.java    |   2 +-
 .../blessedvscursed/IncreasingDevotion.java   |   2 +-
 .../sets/blessedvscursed/MakeshiftMauler.java |   2 +-
 .../mage/sets/blessedvscursed/MistRaven.java  |   2 +-
 .../blessedvscursed/MoanOfTheUnhallowed.java  |   2 +-
 .../sets/blessedvscursed/MomentaryBlink.java  |   2 +-
 .../blessedvscursed/MoorlandInquisitor.java   |   2 +-
 .../blessedvscursed/NephaliaSmuggler.java     |   2 +-
 .../blessedvscursed/PoreOverThePages.java     |   2 +-
 .../src/mage/sets/blessedvscursed/Rebuke.java |   2 +-
 .../blessedvscursed/RelentlessSkaabs.java     |   2 +-
 .../sets/blessedvscursed/ScrapskinDrake.java  |   2 +-
 .../sets/blessedvscursed/ScreechingSkaab.java |   2 +-
 .../sets/blessedvscursed/SeraphSanctuary.java |   2 +-
 .../blessedvscursed/SeverTheBloodline.java    |   2 +-
 .../blessedvscursed/SharpenedPitchfork.java   |   2 +-
 .../blessedvscursed/SlayerOfTheWicked.java    |   2 +-
 .../blessedvscursed/SpectralGateguards.java   |   2 +-
 .../sets/blessedvscursed/StitchedDrake.java   |   2 +-
 .../sets/blessedvscursed/TandemLookout.java   |   2 +-
 .../sets/blessedvscursed/ThrabenHeretic.java  |   2 +-
 .../sets/blessedvscursed/Topplegeist.java     |   2 +-
 .../mage/sets/blessedvscursed/TowerGeist.java |   2 +-
 .../sets/blessedvscursed/TranquilCove.java    |   2 +-
 .../sets/blessedvscursed/TributeToHunger.java |   2 +-
 .../blessedvscursed/UnbreathingHorde.java     |   2 +-
 .../sets/blessedvscursed/VictimOfNight.java   |   2 +-
 .../blessedvscursed/VillageBellRinger.java    |   2 +-
 .../blessedvscursed/VoiceOfTheProvinces.java  |   2 +-
 .../mage/sets/bornofthegods/Divination.java   |   2 +-
 .../sets/bornofthegods/EternitySnare.java     |   2 +-
 .../mage/sets/bornofthegods/Necrobite.java    |   2 +-
 .../sets/bornofthegods/RevokeExistence.java   |   2 +-
 .../sets/bornofthegods/SpringleafDrum.java    |   2 +-
 ...rsYamazaki.java => BrothersYamazaki1.java} |  12 +-
 .../BrothersYamazaki2.java                    |  51 +++++
 .../championsofkamigawa/DampenThought.java    |   2 +-
 .../championsofkamigawa/DesperateRitual.java  |   2 +-
 .../sets/championsofkamigawa/Distress.java    |   2 +-
 .../sets/championsofkamigawa/GlacialRay.java  |   2 +-
 .../championsofkamigawa/KodamasReach.java     |   2 +-
 .../championsofkamigawa/PetalsOfInsight.java  |   2 +-
 .../sets/championsofkamigawa/Soulblast.java   |   2 +-
 .../sets/championsofkamigawa/StoneRain.java   |   2 +-
 .../sets/championsofkamigawa/TimeStop.java    |   2 +-
 .../src/mage/sets/champs/BloodKnight.java     |   2 +-
 .../mage/sets/champs/BramblewoodParagon.java  |   2 +-
 .../mage/sets/champs/DoranTheSiegeTower.java  |   2 +-
 .../src/mage/sets/champs/Electrolyze.java     |   2 +-
 .../src/mage/sets/champs/Groundbreaker.java   |   2 +-
 .../mage/sets/champs/ImperiousPerfect.java    |   2 +-
 Mage.Sets/src/mage/sets/champs/Mutavault.java |   2 +-
 .../sets/champs/NivMizzetTheFiremind.java     |   2 +-
 .../src/mage/sets/champs/RakdosGuildmage.java |   2 +-
 .../src/mage/sets/champs/SerraAvenger.java    |   2 +-
 .../src/mage/sets/champs/UrzasFactory.java    |   2 +-
 Mage.Sets/src/mage/sets/champs/Voidslime.java |   2 +-
 .../src/mage/sets/chronicles/AbuJafar.java    |   2 +-
 .../mage/sets/chronicles/ActiveVolcano.java   |   2 +-
 .../sets/chronicles/AkronLegionnaire.java     |   2 +-
 .../src/mage/sets/chronicles/Aladdin.java     |   2 +-
 .../mage/sets/chronicles/ArcadesSabboth.java  |   2 +-
 .../sets/chronicles/ArenaOfTheAncients.java   |   2 +-
 .../mage/sets/chronicles/ArgothianPixies.java |   2 +-
 .../mage/sets/chronicles/AshnodsAltar.java    |   2 +-
 .../sets/chronicles/AshnodsTransmogrant.java  |   2 +-
 .../src/mage/sets/chronicles/AzureDrake.java  |   2 +-
 .../src/mage/sets/chronicles/BarlsCage.java   |   2 +-
 .../src/mage/sets/chronicles/BloodMoon.java   |   2 +-
 .../src/mage/sets/chronicles/BogRats.java     |   2 +-
 .../src/mage/sets/chronicles/BookOfRass.java  |   2 +-
 .../src/mage/sets/chronicles/Boomerang.java   |   2 +-
 .../src/mage/sets/chronicles/CatWarriors.java |   2 +-
 .../src/mage/sets/chronicles/Chromium.java    |   2 +-
 .../src/mage/sets/chronicles/CityOfBrass.java |   2 +-
 .../sets/chronicles/ConcordantCrossroads.java |   2 +-
 .../src/mage/sets/chronicles/CrawGiant.java   |   2 +-
 .../mage/sets/chronicles/CuombajjWitches.java |   2 +-
 .../src/mage/sets/chronicles/Cyclone.java     |   2 +-
 .../mage/sets/chronicles/DAvenantArcher.java  |   2 +-
 .../sets/chronicles/DakkonBlackblade.java     |   2 +-
 .../src/mage/sets/chronicles/DanceOfMany.java |   2 +-
 .../src/mage/sets/chronicles/Dandan.java      |   2 +-
 .../mage/sets/chronicles/DivineOffering.java  |   2 +-
 .../src/mage/sets/chronicles/ErhnamDjinn.java |   2 +-
 .../src/mage/sets/chronicles/FallenAngel.java |   2 +-
 .../src/mage/sets/chronicles/FeldonsCane.java |   2 +-
 .../src/mage/sets/chronicles/FireDrake.java   |   2 +-
 .../src/mage/sets/chronicles/FlashFlood.java  |   2 +-
 .../mage/sets/chronicles/FountainOfYouth.java |   2 +-
 .../src/mage/sets/chronicles/GhazbanOgre.java |   2 +-
 .../sets/chronicles/GoblinDiggingTeam.java    |   2 +-
 .../sets/chronicles/GoblinsOfTheFlarg.java    |   2 +-
 .../mage/sets/chronicles/HasranOgress.java    |   2 +-
 .../mage/sets/chronicles/HellsCaretaker.java  |   2 +-
 .../mage/sets/chronicles/HornOfDeafening.java |   2 +-
 .../mage/sets/chronicles/IvoryGuardians.java  |   2 +-
 .../src/mage/sets/chronicles/JalumTome.java   |   2 +-
 .../src/mage/sets/chronicles/Juxtapose.java   |   2 +-
 .../sets/chronicles/KeepersOfTheFaith.java    |   2 +-
 .../mage/sets/chronicles/KeiTakahashi.java    |   2 +-
 .../sets/chronicles/MarhaultElsdragon.java    |   2 +-
 .../mage/sets/chronicles/Metamorphosis.java   |   2 +-
 .../mage/sets/chronicles/MountainYeti.java    |   2 +-
 .../src/mage/sets/chronicles/NicolBolas.java  |   2 +-
 .../mage/sets/chronicles/PalladiaMors.java    |   2 +-
 .../src/mage/sets/chronicles/Rakalite.java    |   2 +-
 .../src/mage/sets/chronicles/Recall.java      |   2 +-
 .../src/mage/sets/chronicles/RemoveSoul.java  |   2 +-
 .../sets/chronicles/RepentantBlacksmith.java  |   2 +-
 .../src/mage/sets/chronicles/Revelation.java  |   2 +-
 .../sets/chronicles/RubiniaSoulsinger.java    |   2 +-
 .../src/mage/sets/chronicles/SafeHaven.java   |   2 +-
 .../mage/sets/chronicles/ScavengerFolk.java   |   2 +-
 .../src/mage/sets/chronicles/Sentinel.java    |   2 +-
 .../sets/chronicles/SerpentGenerator.java     |   2 +-
 .../src/mage/sets/chronicles/ShieldWall.java  |   2 +-
 .../mage/sets/chronicles/SivitriScarzam.java  |   2 +-
 .../sets/chronicles/SolkanarTheSwampKing.java |   2 +-
 .../src/mage/sets/chronicles/StormSeeker.java |   2 +-
 .../src/mage/sets/chronicles/TheWretched.java |   2 +-
 .../mage/sets/chronicles/TobiasAndrion.java   |   2 +-
 .../src/mage/sets/chronicles/TorWauki.java    |   2 +-
 .../mage/sets/chronicles/TormodsCrypt.java    |   2 +-
 .../mage/sets/chronicles/Transmutation.java   |   2 +-
 .../src/mage/sets/chronicles/TriassicEgg.java |   2 +-
 .../src/mage/sets/chronicles/UrzasMine1.java  |   2 +-
 .../src/mage/sets/chronicles/UrzasMine2.java  |   2 +-
 .../src/mage/sets/chronicles/UrzasMine3.java  |   2 +-
 .../src/mage/sets/chronicles/UrzasMine4.java  |   2 +-
 .../sets/chronicles/UrzasPowerPlant1.java     |   2 +-
 .../sets/chronicles/UrzasPowerPlant2.java     |   2 +-
 .../sets/chronicles/UrzasPowerPlant3.java     |   2 +-
 .../sets/chronicles/UrzasPowerPlant4.java     |   2 +-
 .../src/mage/sets/chronicles/UrzasTower1.java |   2 +-
 .../src/mage/sets/chronicles/UrzasTower2.java |   2 +-
 .../src/mage/sets/chronicles/UrzasTower3.java |   2 +-
 .../src/mage/sets/chronicles/UrzasTower4.java |   2 +-
 .../mage/sets/chronicles/VaevictisAsmadi.java |   2 +-
 .../src/mage/sets/chronicles/WallOfHeat.java  |   2 +-
 .../mage/sets/chronicles/WallOfWonder.java    |   2 +-
 .../src/mage/sets/chronicles/WitchHunter.java |   2 +-
 .../src/mage/sets/chronicles/XiraArien.java   |   2 +-
 .../mage/sets/chronicles/YawgmothDemon.java   |   2 +-
 .../mage/sets/clashpack/CourserOfKruphix.java |   2 +-
 .../sets/clashpack/FatedIntervention.java     |   2 +-
 .../mage/sets/clashpack/FontOfFertility.java  |   2 +-
 .../mage/sets/clashpack/HerosDownfall.java    |   2 +-
 .../mage/sets/clashpack/HydraBroodmaster.java |   2 +-
 .../mage/sets/clashpack/NecropolisFiend.java  |   2 +-
 .../mage/sets/clashpack/PrognosticSphinx.java |   2 +-
 .../mage/sets/clashpack/ProphetOfKruphix.java |   2 +-
 .../mage/sets/clashpack/ReaperOfTheWilds.java |   2 +-
 .../mage/sets/clashpack/SultaiAscendancy.java |   2 +-
 .../mage/sets/clashpack/TempleOfMystery.java  |   2 +-
 .../src/mage/sets/clashpack/WhipOfErebos.java |   2 +-
 .../sets/classicsixthedition/AEtherFlash.java |   2 +-
 .../sets/classicsixthedition/Abduction.java   |   2 +-
 .../classicsixthedition/AbyssalHunter.java    |   2 +-
 .../classicsixthedition/AbyssalSpecter.java   |   2 +-
 .../classicsixthedition/AdarkarWastes.java    |   2 +-
 .../AgonizingMemories.java                    |   2 +-
 .../classicsixthedition/AirElemental.java     |   2 +-
 .../classicsixthedition/AladdinsRing.java     |   2 +-
 .../sets/classicsixthedition/AmberPrison.java |   2 +-
 .../classicsixthedition/AnabaBodyguard.java   |   2 +-
 .../sets/classicsixthedition/AnabaShaman.java |   2 +-
 .../AncestralMemories.java                    |   2 +-
 .../sets/classicsixthedition/AnimateWall.java |   2 +-
 .../classicsixthedition/AnkhOfMishra.java     |   2 +-
 .../sets/classicsixthedition/Archangel.java   |   2 +-
 .../classicsixthedition/ArdentMilitia.java    |   2 +-
 .../sets/classicsixthedition/Armageddon.java  |   2 +-
 .../classicsixthedition/ArmoredPegasus.java   |   2 +-
 .../sets/classicsixthedition/AshenPowder.java |   2 +-
 .../classicsixthedition/AshnodsAltar.java     |   2 +-
 .../BalduvianBarbarians.java                  |   2 +-
 .../classicsixthedition/BalduvianHorde.java   |   2 +-
 .../classicsixthedition/BirdsOfParadise.java  |   2 +-
 .../mage/sets/classicsixthedition/Blaze.java  |   2 +-
 .../mage/sets/classicsixthedition/Blight.java |   2 +-
 .../classicsixthedition/BlightedShaman.java   |   2 +-
 .../sets/classicsixthedition/BloodPet.java    |   2 +-
 .../mage/sets/classicsixthedition/BogImp.java |   2 +-
 .../sets/classicsixthedition/BogRats.java     |   2 +-
 .../sets/classicsixthedition/BogWraith.java   |   2 +-
 .../mage/sets/classicsixthedition/Boil.java   |   2 +-
 .../sets/classicsixthedition/Boomerang.java   |   2 +-
 .../classicsixthedition/BottleOfSuleiman.java |   2 +-
 .../mage/sets/classicsixthedition/Browse.java |   2 +-
 .../sets/classicsixthedition/Brushland.java   |   2 +-
 .../sets/classicsixthedition/Burrowing.java   |   2 +-
 .../classicsixthedition/CallOfTheWild.java    |   2 +-
 .../mage/sets/classicsixthedition/Castle.java |   2 +-
 .../sets/classicsixthedition/CatWarriors.java |   2 +-
 .../classicsixthedition/CelestialDawn.java    |   2 +-
 .../classicsixthedition/CharcoalDiamond.java  |   2 +-
 .../mage/sets/classicsixthedition/Chill.java  |   2 +-
 .../CircleOfProtectionBlack.java              |   2 +-
 .../CircleOfProtectionBlue.java               |   2 +-
 .../CircleOfProtectionGreen.java              |   2 +-
 .../CircleOfProtectionRed.java                |   2 +-
 .../CircleOfProtectionWhite.java              |   2 +-
 .../sets/classicsixthedition/CityOfBrass.java |   2 +-
 .../sets/classicsixthedition/Coercion.java    |   2 +-
 .../sets/classicsixthedition/Conquer.java     |   2 +-
 .../classicsixthedition/Counterspell.java     |   2 +-
 .../classicsixthedition/CreepingMold.java     |   2 +-
 .../classicsixthedition/CrimsonHellkite.java  |   2 +-
 .../sets/classicsixthedition/Crusade.java     |   2 +-
 .../sets/classicsixthedition/CrystalRod.java  |   2 +-
 .../sets/classicsixthedition/CrystalVein.java |   2 +-
 .../sets/classicsixthedition/CursedTotem.java |   2 +-
 .../classicsixthedition/DAvenantArcher.java   |   2 +-
 .../classicsixthedition/DancingScimitar.java  |   2 +-
 .../classicsixthedition/DarajaGriffin.java    |   2 +-
 .../classicsixthedition/DaringApprentice.java |   2 +-
 .../sets/classicsixthedition/Deflection.java  |   2 +-
 .../classicsixthedition/DenseFoliage.java     |   2 +-
 .../sets/classicsixthedition/Derelor.java     |   2 +-
 .../sets/classicsixthedition/Desertion.java   |   2 +-
 .../DiminishingReturns.java                   |   2 +-
 .../sets/classicsixthedition/DingusEgg.java   |   2 +-
 .../sets/classicsixthedition/Disenchant.java  |   2 +-
 .../DisruptingScepter.java                    |   2 +-
 .../DivineTransformation.java                 |   2 +-
 .../sets/classicsixthedition/Doomsday.java    |   2 +-
 .../classicsixthedition/DragonEngine.java     |   2 +-
 .../sets/classicsixthedition/DragonMask.java  |   2 +-
 .../classicsixthedition/DreadOfNight.java     |   2 +-
 .../sets/classicsixthedition/DreamCache.java  |   2 +-
 .../classicsixthedition/DrudgeSkeletons.java  |   2 +-
 .../sets/classicsixthedition/DrySpell.java    |   2 +-
 .../classicsixthedition/DwarvenRuins.java     |   2 +-
 .../classicsixthedition/EarlyHarvest.java     |   2 +-
 .../sets/classicsixthedition/Earthquake.java  |   2 +-
 .../classicsixthedition/EbonStronghold.java   |   2 +-
 .../classicsixthedition/EkunduGriffin.java    |   2 +-
 .../sets/classicsixthedition/ElderDruid.java  |   2 +-
 .../sets/classicsixthedition/ElvenCache.java  |   2 +-
 .../sets/classicsixthedition/ElvenRiders.java |   2 +-
 .../classicsixthedition/ElvishArchers.java    |   2 +-
 .../classicsixthedition/Enfeeblement.java     |   2 +-
 .../classicsixthedition/EnlightenedTutor.java |   2 +-
 .../classicsixthedition/EtherealChampion.java |   2 +-
 .../EvilEyeOfOrmsByGore.java                  |   2 +-
 .../mage/sets/classicsixthedition/Exile.java  |   2 +-
 .../sets/classicsixthedition/FallenAngel.java |   2 +-
 .../sets/classicsixthedition/FallowEarth.java |   2 +-
 .../classicsixthedition/FamiliarGround.java   |   2 +-
 .../sets/classicsixthedition/FatalBlow.java   |   2 +-
 .../mage/sets/classicsixthedition/Fear.java   |   2 +-
 .../FeastOfTheUnicorn.java                    |   2 +-
 .../classicsixthedition/FemerefArchers.java   |   2 +-
 .../sets/classicsixthedition/FeralShadow.java |   2 +-
 .../mage/sets/classicsixthedition/Fervor.java |   2 +-
 .../classicsixthedition/FinalFortune.java     |   2 +-
 .../sets/classicsixthedition/FireDiamond.java |   2 +-
 .../classicsixthedition/FireElemental.java    |   2 +-
 .../classicsixthedition/Firebreathing.java    |   2 +-
 .../sets/classicsixthedition/FitOfRage.java   |   2 +-
 .../sets/classicsixthedition/FlameSpirit.java |   2 +-
 .../mage/sets/classicsixthedition/Flash.java  |   2 +-
 .../sets/classicsixthedition/Flashfires.java  |   2 +-
 .../mage/sets/classicsixthedition/Flight.java |   2 +-
 .../classicsixthedition/FlyingCarpet.java     |   2 +-
 .../mage/sets/classicsixthedition/Fog.java    |   2 +-
 .../classicsixthedition/FogElemental.java     |   2 +-
 .../classicsixthedition/ForbiddenCrypt.java   |   2 +-
 .../mage/sets/classicsixthedition/Forget.java |   2 +-
 .../classicsixthedition/FountainOfYouth.java  |   2 +-
 .../classicsixthedition/FyndhornBrownie.java  |   2 +-
 .../classicsixthedition/FyndhornElder.java    |   2 +-
 .../sets/classicsixthedition/GaseousForm.java |   2 +-
 .../sets/classicsixthedition/GiantGrowth.java |   2 +-
 .../sets/classicsixthedition/GiantSpider.java |   2 +-
 .../classicsixthedition/GiantStrength.java    |   2 +-
 .../sets/classicsixthedition/GlacialWall.java |   2 +-
 .../classicsixthedition/GlassesOfUrza.java    |   2 +-
 .../GoblinDiggingTeam.java                    |   2 +-
 .../GoblinEliteInfantry.java                  |   2 +-
 .../sets/classicsixthedition/GoblinHero.java  |   2 +-
 .../sets/classicsixthedition/GoblinKing.java  |   2 +-
 .../classicsixthedition/GoblinRecruiter.java  |   2 +-
 .../classicsixthedition/GoblinWarrens.java    |   2 +-
 .../classicsixthedition/GorillaChieftain.java |   2 +-
 .../classicsixthedition/GravebaneZombie.java  |   2 +-
 .../sets/classicsixthedition/Gravedigger.java |   2 +-
 .../mage/sets/classicsixthedition/Greed.java  |   2 +-
 .../classicsixthedition/GrinningTotem.java    |   2 +-
 .../classicsixthedition/GrizzlyBears.java     |   2 +-
 .../classicsixthedition/HammerOfBogardan.java |   2 +-
 .../classicsixthedition/HarmattanEfreet.java  |   2 +-
 .../HavenwoodBattleground.java                |   2 +-
 .../classicsixthedition/HealingSalve.java     |   2 +-
 .../classicsixthedition/HeavyBallista.java    |   2 +-
 .../sets/classicsixthedition/Hecatomb.java    |   2 +-
 .../classicsixthedition/HerosResolve.java     |   2 +-
 .../classicsixthedition/HiddenHorror.java     |   2 +-
 .../classicsixthedition/HornedTurtle.java     |   2 +-
 .../classicsixthedition/HowlFromBeyond.java   |   2 +-
 .../sets/classicsixthedition/HowlingMine.java |   2 +-
 .../classicsixthedition/HulkingCyclops.java   |   2 +-
 .../sets/classicsixthedition/Hurricane.java   |   2 +-
 .../sets/classicsixthedition/IcatianTown.java |   2 +-
 .../classicsixthedition/IllicitAuction.java   |   2 +-
 .../classicsixthedition/InfantryVeteran.java  |   2 +-
 .../classicsixthedition/InfernalContract.java |   2 +-
 .../sets/classicsixthedition/Inferno.java     |   2 +-
 .../sets/classicsixthedition/Insight.java     |   2 +-
 .../sets/classicsixthedition/Inspiration.java |   2 +-
 .../sets/classicsixthedition/IronStar.java    |   2 +-
 .../sets/classicsixthedition/IvoryCup.java    |   2 +-
 .../classicsixthedition/JadeMonolith.java     |   2 +-
 .../sets/classicsixthedition/JalumTome.java   |   2 +-
 .../classicsixthedition/JayemdaeTome.java     |   2 +-
 .../sets/classicsixthedition/Jokulhaups.java  |   2 +-
 .../sets/classicsixthedition/Juxtapose.java   |   2 +-
 .../classicsixthedition/KarplusanForest.java  |   2 +-
 .../mage/sets/classicsixthedition/Kismet.java |   2 +-
 .../classicsixthedition/KjeldoranDead.java    |   2 +-
 .../KjeldoranRoyalGuard.java                  |   2 +-
 .../sets/classicsixthedition/LeadGolem.java   |   2 +-
 .../classicsixthedition/LeshracsRite.java     |   2 +-
 .../classicsixthedition/LibraryOfLatNam.java  |   2 +-
 .../sets/classicsixthedition/LightOfDay.java  |   2 +-
 .../classicsixthedition/LightningBlast.java   |   2 +-
 .../sets/classicsixthedition/LivingLands.java |   2 +-
 .../classicsixthedition/LlanowarElves.java    |   2 +-
 .../classicsixthedition/LongbowArcher.java    |   2 +-
 .../classicsixthedition/LordOfAtlantis.java   |   2 +-
 .../sets/classicsixthedition/LostSoul.java    |   2 +-
 .../mage/sets/classicsixthedition/Lure.java   |   2 +-
 .../sets/classicsixthedition/ManaPrism.java   |   2 +-
 .../sets/classicsixthedition/ManaShort.java   |   2 +-
 .../sets/classicsixthedition/Manabarbs.java   |   2 +-
 .../classicsixthedition/MarbleDiamond.java    |   2 +-
 .../mage/sets/classicsixthedition/Maro.java   |   2 +-
 .../sets/classicsixthedition/Meekstone.java   |   2 +-
 .../sets/classicsixthedition/MemoryLapse.java |   2 +-
 .../MerfolkOfThePearlTrident.java             |   2 +-
 .../sets/classicsixthedition/MesaFalcon.java  |   2 +-
 .../sets/classicsixthedition/Millstone.java   |   2 +-
 .../sets/classicsixthedition/MindWarp.java    |   2 +-
 .../MischievousPoltergeist.java               |   2 +-
 .../sets/classicsixthedition/MossDiamond.java |   2 +-
 .../classicsixthedition/MountainGoat.java     |   2 +-
 .../classicsixthedition/MysticCompass.java    |   2 +-
 .../classicsixthedition/MysticalTutor.java    |   2 +-
 .../NaturesResurgence.java                    |   2 +-
 .../sets/classicsixthedition/Necrosavant.java |   2 +-
 .../sets/classicsixthedition/Nightmare.java   |   2 +-
 .../classicsixthedition/OrcishArtillery.java  |   2 +-
 .../classicsixthedition/OrcishOriflamme.java  |   2 +-
 .../OrderOfTheSacredTorch.java                |   2 +-
 .../sets/classicsixthedition/Ornithopter.java |   2 +-
 .../sets/classicsixthedition/Pacifism.java    |   2 +-
 .../classicsixthedition/PainfulMemories.java  |   2 +-
 .../classicsixthedition/PantherWarriors.java  |   2 +-
 .../classicsixthedition/PatagiaGolem.java     |   2 +-
 .../sets/classicsixthedition/PearlDragon.java |   2 +-
 .../PentagramOfTheAges.java                   |   2 +-
 .../mage/sets/classicsixthedition/Perish.java |   2 +-
 .../sets/classicsixthedition/Pestilence.java  |   2 +-
 .../PhantasmalTerrain.java                    |   2 +-
 .../classicsixthedition/PhantomWarrior.java   |   2 +-
 .../classicsixthedition/PhyrexianVault.java   |   2 +-
 .../sets/classicsixthedition/Pillage.java     |   2 +-
 .../sets/classicsixthedition/Polymorph.java   |   2 +-
 .../sets/classicsixthedition/PowerSink.java   |   2 +-
 .../classicsixthedition/PradeshGypsies.java   |   2 +-
 .../sets/classicsixthedition/PrimalClay.java  |   2 +-
 .../classicsixthedition/ProdigalSorcerer.java |   2 +-
 .../sets/classicsixthedition/Prosperity.java  |   2 +-
 .../classicsixthedition/PsychicTransfer.java  |   2 +-
 .../classicsixthedition/PsychicVenom.java     |   2 +-
 .../classicsixthedition/Pyrotechnics.java     |   2 +-
 .../mage/sets/classicsixthedition/Python.java |   2 +-
 .../classicsixthedition/RadjanSpirit.java     |   2 +-
 .../mage/sets/classicsixthedition/RagMan.java |   2 +-
 .../classicsixthedition/RagingGoblin.java     |   2 +-
 .../sets/classicsixthedition/RaiseDead.java   |   2 +-
 .../classicsixthedition/RampantGrowth.java    |   2 +-
 .../classicsixthedition/RazortoothRats.java   |   2 +-
 .../mage/sets/classicsixthedition/Recall.java |   2 +-
 .../RecklessEmbermage.java                    |   2 +-
 .../classicsixthedition/RedwoodTreefolk.java  |   2 +-
 .../classicsixthedition/Regeneration.java     |   2 +-
 .../sets/classicsixthedition/Relearn.java     |   2 +-
 .../RelentlessAssault.java                    |   2 +-
 .../mage/sets/classicsixthedition/Remedy.java |   2 +-
 .../sets/classicsixthedition/RemoveSoul.java  |   2 +-
 .../sets/classicsixthedition/Reprisal.java    |   2 +-
 .../ResistanceFighter.java                    |   2 +-
 .../classicsixthedition/ReverseDamage.java    |   2 +-
 .../sets/classicsixthedition/RiverBoa.java    |   2 +-
 .../sets/classicsixthedition/RodOfRuin.java   |   2 +-
 .../mage/sets/classicsixthedition/Rowen.java  |   2 +-
 .../classicsixthedition/RuinsOfTrokair.java   |   2 +-
 .../classicsixthedition/SabretoothTiger.java  |   2 +-
 .../sets/classicsixthedition/SageOwl.java     |   2 +-
 .../classicsixthedition/SamiteHealer.java     |   2 +-
 .../sets/classicsixthedition/ScaledWurm.java  |   2 +-
 .../classicsixthedition/ScatheZombies.java    |   2 +-
 .../sets/classicsixthedition/SeaMonster.java  |   2 +-
 .../SegovianLeviathan.java                    |   2 +-
 .../classicsixthedition/SengirAutocrat.java   |   2 +-
 .../sets/classicsixthedition/Serenity.java    |   2 +-
 .../classicsixthedition/SerrasBlessing.java   |   2 +-
 .../classicsixthedition/ShanodinDryads.java   |   2 +-
 .../sets/classicsixthedition/Shatter.java     |   2 +-
 .../classicsixthedition/Shatterstorm.java     |   2 +-
 .../mage/sets/classicsixthedition/Shock.java  |   2 +-
 .../classicsixthedition/SibilantSpirit.java   |   2 +-
 .../classicsixthedition/SkullCatapult.java    |   2 +-
 .../sets/classicsixthedition/SkyDiamond.java  |   2 +-
 .../sets/classicsixthedition/SnakeBasket.java |   2 +-
 .../sets/classicsixthedition/SoldeviSage.java |   2 +-
 .../sets/classicsixthedition/SoulNet.java     |   2 +-
 .../sets/classicsixthedition/SpellBlast.java  |   2 +-
 .../sets/classicsixthedition/SpiritLink.java  |   2 +-
 .../classicsixthedition/SpittingDrake.java    |   2 +-
 .../classicsixthedition/SpittingEarth.java    |   2 +-
 .../classicsixthedition/StalkingTiger.java    |   2 +-
 .../classicsixthedition/StandingTroops.java   |   2 +-
 .../classicsixthedition/StaunchDefenders.java |   2 +-
 .../sets/classicsixthedition/StoneRain.java   |   2 +-
 .../classicsixthedition/StormCauldron.java    |   2 +-
 .../sets/classicsixthedition/StormCrow.java   |   2 +-
 .../classicsixthedition/StrandsOfNight.java   |   2 +-
 .../classicsixthedition/StreamOfLife.java     |   2 +-
 .../classicsixthedition/StromgaldCabal.java   |   2 +-
 .../mage/sets/classicsixthedition/Stupor.java |   2 +-
 .../classicsixthedition/SulfurousSprings.java |   2 +-
 .../sets/classicsixthedition/SummerBloom.java |   2 +-
 .../mage/sets/classicsixthedition/Sunweb.java |   2 +-
 .../classicsixthedition/SvyeluniteTemple.java |   2 +-
 .../sets/classicsixthedition/SyphonSoul.java  |   2 +-
 .../classicsixthedition/TalruumMinotaur.java  |   2 +-
 .../mage/sets/classicsixthedition/Tariff.java |   2 +-
 .../classicsixthedition/TeferisPuzzleBox.java |   2 +-
 .../mage/sets/classicsixthedition/Terror.java |   2 +-
 .../sets/classicsixthedition/TheHive.java     |   2 +-
 .../classicsixthedition/ThicketBasilisk.java  |   2 +-
 .../classicsixthedition/ThroneOfBone.java     |   2 +-
 .../sets/classicsixthedition/TidalSurge.java  |   2 +-
 .../classicsixthedition/TrainedArmodon.java   |   2 +-
 .../classicsixthedition/TranquilGrove.java    |   2 +-
 .../sets/classicsixthedition/Tranquility.java |   2 +-
 .../mage/sets/classicsixthedition/Tremor.java |   2 +-
 .../classicsixthedition/TundraWolves.java     |   2 +-
 .../classicsixthedition/UktabiOrangutan.java  |   2 +-
 .../classicsixthedition/UktabiWildcats.java   |   2 +-
 .../classicsixthedition/UndergroundRiver.java |   2 +-
 .../classicsixthedition/UnseenWalker.java     |   2 +-
 .../sets/classicsixthedition/Unsummon.java    |   2 +-
 .../classicsixthedition/UntamedWilds.java     |   2 +-
 .../classicsixthedition/UnyaroGriffin.java    |   2 +-
 .../classicsixthedition/VampiricTutor.java    |   2 +-
 .../classicsixthedition/VenerableMonk.java    |   2 +-
 .../VerduranEnchantress.java                  |   2 +-
 .../sets/classicsixthedition/Vertigo.java     |   2 +-
 .../classicsixthedition/ViashinoWarrior.java  |   2 +-
 .../sets/classicsixthedition/Vitalize.java    |   2 +-
 .../classicsixthedition/VodalianSoldiers.java |   2 +-
 .../classicsixthedition/VolcanicDragon.java   |   2 +-
 .../classicsixthedition/VolcanicGeyser.java   |   2 +-
 .../WaitingInTheWeeds.java                    |   2 +-
 .../sets/classicsixthedition/WallOfAir.java   |   2 +-
 .../sets/classicsixthedition/WallOfFire.java  |   2 +-
 .../classicsixthedition/WallOfSwords.java     |   2 +-
 .../classicsixthedition/WandOfDenial.java     |   2 +-
 .../mage/sets/classicsixthedition/Warmth.java |   2 +-
 .../classicsixthedition/WarriorsHonor.java    |   2 +-
 .../sets/classicsixthedition/Warthog.java     |   2 +-
 .../sets/classicsixthedition/WildGrowth.java  |   2 +-
 .../sets/classicsixthedition/WindDrake.java   |   2 +-
 .../sets/classicsixthedition/WindSpirit.java  |   2 +-
 .../classicsixthedition/WoodenSphere.java     |   2 +-
 .../classicsixthedition/WorldlyTutor.java     |   2 +-
 .../sets/classicsixthedition/WrathOfGod.java  |   2 +-
 .../sets/classicsixthedition/WyluliWolf.java  |   2 +-
 .../classicsixthedition/ZombieMaster.java     |   2 +-
 .../classicsixthedition/ZursWeirding.java     |   2 +-
 .../mage/sets/coldsnap/AllosaurusRider.java   |   2 +-
 .../mage/sets/coldsnap/BroodingSaurian.java   |   2 +-
 .../src/mage/sets/coldsnap/Cryoclasm.java     |   2 +-
 .../src/mage/sets/coldsnap/Deathmark.java     |   2 +-
 .../mage/sets/coldsnap/DeepfireElemental.java |   2 +-
 .../src/mage/sets/coldsnap/FieldMarshal.java  |   2 +-
 .../src/mage/sets/coldsnap/Flashfreeze.java   |   2 +-
 .../sets/coldsnap/GreaterStoneSpirit.java     |   2 +-
 .../mage/sets/coldsnap/KarplusanStrider.java  |   2 +-
 .../src/mage/sets/coldsnap/KrovikanMist.java  |   2 +-
 .../src/mage/sets/coldsnap/OhranViper.java    |   2 +-
 .../mage/sets/coldsnap/PerilousResearch.java  |   2 +-
 .../sets/coldsnap/SekKuarDeathkeeper.java     |   2 +-
 .../mage/sets/coldsnap/SnowCoveredForest.java |   2 +-
 .../mage/sets/coldsnap/SnowCoveredIsland.java |   2 +-
 .../sets/coldsnap/SnowCoveredMountain.java    |   2 +-
 .../mage/sets/coldsnap/SnowCoveredPlains.java |   2 +-
 .../mage/sets/coldsnap/SnowCoveredSwamp.java  |   2 +-
 .../mage/sets/coldsnap/VanishIntoMemory.java  |   2 +-
 .../src/mage/sets/commander/AcidicSlime.java  |   2 +-
 .../src/mage/sets/commander/Afterlife.java    |   2 +-
 .../src/mage/sets/commander/AkoumRefuge.java  |   2 +-
 .../mage/sets/commander/AkromasVengeance.java |   2 +-
 .../mage/sets/commander/AngelOfDespair.java   |   2 +-
 .../mage/sets/commander/AngelicArbiter.java   |   2 +-
 Mage.Sets/src/mage/sets/commander/Anger.java  |   2 +-
 .../mage/sets/commander/AquastrandSpider.java |   2 +-
 .../sets/commander/ArbiterOfKnollridge.java   |   2 +-
 .../mage/sets/commander/ArmillarySphere.java  |   2 +-
 .../mage/sets/commander/ArtisanOfKozilek.java |   2 +-
 .../src/mage/sets/commander/Attrition.java    |   2 +-
 .../src/mage/sets/commander/AvatarOfFury.java |   2 +-
 .../src/mage/sets/commander/AvatarOfWoe.java  |   2 +-
 .../mage/sets/commander/AwakeningZone.java    |   2 +-
 .../mage/sets/commander/AzoriusChancery.java  |   2 +-
 .../mage/sets/commander/AzoriusGuildmage.java |   2 +-
 .../sets/commander/BalothWoodcrasher.java     |   2 +-
 .../src/mage/sets/commander/BarrenMoor.java   |   2 +-
 .../mage/sets/commander/BestialMenace.java    |   2 +-
 .../src/mage/sets/commander/BojukaBog.java    |   2 +-
 .../mage/sets/commander/BorosGarrison.java    |   2 +-
 .../mage/sets/commander/BorosGuildmage.java   |   2 +-
 .../src/mage/sets/commander/BorosSignet.java  |   2 +-
 .../src/mage/sets/commander/Brainstorm.java   |   2 +-
 Mage.Sets/src/mage/sets/commander/Brawn.java  |   2 +-
 .../mage/sets/commander/ButcherOfMalakir.java |   2 +-
 .../mage/sets/commander/ChainReaction.java    |   2 +-
 .../src/mage/sets/commander/ChaosWarp.java    |   2 +-
 .../mage/sets/commander/ChartoothCougar.java  |   2 +-
 .../mage/sets/commander/CleansingBeam.java    |   2 +-
 .../src/mage/sets/commander/CobraTrap.java    |   2 +-
 .../mage/sets/commander/ColossalMight.java    |   2 +-
 .../src/mage/sets/commander/CometStorm.java   |   2 +-
 .../src/mage/sets/commander/CommandTower.java |   2 +-
 .../src/mage/sets/commander/Congregate.java   |   2 +-
 .../mage/sets/commander/ConundrumSphinx.java  |   2 +-
 .../mage/sets/commander/CrescendoOfWar.java   |   2 +-
 .../src/mage/sets/commander/Cultivate.java    |   2 +-
 .../mage/sets/commander/DarkHatchling.java    |   2 +-
 .../mage/sets/commander/DarksteelIngot.java   |   2 +-
 .../mage/sets/commander/DeadlyRecluse.java    |   2 +-
 .../mage/sets/commander/DeadwoodTreefolk.java |   2 +-
 .../mage/sets/commander/DeathMutation.java    |   2 +-
 .../mage/sets/commander/DiabolicTutor.java    |   2 +-
 .../mage/sets/commander/DimirAqueduct.java    |   2 +-
 .../src/mage/sets/commander/DimirSignet.java  |   2 +-
 .../mage/sets/commander/DisasterRadius.java   |   2 +-
 .../mage/sets/commander/DominusOfFealty.java  |   2 +-
 .../src/mage/sets/commander/DoomBlade.java    |   2 +-
 .../src/mage/sets/commander/DragonWhelp.java  |   2 +-
 .../mage/sets/commander/DreambornMuse.java    |   2 +-
 .../mage/sets/commander/DreamstoneHedron.java |   2 +-
 .../src/mage/sets/commander/Earthquake.java   |   2 +-
 .../src/mage/sets/commander/Electrolyze.java  |   2 +-
 .../mage/sets/commander/ElvishAberration.java |   2 +-
 .../mage/sets/commander/EternalWitness.java   |   2 +-
 .../mage/sets/commander/EvincarsJustice.java  |   2 +-
 .../mage/sets/commander/EvolvingWilds.java    |   2 +-
 .../sets/commander/ExplosiveVegetation.java   |   2 +-
 .../mage/sets/commander/ExtractorDemon.java   |   2 +-
 .../mage/sets/commander/FactOrFiction.java    |   2 +-
 .../src/mage/sets/commander/FallenAngel.java  |   2 +-
 .../src/mage/sets/commander/FalseProphet.java |   2 +-
 .../src/mage/sets/commander/FellwarStone.java |   2 +-
 .../src/mage/sets/commander/FireIce.java      |   2 +-
 .../src/mage/sets/commander/Firespout.java    |   2 +-
 .../mage/sets/commander/FistsOfIronwood.java  |   2 +-
 .../mage/sets/commander/FlametongueKavu.java  |   2 +-
 .../mage/sets/commander/FleshbagMarauder.java |   2 +-
 .../src/mage/sets/commander/FogBank.java      |   2 +-
 .../mage/sets/commander/ForgottenCave.java    |   2 +-
 .../src/mage/sets/commander/FurnaceWhelp.java |   2 +-
 .../sets/commander/GarrukWildspeaker.java     |   2 +-
 .../mage/sets/commander/GhostlyPrison.java    |   2 +-
 .../src/mage/sets/commander/GoblinCadets.java |   2 +-
 .../mage/sets/commander/GolgariGuildmage.java |   2 +-
 .../mage/sets/commander/GolgariRotFarm.java   |   2 +-
 .../mage/sets/commander/GolgariSignet.java    |   2 +-
 .../src/mage/sets/commander/Gomazoa.java      |   2 +-
 .../src/mage/sets/commander/GravePact.java    |   2 +-
 .../src/mage/sets/commander/Gravedigger.java  |   2 +-
 .../src/mage/sets/commander/GruulSignet.java  |   2 +-
 .../src/mage/sets/commander/GruulTurf.java    |   2 +-
 .../src/mage/sets/commander/GuardGomazoa.java |   2 +-
 .../src/mage/sets/commander/Harmonize.java    |   2 +-
 Mage.Sets/src/mage/sets/commander/Hex.java    |   2 +-
 .../src/mage/sets/commander/HomewardPath.java |   2 +-
 .../mage/sets/commander/HourOfReckoning.java  |   2 +-
 .../src/mage/sets/commander/HowlingMine.java  |   2 +-
 .../src/mage/sets/commander/HullBreach.java   |   2 +-
 .../src/mage/sets/commander/HuntingPack.java  |   2 +-
 .../src/mage/sets/commander/Insurrection.java |   2 +-
 .../mage/sets/commander/IntetTheDreamer.java  |   2 +-
 .../mage/sets/commander/IzzetBoilerworks.java |   2 +-
 .../mage/sets/commander/IzzetChronarch.java   |   2 +-
 .../src/mage/sets/commander/IzzetSignet.java  |   2 +-
 .../src/mage/sets/commander/JotunGrunt.java   |   2 +-
 .../mage/sets/commander/JourneyToNowhere.java |   2 +-
 .../mage/sets/commander/JwarIsleRefuge.java   |   2 +-
 .../mage/sets/commander/KazanduRefuge.java    |   2 +-
 .../src/mage/sets/commander/KrosanTusker.java |   2 +-
 .../src/mage/sets/commander/Lhurgoyf.java     |   2 +-
 .../sets/commander/LightkeeperOfEmeria.java   |   2 +-
 .../mage/sets/commander/LightningGreaves.java |   2 +-
 .../src/mage/sets/commander/LivingDeath.java  |   2 +-
 .../mage/sets/commander/LonelySandbar.java    |   2 +-
 .../src/mage/sets/commander/Malfegor.java     |   2 +-
 .../mage/sets/commander/MemoryErosion.java    |   2 +-
 .../mage/sets/commander/MoltenSlagheap.java   |   2 +-
 .../src/mage/sets/commander/MonkRealist.java  |   2 +-
 .../src/mage/sets/commander/Mortify.java      |   2 +-
 .../src/mage/sets/commander/Mortivore.java    |   2 +-
 .../mage/sets/commander/MotherOfRunes.java    |   2 +-
 .../sets/commander/MurmursFromBeyond.java     |   2 +-
 .../src/mage/sets/commander/NantukoHusk.java  |   2 +-
 .../src/mage/sets/commander/Necrogenesis.java |   2 +-
 .../src/mage/sets/commander/NemesisTrap.java  |   2 +-
 .../sets/commander/NezumiGraverobber.java     |   2 +-
 .../src/mage/sets/commander/Nucklavee.java    |   2 +-
 .../src/mage/sets/commander/Oblation.java     |   2 +-
 .../src/mage/sets/commander/OblivionRing.java |   2 +-
 .../mage/sets/commander/OblivionStone.java    |   2 +-
 .../mage/sets/commander/OniOfWildPlaces.java  |   2 +-
 .../src/mage/sets/commander/OrimsThunder.java |   2 +-
 .../mage/sets/commander/OrzhovBasilica.java   |   2 +-
 .../mage/sets/commander/OrzhovGuildmage.java  |   2 +-
 .../src/mage/sets/commander/OrzhovSignet.java |   2 +-
 .../src/mage/sets/commander/PathToExile.java  |   2 +-
 .../sets/commander/PatronOfTheNezumi.java     |   2 +-
 .../mage/sets/commander/PenumbraSpider.java   |   2 +-
 .../src/mage/sets/commander/Plumeveil.java    |   2 +-
 .../src/mage/sets/commander/PrisonTerm.java   |   2 +-
 .../src/mage/sets/commander/Propaganda.java   |   2 +-
 .../mage/sets/commander/PropheticPrism.java   |   2 +-
 .../mage/sets/commander/PunishingFire.java    |   2 +-
 .../src/mage/sets/commander/Pyrohemia.java    |   2 +-
 .../mage/sets/commander/RakdosCarnarium.java  |   2 +-
 .../src/mage/sets/commander/RakdosSignet.java |   2 +-
 .../src/mage/sets/commander/RapaciousOne.java |   2 +-
 .../src/mage/sets/commander/RayOfCommand.java |   2 +-
 .../src/mage/sets/commander/RazorjawOni.java  |   2 +-
 .../src/mage/sets/commander/ReinsOfPower.java |   2 +-
 .../src/mage/sets/commander/ReiverDemon.java  |   2 +-
 .../src/mage/sets/commander/RelicCrush.java   |   2 +-
 .../src/mage/sets/commander/Repulse.java      |   2 +-
 .../mage/sets/commander/RiseFromTheGrave.java |   2 +-
 .../src/mage/sets/commander/Ruination.java    |   2 +-
 .../src/mage/sets/commander/RuptureSpire.java |   2 +-
 .../mage/sets/commander/SakuraTribeElder.java |   2 +-
 .../mage/sets/commander/SavageTwister.java    |   2 +-
 .../mage/sets/commander/SecludedSteppe.java   |   2 +-
 .../mage/sets/commander/SelesnyaEvangel.java  |   2 +-
 .../sets/commander/SelesnyaGuildmage.java     |   2 +-
 .../sets/commander/SelesnyaSanctuary.java     |   2 +-
 .../mage/sets/commander/SelesnyaSignet.java   |   2 +-
 .../src/mage/sets/commander/SerraAngel.java   |   2 +-
 .../mage/sets/commander/ShatteredAngel.java   |   2 +-
 .../src/mage/sets/commander/SigilCaptain.java |   2 +-
 .../src/mage/sets/commander/SignInBlood.java  |   2 +-
 .../sets/commander/SimicGrowthChamber.java    |   2 +-
 .../src/mage/sets/commander/SimicSignet.java  |   2 +-
 .../sets/commander/SimicSkySwallower.java     |   2 +-
 .../src/mage/sets/commander/Skullclamp.java   |   2 +-
 .../src/mage/sets/commander/Skyscribing.java  |   2 +-
 .../mage/sets/commander/SlipstreamEel.java    |   2 +-
 .../src/mage/sets/commander/SolRing.java      |   2 +-
 .../mage/sets/commander/SolemnSimulacrum.java |   2 +-
 .../src/mage/sets/commander/SpikeFeeder.java  |   2 +-
 .../src/mage/sets/commander/StormHerd.java    |   2 +-
 .../mage/sets/commander/SulfurousBlast.java   |   2 +-
 .../mage/sets/commander/SymbioticWurm.java    |   2 +-
 .../src/mage/sets/commander/SyphonMind.java   |   2 +-
 .../sets/commander/TempleOfTheFalseGod.java   |   2 +-
 .../src/mage/sets/commander/Terminate.java    |   2 +-
 .../sets/commander/TerramorphicExpanse.java   |   2 +-
 .../mage/sets/commander/TranquilThicket.java  |   2 +-
 .../src/mage/sets/commander/Triskelavus.java  |   2 +-
 .../src/mage/sets/commander/TrollAscetic.java |   2 +-
 .../src/mage/sets/commander/Unnerve.java      |   2 +-
 .../src/mage/sets/commander/ValleyRannet.java |   2 +-
 .../mage/sets/commander/VampireNighthawk.java |   2 +-
 .../mage/sets/commander/VedalkenPlotter.java  |   2 +-
 .../mage/sets/commander/VengefulRebirth.java  |   2 +-
 .../src/mage/sets/commander/VisionSkeins.java |   2 +-
 .../src/mage/sets/commander/VividCrag.java    |   2 +-
 .../src/mage/sets/commander/VividCreek.java   |   2 +-
 .../src/mage/sets/commander/VividGrove.java   |   2 +-
 .../src/mage/sets/commander/VividMarsh.java   |   2 +-
 .../src/mage/sets/commander/VividMeadow.java  |   2 +-
 .../src/mage/sets/commander/VoiceOfAll.java   |   2 +-
 .../src/mage/sets/commander/WallOfDenial.java |   2 +-
 .../src/mage/sets/commander/WallOfOmens.java  |   2 +-
 .../src/mage/sets/commander/WindbornMuse.java |   2 +-
 .../src/mage/sets/commander/Windfall.java     |   2 +-
 Mage.Sets/src/mage/sets/commander/Wonder.java |   2 +-
 .../sets/commander/WrexialTheRisenDeep.java   |   2 +-
 .../src/mage/sets/commander/ZoeticCavern.java |   2 +-
 .../mage/sets/commander2013/AcidicSlime.java  |   2 +-
 .../mage/sets/commander2013/AerieMystics.java |   2 +-
 .../sets/commander2013/AjanisPridemate.java   |   2 +-
 .../mage/sets/commander2013/AkoumRefuge.java  |   2 +-
 .../mage/sets/commander2013/Annihilate.java   |   2 +-
 .../mage/sets/commander2013/ArcaneMelee.java  |   2 +-
 .../sets/commander2013/ArcaneSanctum.java     |   2 +-
 .../mage/sets/commander2013/Archangel.java    |   2 +-
 .../sets/commander2013/ArmillarySphere.java   |   2 +-
 .../sets/commander2013/ArmyOfTheDamned.java   |   2 +-
 .../mage/sets/commander2013/AugurOfBolas.java |   2 +-
 .../mage/sets/commander2013/AuguryAdept.java  |   2 +-
 .../sets/commander2013/AvengerOfZendikar.java |   2 +-
 .../commander2013/AzamiLadyOfScrolls.java     |   2 +-
 .../sets/commander2013/AzoriusChancery.java   |   2 +-
 .../sets/commander2013/AzoriusGuildgate.java  |   2 +-
 .../sets/commander2013/AzoriusKeyrune.java    |   2 +-
 .../mage/sets/commander2013/BalefulStrix.java |   2 +-
 .../sets/commander2013/BalothWoodcrasher.java |   2 +-
 .../mage/sets/commander2013/BantPanorama.java |   2 +-
 .../mage/sets/commander2013/BarrenMoor.java   |   2 +-
 .../sets/commander2013/BasaltMonolith.java    |   2 +-
 .../sets/commander2013/BehemothSledge.java    |   2 +-
 .../mage/sets/commander2013/BloodRites.java   |   2 +-
 .../sets/commander2013/BlueSunsZenith.java    |   2 +-
 .../mage/sets/commander2013/BojukaBog.java    |   2 +-
 .../mage/sets/commander2013/BorosCharm.java   |   2 +-
 .../sets/commander2013/BorosGarrison.java     |   2 +-
 .../sets/commander2013/BorosGuildgate.java    |   2 +-
 .../sets/commander2013/CapriciousEfreet.java  |   2 +-
 .../mage/sets/commander2013/CarnageAltar.java |   2 +-
 .../commander2013/CharmbreakerDevils.java     |   2 +-
 .../sets/commander2013/CharnelhoardWurm.java  |   2 +-
 .../sets/commander2013/ConjurersCloset.java   |   2 +-
 .../sets/commander2013/ContestedCliffs.java   |   2 +-
 .../mage/sets/commander2013/ControlMagic.java |   2 +-
 .../sets/commander2013/CradleOfVitality.java  |   2 +-
 .../sets/commander2013/CraterHellion.java     |   2 +-
 .../sets/commander2013/CruelUltimatum.java    |   2 +-
 .../commander2013/CrumblingNecropolis.java    |   2 +-
 .../mage/sets/commander2013/Cultivate.java    |   2 +-
 .../sets/commander2013/DarksteelIngot.java    |   2 +-
 .../mage/sets/commander2013/DeathGrasp.java   |   2 +-
 .../commander2013/DeathbringerThoctar.java    |   2 +-
 .../sets/commander2013/DeceiverExarch.java    |   2 +-
 .../mage/sets/commander2013/DeepAnalysis.java |   2 +-
 .../sets/commander2013/DimirGuildgate.java    |   2 +-
 .../mage/sets/commander2013/DirgeOfDread.java |   2 +-
 .../commander2013/DiscipleOfGriselbrand.java  |   2 +-
 .../src/mage/sets/commander2013/Dismiss.java  |   2 +-
 .../sets/commander2013/DivinityOfPride.java   |   2 +-
 .../sets/commander2013/DriftingMeadow.java    |   2 +-
 .../sets/commander2013/DruidicSatchel.java    |   2 +-
 .../mage/sets/commander2013/Drumhunter.java   |   2 +-
 .../sets/commander2013/DungeonGeists.java     |   2 +-
 .../src/mage/sets/commander2013/EchoMage.java |   2 +-
 .../sets/commander2013/ElvishSkysweeper.java  |   2 +-
 .../sets/commander2013/EsperPanorama.java     |   2 +-
 .../sets/commander2013/EternalDragon.java     |   2 +-
 .../sets/commander2013/EvolvingWilds.java     |   2 +-
 .../sets/commander2013/FaerieConclave.java    |   2 +-
 .../mage/sets/commander2013/FarhavenElf.java  |   2 +-
 .../mage/sets/commander2013/Fecundity.java    |   2 +-
 .../mage/sets/commander2013/FiendHunter.java  |   2 +-
 .../mage/sets/commander2013/FieryJustice.java |   2 +-
 .../sets/commander2013/FiligreeAngel.java     |   2 +-
 .../src/mage/sets/commander2013/Fireball.java |   2 +-
 .../sets/commander2013/FiresOfYavimaya.java   |   2 +-
 .../mage/sets/commander2013/FissureVent.java  |   2 +-
 .../mage/sets/commander2013/Flickerwisp.java  |   2 +-
 .../src/mage/sets/commander2013/FogBank.java  |   2 +-
 .../sets/commander2013/ForgottenCave.java     |   2 +-
 .../commander2013/FurnaceCelebration.java     |   2 +-
 .../sets/commander2013/GoblinBombardment.java |   2 +-
 .../commander2013/GoblinSharpshooter.java     |   2 +-
 .../sets/commander2013/GolgariGuildgate.java  |   2 +-
 .../sets/commander2013/GolgariGuildmage.java  |   2 +-
 .../sets/commander2013/GolgariRotFarm.java    |   2 +-
 .../sets/commander2013/GrazingGladehart.java  |   2 +-
 .../sets/commander2013/GrimBackwoods.java     |   2 +-
 .../mage/sets/commander2013/GrixisCharm.java  |   2 +-
 .../sets/commander2013/GrixisPanorama.java    |   2 +-
 .../sets/commander2013/GruulGuildgate.java    |   2 +-
 .../mage/sets/commander2013/GuardGomazoa.java |   2 +-
 .../mage/sets/commander2013/Guttersnipe.java  |   2 +-
 .../sets/commander2013/HadaSpyPatrol.java     |   2 +-
 .../mage/sets/commander2013/Harmonize.java    |   2 +-
 .../mage/sets/commander2013/HuntedTroll.java  |   2 +-
 .../mage/sets/commander2013/InfernoTitan.java |   2 +-
 .../src/mage/sets/commander2013/Infest.java   |   2 +-
 .../sets/commander2013/IzzetBoilerworks.java  |   2 +-
 .../sets/commander2013/IzzetGuildgate.java    |   2 +-
 .../sets/commander2013/JacesArchivist.java    |   2 +-
 .../src/mage/sets/commander2013/JadeMage.java |   2 +-
 .../sets/commander2013/JarOfEyeballs.java     |   2 +-
 .../mage/sets/commander2013/JundCharm.java    |   2 +-
 .../mage/sets/commander2013/JundPanorama.java |   2 +-
 .../mage/sets/commander2013/JungleShrine.java |   2 +-
 .../sets/commander2013/JwarIsleRefuge.java    |   2 +-
 .../mage/sets/commander2013/KarmicGuide.java  |   2 +-
 .../sets/commander2013/KazanduRefuge.java     |   2 +-
 .../sets/commander2013/KazanduTuskcaller.java |   2 +-
 .../mage/sets/commander2013/KhalniGarden.java |   2 +-
 .../mage/sets/commander2013/KrosanGrip.java   |   2 +-
 .../mage/sets/commander2013/KrosanTusker.java |   2 +-
 .../sets/commander2013/KrosanWarchief.java    |   2 +-
 .../sets/commander2013/LlanowarReborn.java    |   2 +-
 .../sets/commander2013/LonelySandbar.java     |   2 +-
 .../mage/sets/commander2013/MarrowBats.java   |   2 +-
 .../mage/sets/commander2013/MassMutiny.java   |   2 +-
 .../sets/commander2013/MayaelTheAnima.java    |   2 +-
 .../mage/sets/commander2013/MirrorEntity.java |   2 +-
 .../sets/commander2013/MistmeadowWitch.java   |   2 +-
 .../mage/sets/commander2013/MnemonicWall.java |   2 +-
 .../mage/sets/commander2013/MoldShambler.java |   2 +-
 .../sets/commander2013/MoltenDisaster.java    |   2 +-
 .../sets/commander2013/MyrBattlesphere.java   |   2 +-
 .../mage/sets/commander2013/NayaCharm.java    |   2 +-
 .../mage/sets/commander2013/NayaPanorama.java |   2 +-
 .../sets/commander2013/NevinyrralsDisk.java   |   2 +-
 .../mage/sets/commander2013/NewBenalia.java   |   2 +-
 .../mage/sets/commander2013/NightSoil.java    |   2 +-
 .../commander2013/NightscapeFamiliar.java     |   2 +-
 .../sets/commander2013/NihilSpellbomb.java    |   2 +-
 .../sets/commander2013/NivixGuildmage.java    |   2 +-
 .../sets/commander2013/ObeliskOfEsper.java    |   2 +-
 .../sets/commander2013/ObeliskOfGrixis.java   |   2 +-
 .../sets/commander2013/ObeliskOfJund.java     |   2 +-
 .../mage/sets/commander2013/Opportunity.java  |   2 +-
 .../sets/commander2013/OrzhovBasilica.java    |   2 +-
 .../sets/commander2013/OrzhovGuildgate.java   |   2 +-
 .../src/mage/sets/commander2013/Phthisis.java |   2 +-
 .../sets/commander2013/PhyrexianDelver.java   |   2 +-
 .../commander2013/PhyrexianGargantua.java     |   2 +-
 .../commander2013/PhyrexianReclamation.java   |   2 +-
 .../mage/sets/commander2013/PilgrimsEye.java  |   2 +-
 .../sets/commander2013/PristineTalisman.java  |   2 +-
 .../mage/sets/commander2013/Propaganda.java   |   2 +-
 .../sets/commander2013/QuagmireDruid.java     |   2 +-
 .../mage/sets/commander2013/RainOfThorns.java |   2 +-
 .../sets/commander2013/RakdosCarnarium.java   |   2 +-
 .../sets/commander2013/RakdosGuildgate.java   |   2 +-
 .../commander2013/RakeclawGargantuan.java     |   2 +-
 .../sets/commander2013/RampagingBaloths.java  |   2 +-
 .../sets/commander2013/RavenFamiliar.java     |   2 +-
 .../sets/commander2013/RavenousBaloth.java    |   2 +-
 .../sets/commander2013/RazorHippogriff.java   |   2 +-
 .../sets/commander2013/RecklessSpite.java     |   2 +-
 .../mage/sets/commander2013/RuptureSpire.java |   2 +-
 .../sets/commander2013/SakuraTribeElder.java  |   2 +-
 .../mage/sets/commander2013/SanguineBond.java |   2 +-
 .../mage/sets/commander2013/SavageLands.java  |   2 +-
 .../sets/commander2013/ScarlandThrinax.java   |   2 +-
 .../sets/commander2013/SeasideCitadel.java    |   2 +-
 .../sets/commander2013/SecludedSteppe.java    |   2 +-
 .../mage/sets/commander2013/SeersSundial.java |   2 +-
 .../mage/sets/commander2013/SejiriRefuge.java |   2 +-
 .../sets/commander2013/SelesnyaCharm.java     |   2 +-
 .../sets/commander2013/SelesnyaGuildgate.java |   2 +-
 .../sets/commander2013/SelesnyaGuildmage.java |   2 +-
 .../sets/commander2013/SelesnyaSanctuary.java |   2 +-
 .../sets/commander2013/SelesnyaSignet.java    |   2 +-
 .../mage/sets/commander2013/SerraAvatar.java  |   2 +-
 .../sets/commander2013/ShardingSphinx.java    |   2 +-
 .../sets/commander2013/SharuumTheHegemon.java |   2 +-
 .../sets/commander2013/SilklashSpider.java    |   2 +-
 .../sets/commander2013/SimicGuildgate.java    |   2 +-
 .../mage/sets/commander2013/SimicSignet.java  |   2 +-
 .../commander2013/SkywardEyeProphets.java     |   2 +-
 .../mage/sets/commander2013/SliceAndDice.java |   2 +-
 .../mage/sets/commander2013/SliceInTwain.java |   2 +-
 .../sets/commander2013/SlipperyKarst.java     |   2 +-
 .../sets/commander2013/SmolderingCrater.java  |   2 +-
 .../src/mage/sets/commander2013/SolRing.java  |   2 +-
 .../sets/commander2013/SoulManipulation.java  |   2 +-
 .../commander2013/SpellbreakerBehemoth.java   |   2 +-
 .../commander2013/SphinxOfTheSteelWind.java   |   2 +-
 .../sets/commander2013/SpinalEmbrace.java     |   2 +-
 .../sets/commander2013/SpineOfIshSah.java     |   2 +-
 .../mage/sets/commander2013/Spitebellows.java |   2 +-
 .../sets/commander2013/SpitefulVisions.java   |   2 +-
 .../sets/commander2013/SproutingThrinax.java  |   2 +-
 .../sets/commander2013/SproutingVines.java    |   2 +-
 .../mage/sets/commander2013/Starstorm.java    |   2 +-
 .../mage/sets/commander2013/StreetSpasm.java  |   2 +-
 .../commander2013/StrongholdAssassin.java     |   2 +-
 .../sets/commander2013/SuddenSpoiling.java    |   2 +-
 .../sets/commander2013/SurvivalCache.java     |   2 +-
 .../sets/commander2013/SwiftfootBoots.java    |   2 +-
 .../mage/sets/commander2013/TempleBell.java   |   2 +-
 .../commander2013/TerramorphicExpanse.java    |   2 +-
 .../sets/commander2013/ThopterFoundry.java    |   2 +-
 .../sets/commander2013/ThornwindFaeries.java  |   2 +-
 .../mage/sets/commander2013/Thraximundar.java |   2 +-
 .../sets/commander2013/TidehollowStrix.java   |   2 +-
 .../mage/sets/commander2013/ToothAndClaw.java |   2 +-
 .../sets/commander2013/TowerGargoyle.java     |   2 +-
 .../sets/commander2013/TowerOfFortunes.java   |   2 +-
 .../sets/commander2013/TranquilThicket.java   |   2 +-
 .../commander2013/TransguildPromenade.java    |   2 +-
 .../mage/sets/commander2013/UrzasFactory.java |   2 +-
 .../sets/commander2013/UyoSilentProphet.java  |   2 +-
 .../mage/sets/commander2013/ValleyRannet.java |   2 +-
 .../sets/commander2013/VampireNighthawk.java  |   2 +-
 .../mage/sets/commander2013/VileRequiem.java  |   2 +-
 .../mage/sets/commander2013/VisceraSeer.java  |   2 +-
 .../src/mage/sets/commander2013/Viseling.java |   2 +-
 .../commander2013/VituGhaziTheCityTree.java   |   2 +-
 .../mage/sets/commander2013/VividCrag.java    |   2 +-
 .../mage/sets/commander2013/VividCreek.java   |   2 +-
 .../mage/sets/commander2013/VividGrove.java   |   2 +-
 .../mage/sets/commander2013/VividMarsh.java   |   2 +-
 .../sets/commander2013/VizkopaGuildmage.java  |   2 +-
 .../sets/commander2013/WalkerOfTheGrove.java  |   2 +-
 .../sets/commander2013/WallOfReverence.java   |   2 +-
 .../sets/commander2013/WarstormSurge.java     |   2 +-
 .../src/mage/sets/commander2013/WashOut.java  |   2 +-
 .../commander2013/WhereAncientsTread.java     |   2 +-
 .../commander2013/WightOfPrecinctSix.java     |   2 +-
 .../mage/sets/commander2013/WildRicochet.java |   2 +-
 .../mage/sets/commander2013/WingedCoatl.java  |   2 +-
 .../src/mage/sets/commander2013/Wonder.java   |   2 +-
 .../mage/sets/commander2013/WrathOfGod.java   |   2 +-
 .../sets/commander2014/AbyssalPersecutor.java |   2 +-
 .../sets/commander2014/AdarkarValkyrie.java   |   2 +-
 .../mage/sets/commander2014/Afterlife.java    |   2 +-
 .../mage/sets/commander2014/Annihilate.java   |   2 +-
 .../sets/commander2014/ArgentumArmor.java     |   2 +-
 .../sets/commander2014/ArtisanOfKozilek.java  |   2 +-
 .../mage/sets/commander2014/AzureMage.java    |   2 +-
 .../src/mage/sets/commander2014/BadMoon.java  |   2 +-
 .../mage/sets/commander2014/BarrenMoor.java   |   2 +-
 .../commander2014/BeastmasterAscension.java   |   2 +-
 .../sets/commander2014/BeetlebackChief.java   |   2 +-
 .../sets/commander2014/BlackSunsZenith.java   |   2 +-
 .../sets/commander2014/BlasphemousAct.java    |   2 +-
 .../sets/commander2014/BloodgiftDemon.java    |   2 +-
 .../sets/commander2014/BogardanHellkite.java  |   2 +-
 .../mage/sets/commander2014/BojukaBog.java    |   2 +-
 .../mage/sets/commander2014/Bonehoard.java    |   2 +-
 .../sets/commander2014/BoshIronGolem.java     |   2 +-
 .../mage/sets/commander2014/BottleGnomes.java |   2 +-
 .../sets/commander2014/BraveTheElements.java  |   2 +-
 .../mage/sets/commander2014/BuriedRuin.java   |   2 +-
 .../sets/commander2014/BurnishedHart.java     |   2 +-
 .../sets/commander2014/ButcherOfMalakir.java  |   2 +-
 .../commander2014/CacklingCounterpart.java    |   2 +-
 .../src/mage/sets/commander2014/CagedSun.java |   2 +-
 .../mage/sets/commander2014/CallToMind.java   |   2 +-
 .../sets/commander2014/CatharsCrusade.java    |   2 +-
 .../mage/sets/commander2014/Cathodion.java    |   2 +-
 .../sets/commander2014/CelestialCrusader.java |   2 +-
 .../mage/sets/commander2014/ChaosWarp.java    |   2 +-
 .../sets/commander2014/CharcoalDiamond.java   |   2 +-
 .../commander2014/CollectiveUnconscious.java  |   2 +-
 .../commander2014/CompulsiveResearch.java     |   2 +-
 .../mage/sets/commander2014/Concentrate.java  |   2 +-
 .../src/mage/sets/commander2014/Condemn.java  |   2 +-
 .../mage/sets/commander2014/CryptGhast.java   |   2 +-
 .../sets/commander2014/CryptOfAgadeem.java    |   2 +-
 .../mage/sets/commander2014/CrystalVein.java  |   2 +-
 .../mage/sets/commander2014/CyclonicRift.java |   2 +-
 .../sets/commander2014/DarksteelCitadel.java  |   2 +-
 .../sets/commander2014/DecreeOfJustice.java   |   2 +-
 .../sets/commander2014/DeepSeaKraken.java     |   2 +-
 .../sets/commander2014/DesertTwister.java     |   2 +-
 .../sets/commander2014/DiscipleOfBolas.java   |   2 +-
 .../src/mage/sets/commander2014/Dismiss.java  |   2 +-
 .../DranaKalastriaBloodchief.java             |   2 +-
 .../mage/sets/commander2014/DreadReturn.java  |   2 +-
 .../sets/commander2014/DreamstoneHedron.java  |   2 +-
 .../sets/commander2014/DriftingMeadow.java    |   2 +-
 .../mage/sets/commander2014/DroveOfElves.java |   2 +-
 .../sets/commander2014/ElvishArchdruid.java   |   2 +-
 .../mage/sets/commander2014/ElvishMystic.java |   2 +-
 .../sets/commander2014/ElvishSkysweeper.java  |   2 +-
 .../sets/commander2014/ElvishVisionary.java   |   2 +-
 .../sets/commander2014/EmeraldMedallion.java  |   2 +-
 .../sets/commander2014/EmeriaTheSkyRuin.java  |   2 +-
 .../mage/sets/commander2014/Epochrasite.java  |   2 +-
 .../sets/commander2014/EssenceWarden.java     |   2 +-
 .../commander2014/EverflowingChalice.java     |   2 +-
 .../sets/commander2014/EvernightShade.java    |   2 +-
 .../sets/commander2014/EvolvingWilds.java     |   2 +-
 .../commander2014/EzuriRenegadeLeader.java    |   2 +-
 .../sets/commander2014/FaithlessLooting.java  |   2 +-
 .../mage/sets/commander2014/FarhavenElf.java  |   2 +-
 .../mage/sets/commander2014/FathomSeer.java   |   2 +-
 .../mage/sets/commander2014/FireDiamond.java  |   2 +-
 .../sets/commander2014/FlametongueKavu.java   |   2 +-
 .../mage/sets/commander2014/Flickerwisp.java  |   2 +-
 .../src/mage/sets/commander2014/FogBank.java  |   2 +-
 .../sets/commander2014/ForgottenCave.java     |   2 +-
 .../mage/sets/commander2014/FreshMeat.java    |   2 +-
 .../mage/sets/commander2014/FrostTitan.java   |   2 +-
 .../sets/commander2014/GargoyleCastle.java    |   2 +-
 .../sets/commander2014/GeistHonoredMonk.java  |   2 +-
 .../mage/sets/commander2014/GhostQuarter.java |   2 +-
 .../mage/sets/commander2014/GoblinWelder.java |   2 +-
 .../sets/commander2014/GrandAbolisher.java    |   2 +-
 .../mage/sets/commander2014/GraveTitan.java   |   2 +-
 .../commander2014/GrayMerchantOfAsphodel.java |   2 +-
 .../mage/sets/commander2014/GreatFurnace.java |   2 +-
 .../sets/commander2014/GrimFlowering.java     |   2 +-
 .../src/mage/sets/commander2014/Harrow.java   |   2 +-
 .../sets/commander2014/HauntedFengraf.java    |   2 +-
 .../commander2014/HavenwoodBattleground.java  |   2 +-
 .../commander2014/HoardSmelterDragon.java     |   2 +-
 .../commander2014/HoverguardSweepers.java     |   2 +-
 .../mage/sets/commander2014/HuntingTriad.java |   2 +-
 .../sets/commander2014/IchorWellspring.java   |   2 +-
 .../commander2014/ImmaculateMagistrate.java   |   2 +-
 .../sets/commander2014/ImperiousPerfect.java  |   2 +-
 .../commander2014/InfiniteReflection.java     |   2 +-
 .../mage/sets/commander2014/IngotChewer.java  |   2 +-
 .../mage/sets/commander2014/IntoTheRoil.java  |   2 +-
 .../mage/sets/commander2014/JalumTome.java    |   2 +-
 .../mage/sets/commander2014/JetMedallion.java |   2 +-
 .../sets/commander2014/JoragaWarcaller.java   |   2 +-
 .../sets/commander2014/KembaKhaRegent.java    |   2 +-
 .../sets/commander2014/KorSanctifiers.java    |   2 +-
 .../mage/sets/commander2014/Lashwrithe.java   |   2 +-
 .../sets/commander2014/LilianasReaver.java    |   2 +-
 .../sets/commander2014/LiquimetalCoating.java |   2 +-
 .../sets/commander2014/LlanowarElves.java     |   2 +-
 .../sets/commander2014/LonelySandbar.java     |   2 +-
 .../commander2014/LorthosTheTidemaker.java    |   2 +-
 .../sets/commander2014/LoxodonWarhammer.java  |   2 +-
 .../commander2014/LysAlanaHuntmaster.java     |   2 +-
 .../mage/sets/commander2014/Magmaquake.java   |   2 +-
 .../sets/commander2014/MarbleDiamond.java     |   2 +-
 .../sets/commander2014/MarshalsAnthem.java    |   2 +-
 .../mage/sets/commander2014/MartialCoup.java  |   2 +-
 .../mage/sets/commander2014/MaskOfMemory.java |   2 +-
 .../sets/commander2014/MaskedAdmirers.java    |   2 +-
 .../sets/commander2014/MentorOfTheMeek.java   |   2 +-
 .../sets/commander2014/MidnightHaunting.java  |   2 +-
 .../mage/sets/commander2014/MindStone.java    |   2 +-
 .../mage/sets/commander2014/Mobilization.java |   2 +-
 .../sets/commander2014/MoonsilverSpear.java   |   2 +-
 .../sets/commander2014/MorkrutBanshee.java    |   2 +-
 .../mage/sets/commander2014/MossDiamond.java  |   2 +-
 .../mage/sets/commander2014/Mulldrifter.java  |   2 +-
 .../src/mage/sets/commander2014/Mutilate.java |   2 +-
 .../commander2014/MycosynthWellspring.java    |   2 +-
 .../sets/commander2014/MyrBattlesphere.java   |   2 +-
 .../mage/sets/commander2014/MyrRetriever.java |   2 +-
 .../src/mage/sets/commander2014/MyrSire.java  |   2 +-
 .../mage/sets/commander2014/NantukoShade.java |   2 +-
 .../mage/sets/commander2014/Nekrataal.java    |   2 +-
 .../sets/commander2014/NevinyrralsDisk.java   |   2 +-
 .../sets/commander2014/NomadsAssembly.java    |   2 +-
 .../src/mage/sets/commander2014/Oblation.java |   2 +-
 .../commander2014/OranRiefTheVastwood.java    |   2 +-
 .../src/mage/sets/commander2014/Overrun.java  |   2 +-
 .../commander2014/OverwhelmingStampede.java   |   2 +-
 .../mage/sets/commander2014/PalladiumMyr.java |   2 +-
 .../sets/commander2014/PanicSpellbomb.java    |   2 +-
 .../sets/commander2014/PearlMedallion.java    |   2 +-
 .../src/mage/sets/commander2014/Pentavus.java |   2 +-
 .../sets/commander2014/PestilenceDemon.java   |   2 +-
 .../commander2014/PhyrexianGargantua.java     |   2 +-
 .../sets/commander2014/PhyrexianIngester.java |   2 +-
 .../sets/commander2014/PhyrexiasCore.java     |   2 +-
 .../mage/sets/commander2014/PilgrimsEye.java  |   2 +-
 .../mage/sets/commander2014/PollutedMire.java |   2 +-
 .../src/mage/sets/commander2014/Pongify.java  |   2 +-
 .../sets/commander2014/PontiffOfBlight.java   |   2 +-
 .../sets/commander2014/PraetorsCounsel.java   |   2 +-
 .../sets/commander2014/PriestOfTitania.java   |   2 +-
 .../sets/commander2014/PrimordialSage.java    |   2 +-
 .../sets/commander2014/PristineTalisman.java  |   2 +-
 .../sets/commander2014/RampagingBaloths.java  |   2 +-
 .../mage/sets/commander2014/ReadTheBones.java |   2 +-
 .../commander2014/ReaperFromTheAbyss.java     |   2 +-
 .../sets/commander2014/ReclamationSage.java   |   2 +-
 .../sets/commander2014/ReliquaryTower.java    |   2 +-
 .../mage/sets/commander2014/RemoteIsle.java   |   2 +-
 .../mage/sets/commander2014/RequiemAngel.java |   2 +-
 .../mage/sets/commander2014/ReturnToDust.java |   2 +-
 .../sets/commander2014/RiteOfReplication.java |   2 +-
 .../sets/commander2014/RubyMedallion.java     |   2 +-
 .../mage/sets/commander2014/SacredMesa.java   |   2 +-
 .../sets/commander2014/SapphireMedallion.java |   2 +-
 .../sets/commander2014/SeaGateOracle.java     |   2 +-
 .../sets/commander2014/SecludedSteppe.java    |   2 +-
 .../mage/sets/commander2014/SeersSundial.java |   2 +-
 .../mage/sets/commander2014/SerraAvatar.java  |   2 +-
 .../mage/sets/commander2014/Shriekmaw.java    |   2 +-
 .../mage/sets/commander2014/SignInBlood.java  |   2 +-
 .../sets/commander2014/SilklashSpider.java    |   2 +-
 .../commander2014/SilverbladePaladin.java     |   2 +-
 .../sets/commander2014/SkeletalScrying.java   |   2 +-
 .../commander2014/SkirsdagHighPriest.java     |   2 +-
 .../mage/sets/commander2014/Skullclamp.java   |   2 +-
 .../mage/sets/commander2014/SkyDiamond.java   |   2 +-
 .../commander2014/SkyhunterSkirmisher.java    |   2 +-
 .../sets/commander2014/SlipperyKarst.java     |   2 +-
 .../sets/commander2014/SmolderingCrater.java  |   2 +-
 .../src/mage/sets/commander2014/SolRing.java  |   2 +-
 .../sets/commander2014/SolemnSimulacrum.java  |   2 +-
 .../sets/commander2014/SoulOfTheHarvest.java  |   2 +-
 .../commander2014/SpectralProcession.java     |   2 +-
 .../sets/commander2014/SphinxOfJwarIsle.java  |   2 +-
 .../sets/commander2014/SphinxOfMagosi.java    |   2 +-
 .../sets/commander2014/SphinxOfUthuun.java    |   2 +-
 .../sets/commander2014/SpineOfIshSah.java     |   2 +-
 .../mage/sets/commander2014/Spitebellows.java |   2 +-
 .../mage/sets/commander2014/Starstorm.java    |   2 +-
 .../sets/commander2014/SteelHellkite.java     |   2 +-
 .../mage/sets/commander2014/StrataScythe.java |   2 +-
 .../sets/commander2014/StrokeOfGenius.java    |   2 +-
 .../sets/commander2014/SuddenSpoiling.java    |   2 +-
 .../src/mage/sets/commander2014/SunTitan.java |   2 +-
 .../sets/commander2014/SunblastAngel.java     |   2 +-
 .../sets/commander2014/SwiftfootBoots.java    |   2 +-
 .../sets/commander2014/SwordOfVengeance.java  |   2 +-
 .../mage/sets/commander2014/SylvanRanger.java |   2 +-
 .../sets/commander2014/SylvanSafekeeper.java  |   2 +-
 .../mage/sets/commander2014/SyphonMind.java   |   2 +-
 .../mage/sets/commander2014/TectonicEdge.java |   2 +-
 .../commander2014/TempleOfTheFalseGod.java    |   2 +-
 .../commander2014/TendrilsOfCorruption.java   |   2 +-
 .../mage/sets/commander2014/Terastodon.java   |   2 +-
 .../commander2014/TerramorphicExpanse.java    |   2 +-
 .../sets/commander2014/ThornwealdArcher.java  |   2 +-
 .../mage/sets/commander2014/ThranDynamo.java  |   2 +-
 .../sets/commander2014/TimberwatchElf.java    |   2 +-
 .../sets/commander2014/TitaniasChosen.java    |   2 +-
 .../mage/sets/commander2014/TormodsCrypt.java |   2 +-
 .../sets/commander2014/TornadoElemental.java  |   2 +-
 .../mage/sets/commander2014/TradingPost.java  |   2 +-
 .../mage/sets/commander2014/TragicSlip.java   |   2 +-
 .../sets/commander2014/TranquilThicket.java   |   2 +-
 .../sets/commander2014/TrueConviction.java    |   2 +-
 .../sets/commander2014/TuktukTheExplorer.java |   2 +-
 .../mage/sets/commander2014/TurnToFrog.java   |   2 +-
 .../sets/commander2014/TwilightShepherd.java  |   2 +-
 .../mage/sets/commander2014/UrGolemsEye.java  |   2 +-
 .../sets/commander2014/VampireHexmage.java    |   2 +-
 .../mage/sets/commander2014/Victimize.java    |   2 +-
 .../sets/commander2014/WayfarersBauble.java   |   2 +-
 .../mage/sets/commander2014/Wellwisher.java   |   2 +-
 .../mage/sets/commander2014/Whipflare.java    |   2 +-
 .../sets/commander2014/WhiteSunsZenith.java   |   2 +-
 .../mage/sets/commander2014/WingShards.java   |   2 +-
 .../commander2014/WolfbriarElemental.java     |   2 +-
 .../mage/sets/commander2014/WoodElves.java    |   2 +-
 .../sets/commander2014/WornPowerstone.java    |   2 +-
 .../commander2014/WrensRunPackmaster.java     |   2 +-
 .../sets/commander2014/WurmcoilEngine.java    |   2 +-
 .../mage/sets/commander2014/XathridDemon.java |   2 +-
 .../mage/sets/commander2015/AEtherize.java    |   2 +-
 .../mage/sets/commander2015/AcidicSlime.java  |   2 +-
 .../sets/commander2015/ActOfAggression.java   |   2 +-
 .../mage/sets/commander2015/AjanisChosen.java |   2 +-
 .../mage/sets/commander2015/AltarsReap.java   |   2 +-
 .../sets/commander2015/AmbitionsCost.java     |   2 +-
 .../commander2015/AncientAmphitheater.java    |   2 +-
 .../sets/commander2015/AncientCraving.java    |   2 +-
 .../sets/commander2015/AngelOfSerenity.java   |   2 +-
 .../commander2015/ArbiterOfKnollridge.java    |   2 +-
 .../sets/commander2015/ArborColossus.java     |   2 +-
 .../sets/commander2015/AuraOfSilence.java     |   2 +-
 .../sets/commander2015/BaneOfProgress.java    |   2 +-
 .../sets/commander2015/BanishingLight.java    |   2 +-
 .../mage/sets/commander2015/BarrenMoor.java   |   2 +-
 .../sets/commander2015/BarterInBlood.java     |   2 +-
 .../sets/commander2015/BasaltMonolith.java    |   2 +-
 .../commander2015/BeastmasterAscension.java   |   2 +-
 .../sets/commander2015/BidentOfThassa.java    |   2 +-
 .../sets/commander2015/BiomanticMastery.java  |   2 +-
 .../mage/sets/commander2015/BlackMarket.java  |   2 +-
 .../sets/commander2015/BlastedLandscape.java  |   2 +-
 .../sets/commander2015/BlatantThievery.java   |   2 +-
 .../mage/sets/commander2015/BloodBairn.java   |   2 +-
 .../sets/commander2015/BlueSunsZenith.java    |   2 +-
 .../sets/commander2015/Blustersquall.java     |   2 +-
 .../mage/sets/commander2015/Bonehoard.java    |   2 +-
 .../sets/commander2015/BorosCluestone.java    |   2 +-
 .../sets/commander2015/BorosGarrison.java     |   2 +-
 .../sets/commander2015/BorosGuildgate.java    |   2 +-
 .../mage/sets/commander2015/BorosSignet.java  |   2 +-
 .../mage/sets/commander2015/Brainstorm.java   |   2 +-
 .../sets/commander2015/BreathOfDarigaaz.java  |   2 +-
 .../sets/commander2015/BurnishedHart.java     |   2 +-
 .../sets/commander2015/ButcherOfMalakir.java  |   2 +-
 .../mage/sets/commander2015/CageOfHands.java  |   2 +-
 .../sets/commander2015/CallTheSkybreaker.java |   2 +-
 .../sets/commander2015/CallerOfTheClaw.java   |   2 +-
 .../sets/commander2015/CelestialAncient.java  |   2 +-
 .../sets/commander2015/CelestialArchon.java   |   2 +-
 .../sets/commander2015/ChainReaction.java     |   2 +-
 .../sets/commander2015/ChameleonColossus.java |   2 +-
 .../commander2015/ChampionOfStraySouls.java   |   2 +-
 .../commander2015/CharmbreakerDevils.java     |   2 +-
 .../sets/commander2015/Cloudthresher.java     |   2 +-
 .../mage/sets/commander2015/CobraTrap.java    |   2 +-
 .../sets/commander2015/CoilingOracle.java     |   2 +-
 .../sets/commander2015/ColdEyedSelkie.java    |   2 +-
 .../sets/commander2015/ColdsteelHeart.java    |   2 +-
 .../mage/sets/commander2015/CometStorm.java   |   2 +-
 .../mage/sets/commander2015/CommandTower.java |   2 +-
 .../mage/sets/commander2015/Counterflux.java  |   2 +-
 .../src/mage/sets/commander2015/CribSwap.java |   2 +-
 .../commander2015/CurseOfTheNightlyHunt.java  |   2 +-
 .../sets/commander2015/DarksteelIngot.java    |   2 +-
 .../mage/sets/commander2015/DawnToDusk.java   |   2 +-
 .../sets/commander2015/DawnglareInvoker.java  |   2 +-
 .../sets/commander2015/DayOfTheDragons.java   |   2 +-
 .../mage/sets/commander2015/DeathGrasp.java   |   2 +-
 .../sets/commander2015/DesertTwister.java     |   2 +-
 .../sets/commander2015/DesolationGiant.java   |   2 +-
 .../sets/commander2015/DesperateRavings.java  |   2 +-
 .../sets/commander2015/DiabolicServitude.java |   2 +-
 .../sets/commander2015/DictateOfHeliod.java   |   2 +-
 .../sets/commander2015/DisasterRadius.java    |   2 +-
 .../src/mage/sets/commander2015/Dominate.java |   2 +-
 .../sets/commander2015/DoomwakeGiant.java     |   2 +-
 .../mage/sets/commander2015/DragonMage.java   |   2 +-
 .../commander2015/DreadbringerLampads.java    |   2 +-
 .../sets/commander2015/DreamstoneHedron.java  |   2 +-
 .../sets/commander2015/DriftingMeadow.java    |   2 +-
 .../mage/sets/commander2015/Earthquake.java   |   2 +-
 .../mage/sets/commander2015/EaterOfHope.java  |   2 +-
 .../mage/sets/commander2015/EchoingTruth.java |   2 +-
 .../sets/commander2015/EldraziMonument.java   |   2 +-
 .../sets/commander2015/ElvishVisionary.java   |   2 +-
 .../sets/commander2015/EpicExperiment.java    |   2 +-
 .../sets/commander2015/EternalWitness.java    |   2 +-
 .../commander2015/EtheriumHornSorcerer.java   |   2 +-
 .../sets/commander2015/EvolvingWilds.java     |   2 +-
 .../sets/commander2015/ExperimentOne.java     |   2 +-
 .../sets/commander2015/ExtractorDemon.java    |   2 +-
 .../sets/commander2015/FactOrFiction.java     |   2 +-
 .../sets/commander2015/FaithlessLooting.java  |   2 +-
 .../sets/commander2015/FaithsFetters.java     |   2 +-
 .../sets/commander2015/FallOfTheHammer.java   |   2 +-
 .../mage/sets/commander2015/FallenIdeal.java  |   2 +-
 .../sets/commander2015/FateUnraveler.java     |   2 +-
 .../mage/sets/commander2015/FellwarStone.java |   2 +-
 .../commander2015/FiremindsForesight.java     |   2 +-
 .../sets/commander2015/ForgottenAncient.java  |   2 +-
 .../sets/commander2015/ForgottenCave.java     |   2 +-
 .../sets/commander2015/FumikoTheLowblood.java |   2 +-
 .../mage/sets/commander2015/GhostQuarter.java |   2 +-
 .../sets/commander2015/GhostbladeEidolon.java |   2 +-
 .../src/mage/sets/commander2015/Gild.java     |   2 +-
 .../commander2015/GiselaBladeOfGoldnight.java |   2 +-
 .../commander2015/GoblinElectromancer.java    |   2 +-
 .../mage/sets/commander2015/GolgariCharm.java |   2 +-
 .../sets/commander2015/GolgariGuildgate.java  |   2 +-
 .../sets/commander2015/GolgariRotFarm.java    |   2 +-
 .../sets/commander2015/GolgariSignet.java     |   2 +-
 .../mage/sets/commander2015/GravePeril.java   |   2 +-
 .../sets/commander2015/GrimBackwoods.java     |   2 +-
 .../sets/commander2015/GrislySalvage.java     |   2 +-
 .../sets/commander2015/HamletbackGoliath.java |   2 +-
 .../sets/commander2015/HammerfistGiant.java   |   2 +-
 .../mage/sets/commander2015/HighMarket.java   |   2 +-
 .../mage/sets/commander2015/Hostility.java    |   2 +-
 .../mage/sets/commander2015/HuntedDragon.java |   2 +-
 .../sets/commander2015/IndrikStomphowler.java |   2 +-
 .../mage/sets/commander2015/InfernoTitan.java |   2 +-
 .../sets/commander2015/IzzetBoilerworks.java  |   2 +-
 .../sets/commander2015/IzzetGuildgate.java    |   2 +-
 .../mage/sets/commander2015/IzzetSignet.java  |   2 +-
 .../sets/commander2015/JacesArchivist.java    |   2 +-
 .../commander2015/JaradGolgariLichLord.java   |   2 +-
 .../commander2015/JarethLeonineTitan.java     |   2 +-
 .../mage/sets/commander2015/JungleHollow.java |   2 +-
 .../sets/commander2015/KarmicJustice.java     |   2 +-
 .../commander2015/KessigCagebreakers.java     |   2 +-
 .../mage/sets/commander2015/KodamasReach.java |   2 +-
 .../sets/commander2015/KorSanctifiers.java    |   2 +-
 .../sets/commander2015/KorozdaGuildmage.java  |   2 +-
 .../mage/sets/commander2015/KrosanGrip.java   |   2 +-
 .../sets/commander2015/LightningGreaves.java  |   2 +-
 .../sets/commander2015/LlanowarReborn.java    |   2 +-
 .../sets/commander2015/LoamingShaman.java     |   2 +-
 .../mage/sets/commander2015/LoneRevenant.java |   2 +-
 .../sets/commander2015/LorescaleCoatl.java    |   2 +-
 .../mage/sets/commander2015/LotlethTroll.java |   2 +-
 .../sets/commander2015/LoxodonWarhammer.java  |   2 +-
 .../mage/sets/commander2015/MagmaGiant.java   |   2 +-
 .../mage/sets/commander2015/Magmaquake.java   |   2 +-
 .../sets/commander2015/MarshalsAnthem.java    |   2 +-
 .../sets/commander2015/MelekIzzetParagon.java |   2 +-
 .../sets/commander2015/MesaEnchantress.java   |   2 +-
 .../mage/sets/commander2015/MindStone.java    |   2 +-
 .../sets/commander2015/MizziumMortars.java    |   2 +-
 .../mage/sets/commander2015/MonkIdealist.java |   2 +-
 .../sets/commander2015/MosswortBridge.java    |   2 +-
 .../src/mage/sets/commander2015/Mulch.java    |   2 +-
 .../mage/sets/commander2015/Mulldrifter.java  |   2 +-
 .../src/mage/sets/commander2015/Mycoloth.java |   2 +-
 .../sets/commander2015/MysticRetrieval.java   |   2 +-
 .../mage/sets/commander2015/MysticSnake.java  |   2 +-
 .../commander2015/NecromancersCovenant.java   |   2 +-
 .../mage/sets/commander2015/NewBenalia.java   |   2 +-
 .../mage/sets/commander2015/Nighthowler.java  |   2 +-
 .../commander2015/NinjaOfTheDeepHours.java    |   2 +-
 .../mage/sets/commander2015/NobleQuarry.java  |   2 +-
 .../commander2015/NovijenHeartOfProgress.java |   2 +-
 .../mage/sets/commander2015/OhranViper.java   |   2 +-
 .../sets/commander2015/OpenTheVaults.java     |   2 +-
 .../commander2015/OranRiefTheVastwood.java    |   2 +-
 .../mage/sets/commander2015/OrimsThunder.java |   2 +-
 .../sets/commander2015/OrochiHatchery.java    |   2 +-
 .../sets/commander2015/OrzhovBasilica.java    |   2 +-
 .../sets/commander2015/OrzhovCluestone.java   |   2 +-
 .../sets/commander2015/OrzhovGuildgate.java   |   2 +-
 .../mage/sets/commander2015/OrzhovSignet.java |   2 +-
 .../src/mage/sets/commander2015/Overrun.java  |   2 +-
 .../commander2015/OverwhelmingStampede.java   |   2 +-
 .../mage/sets/commander2015/PatagiaViper.java |   2 +-
 .../sets/commander2015/PhyrexianArena.java    |   2 +-
 .../commander2015/PhyrexianPlaguelord.java    |   2 +-
 .../sets/commander2015/PhyrexianRager.java    |   2 +-
 .../commander2015/PhyrexianReclamation.java   |   2 +-
 .../mage/sets/commander2015/Plaxmanta.java    |   2 +-
 .../mage/sets/commander2015/PollutedMire.java |   2 +-
 .../mage/sets/commander2015/Preordain.java    |   2 +-
 .../mage/sets/commander2015/PrimalGrowth.java |   2 +-
 .../commander2015/PrimeSpeakerZegana.java     |   2 +-
 .../sets/commander2015/PropheticBolt.java     |   2 +-
 .../sets/commander2015/PsychosisCrawler.java  |   2 +-
 .../src/mage/sets/commander2015/Putrefy.java  |   2 +-
 .../sets/commander2015/RampantGrowth.java     |   2 +-
 .../commander2015/RapidHybridization.java     |   2 +-
 .../mage/sets/commander2015/ReinsOfPower.java |   2 +-
 .../sets/commander2015/ReliquaryTower.java    |   2 +-
 .../src/mage/sets/commander2015/Repeal.java   |   2 +-
 .../sets/commander2015/RiseFromTheGrave.java  |   2 +-
 .../sets/commander2015/RiteOfReplication.java |   2 +-
 .../sets/commander2015/RoguesPassage.java     |   2 +-
 .../sets/commander2015/SakuraTribeElder.java  |   2 +-
 .../sets/commander2015/SatyrWayfinder.java    |   2 +-
 .../sets/commander2015/ScouredBarrens.java    |   2 +-
 .../sets/commander2015/SealOfCleansing.java   |   2 +-
 .../mage/sets/commander2015/SealOfDoom.java   |   2 +-
 .../sets/commander2015/SecludedSteppe.java    |   2 +-
 .../mage/sets/commander2015/SeersSundial.java |   2 +-
 .../sets/commander2015/SeverTheBloodline.java |   2 +-
 .../mage/sets/commander2015/Shriekmaw.java    |   2 +-
 .../commander2015/SigilOfTheEmptyThrone.java  |   2 +-
 .../sets/commander2015/SilentSentinel.java    |   2 +-
 .../commander2015/SimicGrowthChamber.java     |   2 +-
 .../sets/commander2015/SimicGuildgate.java    |   2 +-
 .../mage/sets/commander2015/SimicKeyrune.java |   2 +-
 .../mage/sets/commander2015/SimicSignet.java  |   2 +-
 .../mage/sets/commander2015/Skullclamp.java   |   2 +-
 .../src/mage/sets/commander2015/Sleep.java    |   2 +-
 .../sets/commander2015/SlipperyKarst.java     |   2 +-
 .../sets/commander2015/SmolderingCrater.java  |   2 +-
 .../mage/sets/commander2015/Snakeform.java    |   2 +-
 .../src/mage/sets/commander2015/SolRing.java  |   2 +-
 .../sets/commander2015/SolemnSimulacrum.java  |   2 +-
 .../sets/commander2015/SpiderSpawning.java    |   2 +-
 .../sets/commander2015/SpinerockKnoll.java    |   2 +-
 .../mage/sets/commander2015/StaffOfNin.java   |   2 +-
 .../mage/sets/commander2015/SteamAugury.java  |   2 +-
 .../commander2015/StingerflingSpider.java     |   2 +-
 .../commander2015/StinkdrinkerDaredevil.java  |   2 +-
 .../mage/sets/commander2015/StolenGoods.java  |   2 +-
 .../sets/commander2015/StoneshockGiant.java   |   2 +-
 .../sets/commander2015/StrokeOfGenius.java    |   2 +-
 .../src/mage/sets/commander2015/SunTitan.java |   2 +-
 .../sets/commander2015/SunriseSovereign.java  |   2 +-
 .../sets/commander2015/SwiftfootBoots.java    |   2 +-
 .../sets/commander2015/SwiftwaterCliffs.java  |   2 +-
 .../sets/commander2015/SwordOfVengeance.java  |   2 +-
 .../mage/sets/commander2015/TaintedField.java |   2 +-
 .../mage/sets/commander2015/TaintedWood.java  |   2 +-
 .../commander2015/TalrandSkySummoner.java     |   2 +-
 .../sets/commander2015/TaureanMauler.java     |   2 +-
 .../commander2015/TempleOfTheFalseGod.java    |   2 +-
 .../mage/sets/commander2015/Terastodon.java   |   2 +-
 .../commander2015/TerramorphicExpanse.java    |   2 +-
 .../commander2015/TeysaEnvoyOfGhosts.java     |   2 +-
 .../sets/commander2015/TheloniteHermit.java   |   2 +-
 .../sets/commander2015/ThornwoodFalls.java    |   2 +-
 .../sets/commander2015/ThoughtReflection.java |   2 +-
 .../commander2015/ThundercloudShaman.java     |   2 +-
 .../sets/commander2015/TreasuryThrull.java    |   2 +-
 .../sets/commander2015/TributeToTheWild.java  |   2 +-
 .../sets/commander2015/TrygonPredator.java    |   2 +-
 .../commander2015/UnderworldCoinsmith.java    |   2 +-
 .../commander2015/UnderworldConnections.java  |   2 +-
 .../sets/commander2015/UrzasIncubator.java    |   2 +-
 .../mage/sets/commander2015/UrzasRage.java    |   2 +-
 .../mage/sets/commander2015/Vandalblast.java  |   2 +-
 .../mage/sets/commander2015/VerdantForce.java |   2 +-
 .../mage/sets/commander2015/Victimize.java    |   2 +-
 .../sets/commander2015/VictorysHerald.java    |   2 +-
 .../sets/commander2015/ViridianEmissary.java  |   2 +-
 .../sets/commander2015/ViridianShaman.java    |   2 +-
 .../sets/commander2015/ViridianZealot.java    |   2 +-
 .../mage/sets/commander2015/VividCrag.java    |   2 +-
 .../mage/sets/commander2015/VividCreek.java   |   2 +-
 .../mage/sets/commander2015/VividGrove.java   |   2 +-
 .../mage/sets/commander2015/VividMarsh.java   |   2 +-
 .../mage/sets/commander2015/VividMeadow.java  |   2 +-
 .../mage/sets/commander2015/VowOfDuty.java    |   2 +-
 .../mage/sets/commander2015/VowOfMalice.java  |   2 +-
 .../sets/commander2015/VulturousZombie.java   |   2 +-
 .../sets/commander2015/WallOfBlossoms.java    |   2 +-
 .../sets/commander2015/WarstormSurge.java     |   2 +-
 .../sets/commander2015/WayfarersBauble.java   |   2 +-
 .../sets/commander2015/WindScarredCrag.java   |   2 +-
 .../src/mage/sets/commander2015/Windfall.java |   2 +-
 .../sets/commander2015/WistfulSelkie.java     |   2 +-
 .../mage/sets/commander2015/WoodElves.java    |   2 +-
 .../sets/commander2015/WordOfSeizing.java     |   2 +-
 .../sets/commander2015/WornPowerstone.java    |   2 +-
 .../mage/sets/commander2015/ZoeticCavern.java |   2 +-
 .../sets/commandersarsenal/ChaosWarp.java     |   2 +-
 .../sets/commandersarsenal/CommandTower.java  |   2 +-
 .../sets/commandersarsenal/DecreeOfPain.java  |   2 +-
 .../sets/commandersarsenal/Desertion.java     |   2 +-
 .../DiaochanArtfulBeauty.java                 |   2 +-
 .../commandersarsenal/DragonlairSpider.java   |   2 +-
 .../sets/commandersarsenal/Duplicant.java     |   2 +-
 .../EdricSpymasterOfTrest.java                |   2 +-
 .../commandersarsenal/KaaliaOfTheVast.java    |   2 +-
 .../commandersarsenal/LoyalRetainers.java     |   2 +-
 .../commandersarsenal/MaelstromWanderer.java  |   2 +-
 .../mage/sets/commandersarsenal/MindsEye.java |   2 +-
 .../sets/commandersarsenal/MirarisWake.java   |   2 +-
 .../sets/commandersarsenal/RhysticStudy.java  |   2 +-
 .../sets/commandersarsenal/ScrollRack.java    |   2 +-
 .../sets/commandersarsenal/SylvanLibrary.java |   2 +-
 .../sets/commandersarsenal/TheMimeoplasm.java |   2 +-
 .../commandersarsenal/VelaTheNightClad.java   |   2 +-
 .../src/mage/sets/conflux/IgniteDisorder.java |   2 +-
 Mage.Sets/src/mage/sets/conflux/Unsummon.java |   2 +-
 .../mage/sets/conflux/WorldheartPhoenix.java  |   2 +-
 .../sets/conspiracy/AEtherTradewinds.java     |   2 +-
 .../src/mage/sets/conspiracy/AirServant.java  |   2 +-
 .../sets/conspiracy/AjanisSunstriker.java     |   2 +-
 .../mage/sets/conspiracy/AltarOfDementia.java |   2 +-
 .../src/mage/sets/conspiracy/AltarsReap.java  |   2 +-
 .../src/mage/sets/conspiracy/ApexHawks.java   |   2 +-
 .../src/mage/sets/conspiracy/Assassinate.java |   2 +-
 .../sets/conspiracy/BasandraBattleSeraph.java |   2 +-
 .../sets/conspiracy/BoldwyrIntimidator.java   |   2 +-
 .../sets/conspiracy/BragoKingEternal.java     |   2 +-
 .../src/mage/sets/conspiracy/Brainstorm.java  |   2 +-
 .../mage/sets/conspiracy/BrimstoneVolley.java |   2 +-
 .../mage/sets/conspiracy/ChargingRhino.java   |   2 +-
 .../mage/sets/conspiracy/ChartoothCougar.java |   2 +-
 .../src/mage/sets/conspiracy/CinderWall.java  |   2 +-
 .../sets/conspiracy/CompulsiveResearch.java   |   2 +-
 .../mage/sets/conspiracy/CopperhornScout.java |   2 +-
 .../sets/conspiracy/CouncilsJudgment.java     |   2 +-
 .../src/mage/sets/conspiracy/CourierHawk.java |   2 +-
 .../sets/conspiracy/CrookclawTransmuter.java  |   2 +-
 .../mage/sets/conspiracy/DacksDuplicate.java  |   2 +-
 .../sets/conspiracy/DeathforgeShaman.java     |   2 +-
 .../src/mage/sets/conspiracy/Deathrender.java |   2 +-
 .../src/mage/sets/conspiracy/Decimate.java    |   2 +-
 .../sets/conspiracy/DimirDoppelganger.java    |   2 +-
 .../mage/sets/conspiracy/DoomedTraveler.java  |   2 +-
 .../mage/sets/conspiracy/DreamFracture.java   |   2 +-
 .../mage/sets/conspiracy/EchoingCourage.java  |   2 +-
 .../conspiracy/EdricSpymasterOfTrest.java     |   2 +-
 .../mage/sets/conspiracy/ElephantGuide.java   |   2 +-
 .../sets/conspiracy/ElvishAberration.java     |   2 +-
 .../mage/sets/conspiracy/EnclaveElite.java    |   2 +-
 .../src/mage/sets/conspiracy/Exploration.java |   2 +-
 .../mage/sets/conspiracy/ExplorersScope.java  |   2 +-
 .../mage/sets/conspiracy/FactOrFiction.java   |   2 +-
 .../mage/sets/conspiracy/FavorableWinds.java  |   2 +-
 .../mage/sets/conspiracy/FiresOfYavimaya.java |   2 +-
 .../mage/sets/conspiracy/Fireshrieker.java    |   2 +-
 .../mage/sets/conspiracy/FlaringFlameKin.java |   2 +-
 .../sets/conspiracy/GalvanicJuggernaut.java   |   2 +-
 .../src/mage/sets/conspiracy/Gamekeeper.java  |   2 +-
 .../sets/conspiracy/GlimmerpointStag.java     |   2 +-
 .../src/mage/sets/conspiracy/GnarlidPack.java |   2 +-
 .../sets/conspiracy/GrixisIllusionist.java    |   2 +-
 .../sets/conspiracy/GuardianZendikon.java     |   2 +-
 .../sets/conspiracy/HeartlessHidetsugu.java   |   2 +-
 .../mage/sets/conspiracy/HecklingFiends.java  |   2 +-
 .../src/mage/sets/conspiracy/HowlingWolf.java |   2 +-
 .../sets/conspiracy/HungerOfTheHowlpack.java  |   2 +-
 .../mage/sets/conspiracy/HydraOmnivore.java   |   2 +-
 .../mage/sets/conspiracy/IllGottenGains.java  |   2 +-
 .../sets/conspiracy/InfectiousHorror.java     |   2 +-
 .../sets/conspiracy/IntangibleVirtue.java     |   2 +-
 .../sets/conspiracy/JettingGlasskite.java     |   2 +-
 .../src/mage/sets/conspiracy/KorChant.java    |   2 +-
 .../mage/sets/conspiracy/LeadTheStampede.java |   2 +-
 .../mage/sets/conspiracy/LilianasSpecter.java |   2 +-
 .../mage/sets/conspiracy/LizardWarrior.java   |   2 +-
 .../mage/sets/conspiracy/MagisterOfWorth.java |   2 +-
 .../sets/conspiracy/MarchesaTheBlackRose.java |   2 +-
 .../sets/conspiracy/MinamoScrollkeeper.java   |   2 +-
 .../src/mage/sets/conspiracy/MirarisWake.java |   2 +-
 .../mage/sets/conspiracy/MirrodinsCore.java   |   2 +-
 .../mage/sets/conspiracy/Misdirection.java    |   2 +-
 .../mage/sets/conspiracy/MomentOfHeroism.java |   2 +-
 .../mage/sets/conspiracy/MorkrutBanshee.java  |   2 +-
 .../src/mage/sets/conspiracy/Mortify.java     |   2 +-
 .../mage/sets/conspiracy/NaturesClaim.java    |   2 +-
 .../sets/conspiracy/NecromanticThirst.java    |   2 +-
 .../mage/sets/conspiracy/NobleTemplar.java    |   2 +-
 .../mage/sets/conspiracy/OrcishCannonade.java |   2 +-
 .../mage/sets/conspiracy/PeaceStrider.java    |   2 +-
 .../src/mage/sets/conspiracy/PelakkaWurm.java |   2 +-
 .../mage/sets/conspiracy/PerniciousDeed.java  |   2 +-
 .../sets/conspiracy/PhageTheUntouchable.java  |   2 +-
 .../mage/sets/conspiracy/PillarfieldOx.java   |   2 +-
 .../mage/sets/conspiracy/PitchburnDevils.java |   2 +-
 .../mage/sets/conspiracy/PlaguedRusalka.java  |   2 +-
 .../sets/conspiracy/PlatedSeastrider.java     |   2 +-
 .../mage/sets/conspiracy/PleaForPower.java    |   2 +-
 .../src/mage/sets/conspiracy/Plummet.java     |   2 +-
 .../mage/sets/conspiracy/PrideGuardian.java   |   2 +-
 .../mage/sets/conspiracy/PristineAngel.java   |   2 +-
 .../src/mage/sets/conspiracy/Provoke.java     |   2 +-
 .../mage/sets/conspiracy/QuagVampires.java    |   2 +-
 .../src/mage/sets/conspiracy/Quicksand.java   |   2 +-
 .../mage/sets/conspiracy/RecklessScholar.java |   2 +-
 .../mage/sets/conspiracy/RecklessSpite.java   |   2 +-
 .../mage/sets/conspiracy/ReflectingPool.java  |   2 +-
 .../mage/sets/conspiracy/ReignOfThePit.java   |   2 +-
 .../mage/sets/conspiracy/ReitoLantern.java    |   2 +-
 .../src/mage/sets/conspiracy/RelicCrush.java  |   2 +-
 .../src/mage/sets/conspiracy/Respite.java     |   2 +-
 .../mage/sets/conspiracy/ReyaDawnbringer.java |   2 +-
 .../mage/sets/conspiracy/RunedServitor.java   |   2 +-
 .../sets/conspiracy/SakuraTribeElder.java     |   2 +-
 .../src/mage/sets/conspiracy/ScaledWurm.java  |   2 +-
 .../sets/conspiracy/ScourgeOfTheThrone.java   |   2 +-
 .../conspiracy/SelvalaExplorerReturned.java   |   2 +-
 .../mage/sets/conspiracy/ShorelineRanger.java |   2 +-
 .../mage/sets/conspiracy/SilentArbiter.java   |   2 +-
 .../mage/sets/conspiracy/SilverchaseFox.java  |   2 +-
 .../mage/sets/conspiracy/SkeletalScrying.java |   2 +-
 .../sets/conspiracy/SkitterOfLizards.java     |   2 +-
 .../src/mage/sets/conspiracy/SkySpirit.java   |   2 +-
 .../src/mage/sets/conspiracy/Smallpox.java    |   2 +-
 .../src/mage/sets/conspiracy/Soulcatcher.java |   2 +-
 .../mage/sets/conspiracy/Spiritmonger.java    |   2 +-
 .../conspiracy/SpontaneousCombustion.java     |   2 +-
 .../mage/sets/conspiracy/SporecapSpider.java  |   2 +-
 .../src/mage/sets/conspiracy/StasisCell.java  |   2 +-
 .../src/mage/sets/conspiracy/StaveOff.java    |   2 +-
 .../src/mage/sets/conspiracy/Stifle.java      |   2 +-
 .../mage/sets/conspiracy/SulfuricVortex.java  |   2 +-
 .../sets/conspiracy/SwordsToPlowshares.java   |   2 +-
 .../src/mage/sets/conspiracy/SyphonSoul.java  |   2 +-
 .../src/mage/sets/conspiracy/Terastodon.java  |   2 +-
 .../src/mage/sets/conspiracy/TorchFiend.java  |   2 +-
 .../src/mage/sets/conspiracy/TragicSlip.java  |   2 +-
 .../mage/sets/conspiracy/TrumpetBlast.java    |   2 +-
 .../src/mage/sets/conspiracy/TurnTheTide.java |   2 +-
 .../sets/conspiracy/TwistedAbomination.java   |   2 +-
 .../src/mage/sets/conspiracy/TyphoidRats.java |   2 +-
 .../sets/conspiracy/UncontrollableAnger.java  |   2 +-
 .../mage/sets/conspiracy/UnhallowedPact.java  |   2 +-
 .../conspiracy/UnquestionedAuthority.java     |   2 +-
 .../mage/sets/conspiracy/VampireHexmage.java  |   2 +-
 .../mage/sets/conspiracy/VedalkenOrrery.java  |   2 +-
 .../mage/sets/conspiracy/VentSentinel.java    |   2 +-
 .../mage/sets/conspiracy/VolcanicFallout.java |   2 +-
 .../src/mage/sets/conspiracy/VowOfDuty.java   |   2 +-
 .../src/mage/sets/conspiracy/Wakedancer.java  |   2 +-
 .../sets/conspiracy/WarmongersChariot.java    |   2 +-
 .../src/mage/sets/conspiracy/WindDancer.java  |   2 +-
 .../sets/conspiracy/WolfbriarElemental.java   |   2 +-
 .../src/mage/sets/conspiracy/WoodSage.java    |   2 +-
 .../mage/sets/conspiracy/WrapInFlames.java    |   2 +-
 .../mage/sets/conspiracy/ZombieGoliath.java   |   2 +-
 .../mage/sets/darkascension/Divination.java   |   2 +-
 .../sets/darkascension/EvolvingWilds.java     |   2 +-
 .../src/mage/sets/darkascension/Fling.java    |   2 +-
 .../src/mage/sets/darksteel/AEtherSnap.java   |   2 +-
 .../mage/sets/darksteel/AgelessEntity.java    |   2 +-
 .../mage/sets/darksteel/AngelsFeather.java    |   2 +-
 .../mage/sets/darksteel/ArcboundCrusher.java  |   2 +-
 .../mage/sets/darksteel/ArcboundSlith.java    |   2 +-
 .../src/mage/sets/darksteel/DeathCloud.java   |   2 +-
 .../src/mage/sets/darksteel/DemonsHorn.java   |   2 +-
 .../src/mage/sets/darksteel/DragonsClaw.java  |   2 +-
 .../mage/sets/darksteel/EchoingCourage.java   |   2 +-
 .../src/mage/sets/darksteel/EchoingTruth.java |   2 +-
 .../src/mage/sets/darksteel/Fireball.java     |   2 +-
 .../src/mage/sets/darksteel/Inflame.java      |   2 +-
 .../src/mage/sets/darksteel/Juggernaut.java   |   2 +-
 .../src/mage/sets/darksteel/KrakensEye.java   |   2 +-
 .../src/mage/sets/darksteel/OxiddaGolem.java  |   2 +-
 Mage.Sets/src/mage/sets/darksteel/Shunt.java  |   2 +-
 .../src/mage/sets/darksteel/SpireGolem.java   |   2 +-
 .../src/mage/sets/darksteel/StirThePride.java |   2 +-
 .../src/mage/sets/darksteel/TestOfFaith.java  |   2 +-
 .../src/mage/sets/darksteel/Thunderstaff.java |   2 +-
 .../mage/sets/darksteel/VedalkenEngineer.java |   2 +-
 .../mage/sets/darksteel/WellOfLostDreams.java |   2 +-
 .../mage/sets/darksteel/WhispersilkCloak.java |   2 +-
 .../src/mage/sets/darksteel/WurmsTooth.java   |   2 +-
 .../sets/dissension/AEthermagesTouch.java     |   2 +-
 .../mage/sets/dissension/AzoriusHerald.java   |   2 +-
 .../src/mage/sets/dissension/Condemn.java     |   2 +-
 .../src/mage/sets/dissension/CourtHussar.java |   2 +-
 .../mage/sets/dissension/GhostQuarter.java    |   2 +-
 .../dissension/GrandArbiterAugustinIV.java    |   2 +-
 .../mage/sets/dissension/LeafdrakeRoost.java  |   2 +-
 .../mage/sets/dissension/MacabreWaltz.java    |   2 +-
 .../src/mage/sets/dissension/Overrule.java    |   2 +-
 .../mage/sets/dissension/PaladinOfPrahv.java  |   2 +-
 .../src/mage/sets/dissension/SealOfFire.java  |   2 +-
 .../src/mage/sets/dissension/Skyscribing.java |   2 +-
 .../sets/dissension/StalkingVengeance.java    |   2 +-
 .../src/mage/sets/dissension/Thrive.java      |   2 +-
 .../mage/sets/dissension/TrygonPredator.java  |   2 +-
 .../mage/sets/dissension/ValorMadeReal.java   |   2 +-
 .../mage/sets/dissension/VisionSkeins.java    |   2 +-
 .../sets/dissension/WakestoneGargoyle.java    |   2 +-
 .../src/mage/sets/dissension/WitsEnd.java     |   2 +-
 .../mage/sets/dissension/WreckingBall.java    |   2 +-
 .../sets/divinevsdemonic/AbyssalSpecter.java  |   2 +-
 .../divinevsdemonic/AkromaAngelOfWrath.java   |   2 +-
 .../sets/divinevsdemonic/AngelOfMercy.java    |   2 +-
 .../divinevsdemonic/AngelicBenediction.java   |   2 +-
 .../sets/divinevsdemonic/AngelicPage.java     |   2 +-
 .../divinevsdemonic/AngelicProtector.java     |   2 +-
 .../sets/divinevsdemonic/AngelsFeather.java   |   2 +-
 .../mage/sets/divinevsdemonic/Angelsong.java  |   2 +-
 .../mage/sets/divinevsdemonic/BarrenMoor.java |   2 +-
 .../sets/divinevsdemonic/BarterInBlood.java   |   2 +-
 .../sets/divinevsdemonic/BreedingPit.java     |   2 +-
 .../sets/divinevsdemonic/ConsumeSpirit.java   |   2 +-
 .../mage/sets/divinevsdemonic/Corrupt.java    |   2 +-
 .../mage/sets/divinevsdemonic/CruelEdict.java |   2 +-
 .../sets/divinevsdemonic/DaggerclawImp.java   |   2 +-
 .../sets/divinevsdemonic/DarkBanishing.java   |   2 +-
 .../mage/sets/divinevsdemonic/DarkRitual.java |   2 +-
 .../sets/divinevsdemonic/DemonicTutor.java    |   2 +-
 .../mage/sets/divinevsdemonic/DemonsHorn.java |   2 +-
 .../sets/divinevsdemonic/DemonsJester.java    |   2 +-
 .../src/mage/sets/divinevsdemonic/Duress.java |   2 +-
 .../mage/sets/divinevsdemonic/DuskImp.java    |   2 +-
 .../sets/divinevsdemonic/FallenAngel.java     |   2 +-
 .../mage/sets/divinevsdemonic/FoulImp.java    |   2 +-
 .../sets/divinevsdemonic/HealingSalve.java    |   2 +-
 .../sets/divinevsdemonic/IcatianPriest.java   |   2 +-
 .../sets/divinevsdemonic/KuroPitlord.java     |   2 +-
 .../sets/divinevsdemonic/LuminousAngel.java   |   2 +-
 .../sets/divinevsdemonic/MarbleDiamond.java   |   2 +-
 .../sets/divinevsdemonic/OniPossession.java   |   2 +-
 .../divinevsdemonic/OtherworldlyJourney.java  |   2 +-
 .../divinevsdemonic/OvereagerApprentice.java  |   2 +-
 .../mage/sets/divinevsdemonic/Pacifism.java   |   2 +-
 .../sets/divinevsdemonic/PromiseOfPower.java  |   2 +-
 .../sets/divinevsdemonic/ReyaDawnbringer.java |   2 +-
 .../sets/divinevsdemonic/RighteousCause.java  |   2 +-
 .../sets/divinevsdemonic/SecludedSteppe.java  |   2 +-
 .../sets/divinevsdemonic/SerraAdvocate.java   |   2 +-
 .../mage/sets/divinevsdemonic/SerraAngel.java |   2 +-
 .../sets/divinevsdemonic/SerrasEmbrace.java   |   2 +-
 .../mage/sets/divinevsdemonic/SootImp.java    |   2 +-
 .../sets/divinevsdemonic/Souldrinker.java     |   2 +-
 .../sets/divinevsdemonic/StinkweedImp.java    |   2 +-
 .../divinevsdemonic/SustainerOfTheRealm.java  |   2 +-
 .../divinevsdemonic/TwilightShepherd.java     |   2 +-
 .../sets/divinevsdemonic/UnholyStrength.java  |   2 +-
 .../sets/divinevsdemonic/VenerableMonk.java   |   2 +-
 .../sets/dragonsmaze/AzoriusGuildgate.java    |   2 +-
 .../mage/sets/dragonsmaze/BorosGuildgate.java |   2 +-
 .../mage/sets/dragonsmaze/DimirGuildgate.java |   2 +-
 .../mage/sets/dragonsmaze/FeralAnimist.java   |   2 +-
 .../sets/dragonsmaze/GolgariGuildgate.java    |   2 +-
 .../mage/sets/dragonsmaze/GruulGuildgate.java |   2 +-
 .../mage/sets/dragonsmaze/IzzetGuildgate.java |   2 +-
 .../sets/dragonsmaze/OrzhovGuildgate.java     |   2 +-
 .../src/mage/sets/dragonsmaze/Putrefy.java    |   2 +-
 .../sets/dragonsmaze/RakdosGuildgate.java     |   2 +-
 .../sets/dragonsmaze/SelesnyaGuildgate.java   |   2 +-
 .../mage/sets/dragonsmaze/SimicGuildgate.java |   2 +-
 .../src/mage/sets/dragonsmaze/WindDrake.java  |   2 +-
 .../sets/dragonsoftarkir/BattleMastery.java   |   2 +-
 .../mage/sets/dragonsoftarkir/DeathWind.java  |   2 +-
 .../sets/dragonsoftarkir/DragonFodder.java    |   2 +-
 .../src/mage/sets/dragonsoftarkir/Duress.java |   2 +-
 .../sets/dragonsoftarkir/EvolvingWilds.java   |   2 +-
 .../dragonsoftarkir/ExplosiveVegetation.java  |   2 +-
 .../mage/sets/dragonsoftarkir/Gravepurge.java |   2 +-
 .../sets/dragonsoftarkir/KindledFury.java     |   2 +-
 .../mage/sets/dragonsoftarkir/MindRot.java    |   2 +-
 .../mage/sets/dragonsoftarkir/Naturalize.java |   2 +-
 .../src/mage/sets/dragonsoftarkir/Negate.java |   2 +-
 .../mage/sets/dragonsoftarkir/Pacifism.java   |   2 +-
 .../dragonsoftarkir/ScaleguardSentinels.java  |   2 +-
 .../sets/dragonsoftarkir/SpidersilkNet.java   |   2 +-
 .../sets/dragonsoftarkir/SummitProwler.java   |   2 +-
 .../dragonsoftarkir/ThunderbreakRegent.java   |   2 +-
 .../sets/dragonsoftarkir/TormentingVoice.java |   2 +-
 .../sets/dragonsoftarkir/UltimatePrice.java   |   2 +-
 .../sets/duelsoftheplaneswalkers/TheRack.java |   2 +-
 .../sets/eighthedition/AbyssalSpecter.java    |   2 +-
 .../mage/sets/eighthedition/AirElemental.java |   2 +-
 .../mage/sets/eighthedition/AladdinsRing.java |   2 +-
 .../mage/sets/eighthedition/AnabaShaman.java  |   2 +-
 .../mage/sets/eighthedition/AngelOfMercy.java |   2 +-
 .../mage/sets/eighthedition/AngelicPage.java  |   2 +-
 .../mage/sets/eighthedition/Archivist.java    |   2 +-
 .../mage/sets/eighthedition/AvatarOfHope.java |   2 +-
 .../sets/eighthedition/AvenCloudchaser.java   |   2 +-
 .../mage/sets/eighthedition/AvenFisher.java   |   2 +-
 .../mage/sets/eighthedition/AvenFlock.java    |   2 +-
 .../eighthedition/BalduvianBarbarians.java    |   2 +-
 .../sets/eighthedition/BeastOfBurden.java     |   2 +-
 .../sets/eighthedition/BirdsOfParadise.java   |   2 +-
 .../sets/eighthedition/BlanchwoodArmor.java   |   2 +-
 .../src/mage/sets/eighthedition/Blaze.java    |   2 +-
 .../sets/eighthedition/BlessedReversal.java   |   2 +-
 .../sets/eighthedition/BlindingAngel.java     |   2 +-
 .../mage/sets/eighthedition/BloodMoon.java    |   2 +-
 .../sets/eighthedition/BloodshotCyclops.java  |   2 +-
 .../src/mage/sets/eighthedition/BogImp.java   |   2 +-
 .../mage/sets/eighthedition/BogWraith.java    |   2 +-
 .../src/mage/sets/eighthedition/Boil.java     |   2 +-
 .../mage/sets/eighthedition/Boomerang.java    |   2 +-
 .../mage/sets/eighthedition/BrassHerald.java  |   2 +-
 .../src/mage/sets/eighthedition/Bribery.java  |   2 +-
 .../sets/eighthedition/CallOfTheWild.java     |   2 +-
 .../mage/sets/eighthedition/CanopySpider.java |   2 +-
 .../sets/eighthedition/CanyonWildcat.java     |   2 +-
 .../mage/sets/eighthedition/CarrionWall.java  |   2 +-
 .../src/mage/sets/eighthedition/Catalog.java  |   2 +-
 .../src/mage/sets/eighthedition/Chastise.java |   2 +-
 .../src/mage/sets/eighthedition/Choke.java    |   2 +-
 .../mage/sets/eighthedition/CinderWall.java   |   2 +-
 .../CircleOfProtectionBlack.java              |   2 +-
 .../eighthedition/CircleOfProtectionBlue.java |   2 +-
 .../CircleOfProtectionGreen.java              |   2 +-
 .../eighthedition/CircleOfProtectionRed.java  |   2 +-
 .../CircleOfProtectionWhite.java              |   2 +-
 .../mage/sets/eighthedition/CityOfBrass.java  |   2 +-
 .../sets/eighthedition/CoastalHornclaw.java   |   2 +-
 .../sets/eighthedition/CoastalPiracy.java     |   2 +-
 .../mage/sets/eighthedition/CoastalTower.java |   2 +-
 .../mage/sets/eighthedition/CoatOfArms.java   |   2 +-
 .../src/mage/sets/eighthedition/Coercion.java |   2 +-
 .../eighthedition/CollectiveUnconscious.java  |   2 +-
 .../mage/sets/eighthedition/Concentrate.java  |   2 +-
 .../mage/sets/eighthedition/Confiscate.java   |   2 +-
 .../mage/sets/eighthedition/Cowardice.java    |   2 +-
 .../src/mage/sets/eighthedition/CrawWurm.java |   2 +-
 .../mage/sets/eighthedition/CreepingMold.java |   2 +-
 .../sets/eighthedition/CrossbowInfantry.java  |   2 +-
 .../mage/sets/eighthedition/CrystalRod.java   |   2 +-
 .../mage/sets/eighthedition/Curiosity.java    |   2 +-
 .../sets/eighthedition/DaringApprentice.java  |   2 +-
 .../sets/eighthedition/DarkBanishing.java     |   2 +-
 .../sets/eighthedition/DeathPitOffering.java  |   2 +-
 .../sets/eighthedition/DeathPitsOfRath.java   |   2 +-
 .../mage/sets/eighthedition/Deathgazer.java   |   2 +-
 .../sets/eighthedition/DeepwoodGhoul.java     |   2 +-
 .../mage/sets/eighthedition/DefenseGrid.java  |   2 +-
 .../mage/sets/eighthedition/Deflection.java   |   2 +-
 .../mage/sets/eighthedition/Dehydration.java  |   2 +-
 .../src/mage/sets/eighthedition/Demolish.java |   2 +-
 .../mage/sets/eighthedition/Demystify.java    |   2 +-
 .../sets/eighthedition/DiabolicTutor.java     |   2 +-
 .../mage/sets/eighthedition/DingusEgg.java    |   2 +-
 .../sets/eighthedition/DisruptingScepter.java |   2 +-
 .../sets/eighthedition/DrudgeSkeletons.java   |   2 +-
 .../src/mage/sets/eighthedition/DuskImp.java  |   2 +-
 .../mage/sets/eighthedition/EagerCadet.java   |   2 +-
 .../sets/eighthedition/EasternPaladin.java    |   2 +-
 .../sets/eighthedition/ElfhamePalace.java     |   2 +-
 .../mage/sets/eighthedition/EliteArchers.java |   2 +-
 .../sets/eighthedition/EliteJavelineer.java   |   2 +-
 .../sets/eighthedition/ElvishChampion.java    |   2 +-
 .../mage/sets/eighthedition/ElvishLyrist.java |   2 +-
 .../sets/eighthedition/ElvishPioneer.java     |   2 +-
 .../mage/sets/eighthedition/ElvishPiper.java  |   2 +-
 .../sets/eighthedition/ElvishScrapper.java    |   2 +-
 .../sets/eighthedition/EmperorCrocodile.java  |   2 +-
 .../sets/eighthedition/EnormousBaloth.java    |   2 +-
 .../src/mage/sets/eighthedition/Enrage.java   |   2 +-
 .../sets/eighthedition/EnsnaringBridge.java   |   2 +-
 .../mage/sets/eighthedition/Evacuation.java   |   2 +-
 .../src/mage/sets/eighthedition/Execute.java  |   2 +-
 .../mage/sets/eighthedition/FallenAngel.java  |   2 +-
 .../src/mage/sets/eighthedition/Fear.java     |   2 +-
 .../mage/sets/eighthedition/Fecundity.java    |   2 +-
 .../sets/eighthedition/FertileGround.java     |   2 +-
 .../sets/eighthedition/FightingDrake.java     |   2 +-
 .../mage/sets/eighthedition/Flashfires.java   |   2 +-
 .../sets/eighthedition/FleetingImage.java     |   2 +-
 .../src/mage/sets/eighthedition/Flight.java   |   2 +-
 .../mage/sets/eighthedition/FlyingCarpet.java |   2 +-
 .../mage/sets/eighthedition/FodderCannon.java |   2 +-
 .../src/mage/sets/eighthedition/Foratog.java  |   2 +-
 .../sets/eighthedition/FugitiveWizard.java    |   2 +-
 .../mage/sets/eighthedition/Fungusaur.java    |   2 +-
 .../sets/eighthedition/FurnaceOfRath.java     |   2 +-
 .../sets/eighthedition/FyndhornElder.java     |   2 +-
 .../mage/sets/eighthedition/GaeasHerald.java  |   2 +-
 .../sets/eighthedition/GiantCockroach.java    |   2 +-
 .../mage/sets/eighthedition/GiantGrowth.java  |   2 +-
 .../mage/sets/eighthedition/GiantSpider.java  |   2 +-
 .../sets/eighthedition/GloriousAnthem.java    |   2 +-
 .../mage/sets/eighthedition/GlorySeeker.java  |   2 +-
 .../sets/eighthedition/GluttonousZombie.java  |   2 +-
 .../sets/eighthedition/GoblinChariot.java     |   2 +-
 .../mage/sets/eighthedition/GoblinGlider.java |   2 +-
 .../mage/sets/eighthedition/GoblinKing.java   |   2 +-
 .../mage/sets/eighthedition/GoblinRaider.java |   2 +-
 .../mage/sets/eighthedition/GravePact.java    |   2 +-
 .../mage/sets/eighthedition/Gravedigger.java  |   2 +-
 .../mage/sets/eighthedition/GrizzlyBears.java |   2 +-
 .../sets/eighthedition/GuerrillaTactics.java  |   2 +-
 .../sets/eighthedition/HammerOfBogardan.java  |   2 +-
 .../mage/sets/eighthedition/HealingSalve.java |   2 +-
 .../mage/sets/eighthedition/Hibernation.java  |   2 +-
 .../mage/sets/eighthedition/HillGiant.java    |   2 +-
 .../src/mage/sets/eighthedition/HolyDay.java  |   2 +-
 .../mage/sets/eighthedition/HolyStrength.java |   2 +-
 .../mage/sets/eighthedition/HonorGuard.java   |   2 +-
 .../mage/sets/eighthedition/HornedTroll.java  |   2 +-
 .../mage/sets/eighthedition/HornedTurtle.java |   2 +-
 .../mage/sets/eighthedition/HowlingMine.java  |   2 +-
 .../sets/eighthedition/HulkingCyclops.java    |   2 +-
 .../mage/sets/eighthedition/HuntedWumpus.java |   2 +-
 .../src/mage/sets/eighthedition/Index.java    |   2 +-
 .../src/mage/sets/eighthedition/Inferno.java  |   2 +-
 .../mage/sets/eighthedition/Inspiration.java  |   2 +-
 .../mage/sets/eighthedition/IntrepidHero.java |   2 +-
 .../sets/eighthedition/IntruderAlarm.java     |   2 +-
 .../mage/sets/eighthedition/Invisibility.java |   2 +-
 .../src/mage/sets/eighthedition/IronStar.java |   2 +-
 .../src/mage/sets/eighthedition/IvoryCup.java |   2 +-
 .../mage/sets/eighthedition/IvoryMask.java    |   2 +-
 .../mage/sets/eighthedition/JayemdaeTome.java |   2 +-
 .../src/mage/sets/eighthedition/Karma.java    |   2 +-
 .../src/mage/sets/eighthedition/Larceny.java  |   2 +-
 .../src/mage/sets/eighthedition/LavaAxe.java  |   2 +-
 .../mage/sets/eighthedition/LavaHounds.java   |   2 +-
 .../sets/eighthedition/LesserGargadon.java    |   2 +-
 .../src/mage/sets/eighthedition/Lhurgoyf.java |   2 +-
 .../sets/eighthedition/LightningBlast.java    |   2 +-
 .../eighthedition/LightningElemental.java     |   2 +-
 .../sets/eighthedition/LivingTerrain.java     |   2 +-
 .../sets/eighthedition/LlanowarBehemoth.java  |   2 +-
 .../src/mage/sets/eighthedition/LoneWolf.java |   2 +-
 .../mage/sets/eighthedition/LoomingShade.java |   2 +-
 .../sets/eighthedition/LordOfTheUndead.java   |   2 +-
 .../src/mage/sets/eighthedition/Lure.java     |   2 +-
 .../sets/eighthedition/MaggotCarrier.java     |   2 +-
 .../sets/eighthedition/MahamotiDjinn.java     |   2 +-
 .../mage/sets/eighthedition/ManaClash.java    |   2 +-
 .../src/mage/sets/eighthedition/ManaLeak.java |   2 +-
 .../src/mage/sets/eighthedition/Maro.java     |   2 +-
 .../mage/sets/eighthedition/MasterDecoy.java  |   2 +-
 .../mage/sets/eighthedition/MasterHealer.java |   2 +-
 .../src/mage/sets/eighthedition/Megrim.java   |   2 +-
 .../sets/eighthedition/MerchantOfSecrets.java |   2 +-
 .../mage/sets/eighthedition/MightOfOaks.java  |   2 +-
 .../mage/sets/eighthedition/Millstone.java    |   2 +-
 .../src/mage/sets/eighthedition/MindRot.java  |   2 +-
 .../mage/sets/eighthedition/MindSlash.java    |   2 +-
 .../mage/sets/eighthedition/MindSludge.java   |   2 +-
 .../mage/sets/eighthedition/MoggSentry.java   |   2 +-
 .../sets/eighthedition/MonstrousGrowth.java   |   2 +-
 .../sets/eighthedition/NantukoDisciple.java   |   2 +-
 .../sets/eighthedition/NaturalAffinity.java   |   2 +-
 .../mage/sets/eighthedition/Naturalize.java   |   2 +-
 .../src/mage/sets/eighthedition/Nausea.java   |   2 +-
 .../mage/sets/eighthedition/Nekrataal.java    |   2 +-
 .../mage/sets/eighthedition/Nightmare.java    |   2 +-
 .../mage/sets/eighthedition/NoblePurpose.java |   2 +-
 .../sets/eighthedition/NorwoodRanger.java     |   2 +-
 .../mage/sets/eighthedition/Obliterate.java   |   2 +-
 .../sets/eighthedition/OgreTaskmaster.java    |   2 +-
 .../src/mage/sets/eighthedition/Okk.java      |   2 +-
 .../sets/eighthedition/OraclesAttendants.java |   2 +-
 .../sets/eighthedition/OrcishArtillery.java   |   2 +-
 .../mage/sets/eighthedition/OrcishSpy.java    |   2 +-
 .../src/mage/sets/eighthedition/Pacifism.java |   2 +-
 .../mage/sets/eighthedition/PanicAttack.java  |   2 +-
 .../mage/sets/eighthedition/PatagiaGolem.java |   2 +-
 .../mage/sets/eighthedition/Persecute.java    |   2 +-
 .../sets/eighthedition/PhantomWarrior.java    |   2 +-
 .../sets/eighthedition/PhyrexianArena.java    |   2 +-
 .../sets/eighthedition/PhyrexianHulk.java     |   2 +-
 .../eighthedition/PhyrexianPlaguelord.java    |   2 +-
 .../mage/sets/eighthedition/PlagueBeetle.java |   2 +-
 .../mage/sets/eighthedition/PlagueWind.java   |   2 +-
 .../mage/sets/eighthedition/PlanarPortal.java |   2 +-
 .../mage/sets/eighthedition/PlowUnder.java    |   2 +-
 .../sets/eighthedition/PrimevalShambler.java  |   2 +-
 .../mage/sets/eighthedition/Puppeteer.java    |   2 +-
 .../mage/sets/eighthedition/Pyroclasm.java    |   2 +-
 .../mage/sets/eighthedition/Pyrotechnics.java |   2 +-
 .../mage/sets/eighthedition/RagingGoblin.java |   2 +-
 .../mage/sets/eighthedition/RainOfBlades.java |   2 +-
 .../mage/sets/eighthedition/RaiseDead.java    |   2 +-
 .../sets/eighthedition/RampantGrowth.java     |   2 +-
 .../mage/sets/eighthedition/RavenousRats.java |   2 +-
 .../sets/eighthedition/RazorfootGriffin.java  |   2 +-
 .../src/mage/sets/eighthedition/Redeem.java   |   2 +-
 .../src/mage/sets/eighthedition/Reflexes.java |   2 +-
 .../mage/sets/eighthedition/Regeneration.java |   2 +-
 .../sets/eighthedition/RelentlessAssault.java |   2 +-
 .../mage/sets/eighthedition/RemoveSoul.java   |   2 +-
 .../src/mage/sets/eighthedition/Revive.java   |   2 +-
 .../src/mage/sets/eighthedition/Rewind.java   |   2 +-
 .../src/mage/sets/eighthedition/Rhox.java     |   2 +-
 .../sets/eighthedition/RidgelineRager.java    |   2 +-
 .../mage/sets/eighthedition/RodOfRuin.java    |   2 +-
 .../sets/eighthedition/RollingStones.java     |   2 +-
 .../sets/eighthedition/RoyalAssassin.java     |   2 +-
 .../src/mage/sets/eighthedition/RukhEgg.java  |   2 +-
 .../sets/eighthedition/RushwoodDryad.java     |   2 +-
 .../sets/eighthedition/SabretoothTiger.java   |   2 +-
 .../mage/sets/eighthedition/SacredGround.java |   2 +-
 .../mage/sets/eighthedition/SacredNectar.java |   2 +-
 .../mage/sets/eighthedition/SageOfLatNam.java |   2 +-
 .../src/mage/sets/eighthedition/SageOwl.java  |   2 +-
 .../mage/sets/eighthedition/SaltMarsh.java    |   2 +-
 .../mage/sets/eighthedition/SamiteHealer.java |   2 +-
 .../mage/sets/eighthedition/Sanctimony.java   |   2 +-
 .../sets/eighthedition/ScatheZombies.java     |   2 +-
 .../mage/sets/eighthedition/SeaMonster.java   |   2 +-
 .../mage/sets/eighthedition/SearingWind.java  |   2 +-
 .../sets/eighthedition/SeasonedMarshal.java   |   2 +-
 .../sets/eighthedition/SeismicAssault.java    |   2 +-
 .../sets/eighthedition/SerpentWarrior.java    |   2 +-
 .../mage/sets/eighthedition/SerraAngel.java   |   2 +-
 .../mage/sets/eighthedition/SeverSoul.java    |   2 +-
 .../sets/eighthedition/SeveredLegion.java     |   2 +-
 .../src/mage/sets/eighthedition/Shatter.java  |   2 +-
 .../mage/sets/eighthedition/ShiftingSky.java  |   2 +-
 .../mage/sets/eighthedition/ShivanDragon.java |   2 +-
 .../mage/sets/eighthedition/ShivanOasis.java  |   2 +-
 .../src/mage/sets/eighthedition/Shock.java    |   2 +-
 .../mage/sets/eighthedition/ShockTroops.java  |   2 +-
 .../src/mage/sets/eighthedition/Sizzle.java   |   2 +-
 .../mage/sets/eighthedition/SkullOfOrm.java   |   2 +-
 .../src/mage/sets/eighthedition/Slay.java     |   2 +-
 .../sets/eighthedition/SneakyHomunculus.java  |   2 +-
 .../mage/sets/eighthedition/Solidarity.java   |   2 +-
 .../mage/sets/eighthedition/SoulFeast.java    |   2 +-
 .../mage/sets/eighthedition/Spellbook.java    |   2 +-
 .../eighthedition/SpiketailHatchling.java     |   2 +-
 .../mage/sets/eighthedition/SpinedWurm.java   |   2 +-
 .../sets/eighthedition/SpinelessThug.java     |   2 +-
 .../mage/sets/eighthedition/SpiritLink.java   |   2 +-
 .../sets/eighthedition/SpittingSpider.java    |   2 +-
 .../sets/eighthedition/SpreadingAlgae.java    |   2 +-
 .../sets/eighthedition/StaunchDefenders.java  |   2 +-
 .../sets/eighthedition/StealArtifact.java     |   2 +-
 .../mage/sets/eighthedition/StoneRain.java    |   2 +-
 .../mage/sets/eighthedition/StormCrow.java    |   2 +-
 .../mage/sets/eighthedition/StoryCircle.java  |   2 +-
 .../mage/sets/eighthedition/StreamOfLife.java |   2 +-
 .../mage/sets/eighthedition/SuddenImpact.java |   2 +-
 .../mage/sets/eighthedition/SuntailHawk.java  |   2 +-
 .../src/mage/sets/eighthedition/Sunweb.java   |   2 +-
 .../mage/sets/eighthedition/SwarmOfRats.java  |   2 +-
 .../mage/sets/eighthedition/SwordDancer.java  |   2 +-
 .../sets/eighthedition/TeferisPuzzleBox.java  |   2 +-
 .../mage/sets/eighthedition/Telepathy.java    |   2 +-
 .../sets/eighthedition/TemporalAdept.java     |   2 +-
 .../sets/eighthedition/ThievesAuction.java    |   2 +-
 .../sets/eighthedition/ThievingMagpie.java    |   2 +-
 .../sets/eighthedition/ThornElemental.java    |   2 +-
 .../mage/sets/eighthedition/ThroneOfBone.java |   2 +-
 .../mage/sets/eighthedition/TidalKraken.java  |   2 +-
 .../mage/sets/eighthedition/TradeRoutes.java  |   2 +-
 .../sets/eighthedition/TrainedArmodon.java    |   2 +-
 .../sets/eighthedition/TreasureTrove.java     |   2 +-
 .../src/mage/sets/eighthedition/Tremor.java   |   2 +-
 .../mage/sets/eighthedition/TundraWolves.java |   2 +-
 .../src/mage/sets/eighthedition/Twiddle.java  |   2 +-
 .../sets/eighthedition/TwoHeadedDragon.java   |   2 +-
 .../sets/eighthedition/UnderworldDreams.java  |   2 +-
 .../sets/eighthedition/UnholyStrength.java    |   2 +-
 .../src/mage/sets/eighthedition/Unsummon.java |   2 +-
 .../sets/eighthedition/UrborgVolcano.java     |   2 +-
 .../mage/sets/eighthedition/UrzasArmor.java   |   2 +-
 .../mage/sets/eighthedition/UrzasMine.java    |   2 +-
 .../sets/eighthedition/UrzasPowerPlant.java   |   2 +-
 .../mage/sets/eighthedition/UrzasTower.java   |   2 +-
 .../sets/eighthedition/VenerableMonk.java     |   2 +-
 .../mage/sets/eighthedition/Vengeance.java    |   2 +-
 .../eighthedition/VerduranEnchantress.java    |   2 +-
 .../mage/sets/eighthedition/VernalBloom.java  |   2 +-
 .../eighthedition/ViashinoSandstalker.java    |   2 +-
 .../sets/eighthedition/ViciousHunger.java     |   2 +-
 .../mage/sets/eighthedition/VineTrellis.java  |   2 +-
 .../mage/sets/eighthedition/Vizzerdrix.java   |   2 +-
 .../sets/eighthedition/VolcanicHammer.java    |   2 +-
 .../mage/sets/eighthedition/WallOfAir.java    |   2 +-
 .../mage/sets/eighthedition/WallOfSpears.java |   2 +-
 .../mage/sets/eighthedition/WallOfStone.java  |   2 +-
 .../mage/sets/eighthedition/WallOfSwords.java |   2 +-
 .../sets/eighthedition/WesternPaladin.java    |   2 +-
 .../mage/sets/eighthedition/WindDrake.java    |   2 +-
 .../mage/sets/eighthedition/WingSnare.java    |   2 +-
 .../mage/sets/eighthedition/WoodElves.java    |   2 +-
 .../mage/sets/eighthedition/WoodenSphere.java |   2 +-
 .../src/mage/sets/eighthedition/Worship.java  |   2 +-
 .../mage/sets/eighthedition/WrathOfGod.java   |   2 +-
 .../sets/eighthedition/WrathOfMaritLage.java  |   2 +-
 .../eighthedition/YavimayaEnchantress.java    |   2 +-
 .../src/mage/sets/eighthedition/Zombify.java  |   2 +-
 .../mage/sets/eighthedition/ZursWeirding.java |   2 +-
 .../src/mage/sets/eldritchmoon/Convolute.java |   2 +-
 .../mage/sets/eldritchmoon/HamletCaptain.java |   2 +-
 .../src/mage/sets/eldritchmoon/Murder.java    |   2 +-
 .../mage/sets/eldritchmoon/PeaceOfMind.java   |   2 +-
 .../src/mage/sets/eldritchmoon/PreyUpon.java  |   2 +-
 .../src/mage/sets/eldritchmoon/RideDown.java  |   2 +-
 .../sets/eldritchmoon/RiseFromTheGrave.java   |   2 +-
 .../src/mage/sets/eldritchmoon/Terrarion.java |   2 +-
 .../eldritchmoon/ThaliaHereticCathar.java     |   2 +-
 .../src/mage/sets/eldritchmoon/TurnAside.java |   2 +-
 .../mage/sets/elspethvskiora/AEtherize.java   |   2 +-
 .../elspethvskiora/AccumulatedKnowledge.java  |   2 +-
 .../sets/elspethvskiora/BanisherPriest.java   |   2 +-
 .../elspethvskiora/CaptainOfTheWatch.java     |   2 +-
 .../sets/elspethvskiora/CelestialFlare.java   |   2 +-
 .../sets/elspethvskiora/CoilingOracle.java    |   2 +-
 .../elspethvskiora/CourtStreetDenizen.java    |   2 +-
 .../elspethvskiora/DauntlessOnslaught.java    |   2 +-
 .../sets/elspethvskiora/DecreeOfJustice.java  |   2 +-
 .../sets/elspethvskiora/DictateOfHeliod.java  |   2 +-
 .../elspethvskiora/ElspethSunsChampion.java   |   2 +-
 .../sets/elspethvskiora/EvolvingWilds.java    |   2 +-
 .../src/mage/sets/elspethvskiora/Explore.java |   2 +-
 .../elspethvskiora/ExplosiveVegetation.java   |   2 +-
 .../sets/elspethvskiora/GempalmAvenger.java   |   2 +-
 .../sets/elspethvskiora/GrazingGladehart.java |   2 +-
 .../sets/elspethvskiora/GustcloakHarrier.java |   2 +-
 .../sets/elspethvskiora/GustcloakSavior.java  |   2 +-
 .../elspethvskiora/GustcloakSentinel.java     |   2 +-
 .../elspethvskiora/GustcloakSkirmisher.java   |   2 +-
 .../elspethvskiora/IcatianJavelineers.java    |   2 +-
 .../sets/elspethvskiora/InkwellLeviathan.java |   2 +-
 .../elspethvskiora/KinsbaileSkirmisher.java   |   2 +-
 .../elspethvskiora/KioraTheCrashingWave.java  |   2 +-
 .../sets/elspethvskiora/KiorasFollower.java   |   2 +-
 .../sets/elspethvskiora/KorSkyfisher.java     |   2 +-
 .../sets/elspethvskiora/LorescaleCoatl.java   |   2 +-
 .../sets/elspethvskiora/LoxodonPartisan.java  |   2 +-
 .../src/mage/sets/elspethvskiora/ManOWar.java |   2 +-
 .../mage/sets/elspethvskiora/MightyLeap.java  |   2 +-
 .../sets/elspethvskiora/MortalsArdor.java     |   2 +-
 .../sets/elspethvskiora/MotherOfRunes.java    |   2 +-
 .../mage/sets/elspethvskiora/NessianAsp.java  |   2 +-
 .../sets/elspethvskiora/NetcasterSpider.java  |   2 +-
 .../sets/elspethvskiora/NimbusSwimmer.java    |   2 +-
 .../sets/elspethvskiora/NobleTemplar.java     |   2 +-
 .../mage/sets/elspethvskiora/Omenspeaker.java |   2 +-
 .../sets/elspethvskiora/PeelFromReality.java  |   2 +-
 .../sets/elspethvskiora/PlasmCapture.java     |   2 +-
 .../sets/elspethvskiora/PrecinctCaptain.java  |   2 +-
 .../sets/elspethvskiora/RaiseTheAlarm.java    |   2 +-
 .../sets/elspethvskiora/ScourgeOfFleets.java  |   2 +-
 .../sets/elspethvskiora/SealockMonster.java   |   2 +-
 .../sets/elspethvskiora/SecludedSteppe.java   |   2 +-
 .../elspethvskiora/SimicSkySwallower.java     |   2 +-
 .../mage/sets/elspethvskiora/SoulParry.java   |   2 +-
 .../sets/elspethvskiora/StandingTroops.java   |   2 +-
 .../mage/sets/elspethvskiora/Sunlance.java    |   2 +-
 .../sets/elspethvskiora/SurrakarBanisher.java |   2 +-
 .../elspethvskiora/TempleOfTheFalseGod.java   |   2 +-
 .../mage/sets/elspethvskiora/TimeToFeed.java  |   2 +-
 .../sets/elspethvskiora/UrbanEvolution.java   |   2 +-
 .../elspethvskiora/VeteranArmorsmith.java     |   2 +-
 .../elspethvskiora/VeteranSwordsmith.java     |   2 +-
 .../sets/elspethvskiora/WhelmingWave.java     |   2 +-
 .../mage/sets/elspethvstezzeret/Abolish.java  |   2 +-
 .../elspethvstezzeret/ArcboundWorker.java     |   2 +-
 .../elspethvstezzeret/AssemblyWorker.java     |   2 +-
 .../elspethvstezzeret/CatapultMaster.java     |   2 +-
 .../elspethvstezzeret/ClockworkCondor.java    |   2 +-
 .../elspethvstezzeret/ClockworkHydra.java     |   2 +-
 .../elspethvstezzeret/ContagionClasp.java     |   2 +-
 .../elspethvstezzeret/DarksteelCitadel.java   |   2 +-
 .../sets/elspethvstezzeret/EliteVanguard.java |   2 +-
 .../ElixirOfImmortality.java                  |   2 +-
 .../ElspethKnightErrant.java                  |   2 +-
 .../mage/sets/elspethvstezzeret/Esperzoa.java |   2 +-
 .../elspethvstezzeret/EverflowingChalice.java |   2 +-
 .../elspethvstezzeret/FaerieMechanist.java    |   2 +-
 .../src/mage/sets/elspethvstezzeret/Foil.java |   2 +-
 .../sets/elspethvstezzeret/GlorySeeker.java   |   2 +-
 .../elspethvstezzeret/InfantryVeteran.java    |   2 +-
 .../elspethvstezzeret/JourneyToNowhere.java   |   2 +-
 .../sets/elspethvstezzeret/Juggernaut.java    |   2 +-
 .../elspethvstezzeret/KabiraCrossroads.java   |   2 +-
 .../elspethvstezzeret/KembasSkyguard.java     |   2 +-
 .../sets/elspethvstezzeret/KorAeronaut.java   |   2 +-
 .../sets/elspethvstezzeret/KorHookmaster.java |   2 +-
 .../sets/elspethvstezzeret/KorSkyfisher.java  |   2 +-
 .../sets/elspethvstezzeret/LoyalSentry.java   |   2 +-
 .../elspethvstezzeret/MasterOfEtherium.java   |   2 +-
 .../sets/elspethvstezzeret/MightyLeap.java    |   2 +-
 .../sets/elspethvstezzeret/RaiseTheAlarm.java |   2 +-
 .../elspethvstezzeret/RazormaneMasticore.java |   2 +-
 .../sets/elspethvstezzeret/RunedServitor.java |   2 +-
 .../sets/elspethvstezzeret/Saltblast.java     |   2 +-
 .../elspethvstezzeret/SeatOfTheSynod.java     |   2 +-
 .../sets/elspethvstezzeret/SilverMyr.java     |   2 +-
 .../elspethvstezzeret/StalkingStones.java     |   2 +-
 .../sets/elspethvstezzeret/SteelOverseer.java |   2 +-
 .../sets/elspethvstezzeret/SteelWall.java     |   2 +-
 .../elspethvstezzeret/StormfrontRiders.java   |   2 +-
 .../mage/sets/elspethvstezzeret/Sunlance.java |   2 +-
 .../elspethvstezzeret/SwordsToPlowshares.java |   2 +-
 .../elspethvstezzeret/TezzeretTheSeeker.java  |   2 +-
 .../elspethvstezzeret/ThirstForKnowledge.java |   2 +-
 .../sets/elspethvstezzeret/TrinketMage.java   |   2 +-
 .../sets/elspethvstezzeret/Triskelion.java    |   2 +-
 .../sets/elvesvsgoblins/AkkiCoalflinger.java  |   2 +-
 .../sets/elvesvsgoblins/ElvishEulogist.java   |   2 +-
 .../sets/elvesvsgoblins/ElvishHarbinger.java  |   2 +-
 .../sets/elvesvsgoblins/ElvishPromenade.java  |   2 +-
 .../sets/elvesvsgoblins/ElvishWarrior.java    |   2 +-
 .../sets/elvesvsgoblins/FlamewaveInvoker.java |   2 +-
 .../sets/elvesvsgoblins/ForgottenCave.java    |   2 +-
 .../elvesvsgoblins/GempalmIncinerator.java    |   2 +-
 .../mage/sets/elvesvsgoblins/GiantGrowth.java |   2 +-
 .../sets/elvesvsgoblins/GoblinBurrows.java    |   2 +-
 .../sets/elvesvsgoblins/GoblinCohort.java     |   2 +-
 .../sets/elvesvsgoblins/GoblinMatron.java     |   2 +-
 .../sets/elvesvsgoblins/GoblinRingleader.java |   2 +-
 .../sets/elvesvsgoblins/GoblinSledder.java    |   2 +-
 .../sets/elvesvsgoblins/GoblinWarchief.java   |   2 +-
 .../mage/sets/elvesvsgoblins/Harmonize.java   |   2 +-
 .../mage/sets/elvesvsgoblins/HeedlessOne.java |   2 +-
 .../sets/elvesvsgoblins/ImperiousPerfect.java |   2 +-
 .../sets/elvesvsgoblins/LlanowarElves.java    |   2 +-
 .../elvesvsgoblins/LysAlanaHuntmaster.java    |   2 +-
 .../mage/sets/elvesvsgoblins/MoggFanatic.java |   2 +-
 .../sets/elvesvsgoblins/MoggWarMarshal.java   |   2 +-
 .../sets/elvesvsgoblins/MoongloveExtract.java |   2 +-
 .../elvesvsgoblins/MudbuttonTorchrunner.java  |   2 +-
 .../sets/elvesvsgoblins/RagingGoblin.java     |   2 +-
 .../mage/sets/elvesvsgoblins/RecklessOne.java |   2 +-
 .../elvesvsgoblins/SiegeGangCommander.java    |   2 +-
 .../sets/elvesvsgoblins/SkirkFireMarshal.java |   2 +-
 .../sets/elvesvsgoblins/SkirkProspector.java  |   2 +-
 .../sets/elvesvsgoblins/SlateOfAncestry.java  |   2 +-
 .../sets/elvesvsgoblins/SpittingEarth.java    |   2 +-
 .../sets/elvesvsgoblins/SylvanMessenger.java  |   2 +-
 .../mage/sets/elvesvsgoblins/TarPitcher.java  |   2 +-
 .../src/mage/sets/elvesvsgoblins/Tarfire.java |   2 +-
 .../sets/elvesvsgoblins/TranquilThicket.java  |   2 +-
 .../sets/elvesvsgoblins/VoiceOfTheWoods.java  |   2 +-
 .../mage/sets/elvesvsgoblins/Wellwisher.java  |   2 +-
 .../mage/sets/elvesvsgoblins/Wildsize.java    |   2 +-
 .../sets/elvesvsgoblins/WirewoodHerald.java   |   2 +-
 .../sets/elvesvsgoblins/WirewoodLodge.java    |   2 +-
 .../sets/elvesvsgoblins/WirewoodSymbiote.java |   2 +-
 .../mage/sets/elvesvsgoblins/WoodElves.java   |   2 +-
 .../elvesvsgoblins/WrensRunVanquisher.java    |   2 +-
 .../sets/eternalmasters/AbundantGrowth.java   |   2 +-
 .../sets/eternalmasters/AncestralMask.java    |   2 +-
 .../mage/sets/eternalmasters/AnimateDead.java |   2 +-
 .../mage/sets/eternalmasters/Annihilate.java  |   2 +-
 .../eternalmasters/ArcanisTheOmnipotent.java  |   2 +-
 .../eternalmasters/ArgothianEnchantress.java  |   2 +-
 .../sets/eternalmasters/ArmadilloCloak.java   |   2 +-
 .../sets/eternalmasters/AshnodsAltar.java     |   2 +-
 .../src/mage/sets/eternalmasters/Avarax.java  |   2 +-
 .../sets/eternalmasters/AvenRiftwatcher.java  |   2 +-
 .../src/mage/sets/eternalmasters/Balance.java |   2 +-
 .../sets/eternalmasters/BalefulStrix.java     |   2 +-
 .../sets/eternalmasters/BallynockCohort.java  |   2 +-
 .../sets/eternalmasters/BattleSquadron.java   |   2 +-
 .../sets/eternalmasters/BeetlebackChief.java  |   2 +-
 .../eternalmasters/BenevolentBodyguard.java   |   2 +-
 .../sets/eternalmasters/BlightsoilDruid.java  |   2 +-
 .../mage/sets/eternalmasters/BloodArtist.java |   2 +-
 .../sets/eternalmasters/BloodbraidElf.java    |   2 +-
 .../sets/eternalmasters/BloodfellCaves.java   |   2 +-
 .../sets/eternalmasters/BlossomingSands.java  |   2 +-
 .../eternalmasters/BorderlandMarauder.java    |   2 +-
 .../sets/eternalmasters/BragoKingEternal.java |   2 +-
 .../eternalmasters/BraidsCabalMinion.java     |   2 +-
 .../mage/sets/eternalmasters/Brainstorm.java  |   2 +-
 .../src/mage/sets/eternalmasters/Brawn.java   |   2 +-
 .../sets/eternalmasters/BurningVengeance.java |   2 +-
 .../sets/eternalmasters/CabalTherapy.java     |   2 +-
 .../mage/sets/eternalmasters/Calciderm.java   |   2 +-
 .../eternalmasters/CallTheSkybreaker.java     |   2 +-
 .../mage/sets/eternalmasters/Carbonize.java   |   2 +-
 .../sets/eternalmasters/CarrionFeeder.java    |   2 +-
 .../sets/eternalmasters/CentaurChieftain.java |   2 +-
 .../sets/eternalmasters/CephalidSage.java     |   2 +-
 .../sets/eternalmasters/ChainLightning.java   |   2 +-
 .../mage/sets/eternalmasters/ChromeMox.java   |   2 +-
 .../sets/eternalmasters/CivicWayfinder.java   |   2 +-
 .../eternalmasters/CommuneWithTheGods.java    |   2 +-
 .../sets/eternalmasters/ControlMagic.java     |   2 +-
 .../sets/eternalmasters/Counterspell.java     |   2 +-
 .../sets/eternalmasters/CraterHellion.java    |   2 +-
 .../mage/sets/eternalmasters/DackFayden.java  |   2 +-
 .../src/mage/sets/eternalmasters/Daze.java    |   2 +-
 .../sets/eternalmasters/DeadbridgeShaman.java |   2 +-
 .../sets/eternalmasters/DeathriteShaman.java  |   2 +-
 .../sets/eternalmasters/DeepAnalysis.java     |   2 +-
 .../sets/eternalmasters/DesperateRavings.java |   2 +-
 .../eternalmasters/DiminishingReturns.java    |   2 +-
 .../sets/eternalmasters/DismalBackwater.java  |   2 +-
 .../mage/sets/eternalmasters/DragonEgg.java   |   2 +-
 .../mage/sets/eternalmasters/DreamTwist.java  |   2 +-
 .../sets/eternalmasters/DualcasterMage.java   |   2 +-
 .../mage/sets/eternalmasters/Duplicant.java   |   2 +-
 .../src/mage/sets/eternalmasters/Duress.java  |   2 +-
 .../eternalmasters/EightAndAHalfTails.java    |   2 +-
 .../sets/eternalmasters/ElephantGuide.java    |   2 +-
 .../sets/eternalmasters/EliteVanguard.java    |   2 +-
 .../sets/eternalmasters/ElvishVanguard.java   |   2 +-
 .../mage/sets/eternalmasters/EmmessiTome.java |   2 +-
 .../sets/eternalmasters/EmperorCrocodile.java |   2 +-
 .../sets/eternalmasters/EnlightenedTutor.java |   2 +-
 .../src/mage/sets/eternalmasters/Entomb.java  |   2 +-
 .../eternalmasters/ExtractFromDarkness.java   |   2 +-
 .../sets/eternalmasters/EyeblightsEnding.java |   2 +-
 .../sets/eternalmasters/FactOrFiction.java    |   2 +-
 .../sets/eternalmasters/FaithlessLooting.java |   2 +-
 .../sets/eternalmasters/FaithsFetters.java    |   2 +-
 .../sets/eternalmasters/FerventCathar.java    |   2 +-
 .../sets/eternalmasters/FieldOfSouls.java     |   2 +-
 .../mage/sets/eternalmasters/Firebolt.java    |   2 +-
 .../mage/sets/eternalmasters/FlameJab.java    |   2 +-
 .../sets/eternalmasters/FlameKinZealot.java   |   2 +-
 .../sets/eternalmasters/FlinthoofBoar.java    |   2 +-
 .../src/mage/sets/eternalmasters/Fog.java     |   2 +-
 .../mage/sets/eternalmasters/ForceOfWill.java |   2 +-
 .../mage/sets/eternalmasters/FutureSight.java |   2 +-
 .../sets/eternalmasters/GaeasBlessing.java    |   2 +-
 .../src/mage/sets/eternalmasters/Gamble.java  |   2 +-
 .../mage/sets/eternalmasters/GaseousForm.java |   2 +-
 .../sets/eternalmasters/GhituSlinger.java     |   2 +-
 .../sets/eternalmasters/GiantSolifuge.java    |   2 +-
 .../sets/eternalmasters/GiantTortoise.java    |   2 +-
 .../mage/sets/eternalmasters/GlacialWall.java |   2 +-
 .../sets/eternalmasters/GlareOfSubdual.java   |   2 +-
 .../sets/eternalmasters/GlimmerpointStag.java |   2 +-
 .../eternalmasters/GoblinCharbelcher.java     |   2 +-
 .../sets/eternalmasters/GoblinTrenches.java   |   2 +-
 .../mage/sets/eternalmasters/Gravedigger.java |   2 +-
 .../sets/eternalmasters/GreenSunsZenith.java  |   2 +-
 .../mage/sets/eternalmasters/Harmonize.java   |   2 +-
 .../mage/sets/eternalmasters/HavocDemon.java  |   2 +-
 .../sets/eternalmasters/HeritageDruid.java    |   2 +-
 .../eternalmasters/HondenOfCleansingFire.java |   2 +-
 .../eternalmasters/HondenOfInfiniteRage.java  |   2 +-
 .../sets/eternalmasters/HondenOfLifesWeb.java |   2 +-
 .../eternalmasters/HondenOfNightsReach.java   |   2 +-
 .../eternalmasters/HondenOfSeeingWinds.java   |   2 +-
 .../src/mage/sets/eternalmasters/Humble.java  |   2 +-
 .../mage/sets/eternalmasters/Hydroblast.java  |   2 +-
 .../sets/eternalmasters/HymnToTourach.java    |   2 +-
 .../src/mage/sets/eternalmasters/Ichorid.java |   2 +-
 .../sets/eternalmasters/ImperiousPerfect.java |   2 +-
 .../sets/eternalmasters/InkwellLeviathan.java |   2 +-
 .../sets/eternalmasters/InnocentBlood.java    |   2 +-
 .../sets/eternalmasters/IntangibleVirtue.java |   2 +-
 .../mage/sets/eternalmasters/Invigorate.java  |   2 +-
 .../sets/eternalmasters/IsochronScepter.java  |   2 +-
 .../eternalmasters/JaceTheMindSculptor.java   |   2 +-
 .../eternalmasters/JarethLeonineTitan.java    |   2 +-
 .../sets/eternalmasters/JettingGlasskite.java |   2 +-
 .../mage/sets/eternalmasters/Juggernaut.java  |   2 +-
 .../sets/eternalmasters/JungleHollow.java     |   2 +-
 .../src/mage/sets/eternalmasters/Karakas.java |   2 +-
 .../mage/sets/eternalmasters/KarmicGuide.java |   2 +-
 .../sets/eternalmasters/KeldonChampion.java   |   2 +-
 .../sets/eternalmasters/KeldonMarauders.java  |   2 +-
 .../src/mage/sets/eternalmasters/KirdApe.java |   2 +-
 .../sets/eternalmasters/KorHookmaster.java    |   2 +-
 .../sets/eternalmasters/LlanowarElves.java    |   2 +-
 .../eternalmasters/LysAlanaHuntmaster.java    |   2 +-
 .../eternalmasters/LysAlanaScarblade.java     |   2 +-
 .../eternalmasters/MaelstromWanderer.java     |   2 +-
 .../eternalmasters/MaliciousAffliction.java   |   2 +-
 .../src/mage/sets/eternalmasters/ManOWar.java |   2 +-
 .../mage/sets/eternalmasters/ManaCrypt.java   |   2 +-
 .../mage/sets/eternalmasters/MazeOfIth.java   |   2 +-
 .../mage/sets/eternalmasters/MemoryLapse.java |   2 +-
 .../sets/eternalmasters/MerfolkLooter.java    |   2 +-
 .../sets/eternalmasters/MesaEnchantress.java  |   2 +-
 .../mage/sets/eternalmasters/Millikin.java    |   2 +-
 .../eternalmasters/MindlessAutomaton.java     |   2 +-
 .../sets/eternalmasters/MishrasFactory.java   |   2 +-
 .../sets/eternalmasters/MistralCharger.java   |   2 +-
 .../mage/sets/eternalmasters/MoggFanatic.java |   2 +-
 .../sets/eternalmasters/MoggWarMarshal.java   |   2 +-
 .../sets/eternalmasters/MonkIdealist.java     |   2 +-
 .../sets/eternalmasters/MotherOfRunes.java    |   2 +-
 .../sets/eternalmasters/MysticalTutor.java    |   2 +-
 .../sets/eternalmasters/NaturalOrder.java     |   2 +-
 .../sets/eternalmasters/NaturesClaim.java     |   2 +-
 .../src/mage/sets/eternalmasters/Nausea.java  |   2 +-
 .../sets/eternalmasters/Necropotence.java     |   2 +-
 .../mage/sets/eternalmasters/Nekrataal.java   |   2 +-
 .../sets/eternalmasters/NevinyrralsDisk.java  |   2 +-
 .../sets/eternalmasters/NightsWhisper.java    |   2 +-
 .../sets/eternalmasters/NimbleMongoose.java   |   2 +-
 .../mage/sets/eternalmasters/OonasGrace.java  |   2 +-
 .../sets/eternalmasters/OrcishOriflamme.java  |   2 +-
 .../mage/sets/eternalmasters/Pacifism.java    |   2 +-
 .../sets/eternalmasters/PeregrineDrake.java   |   2 +-
 .../sets/eternalmasters/PhantomMonster.java   |   2 +-
 .../eternalmasters/PhyrexianGargantua.java    |   2 +-
 .../eternalmasters/PhyrexianIngester.java     |   2 +-
 .../sets/eternalmasters/PhyrexianRager.java   |   2 +-
 .../mage/sets/eternalmasters/PilgrimsEye.java |   2 +-
 .../mage/sets/eternalmasters/PlagueWitch.java |   2 +-
 .../sets/eternalmasters/PriceOfProgress.java  |   2 +-
 .../sets/eternalmasters/PrismaticLens.java    |   2 +-
 .../sets/eternalmasters/ProdigalSorcerer.java |   2 +-
 .../sets/eternalmasters/ProwlingPangolin.java |   2 +-
 .../mage/sets/eternalmasters/Pyroblast.java   |   2 +-
 .../mage/sets/eternalmasters/Pyrokinesis.java |   2 +-
 .../sets/eternalmasters/QuietSpeculation.java |   2 +-
 .../sets/eternalmasters/RaiseTheAlarm.java    |   2 +-
 .../sets/eternalmasters/RallyThePeasants.java |   2 +-
 .../src/mage/sets/eternalmasters/Rancor.java  |   2 +-
 .../sets/eternalmasters/RecklessCharge.java   |   2 +-
 .../mage/sets/eternalmasters/RegalForce.java  |   2 +-
 .../eternalmasters/RelicOfProgenitus.java     |   2 +-
 .../sets/eternalmasters/RoarOfTheWurm.java    |   2 +-
 .../src/mage/sets/eternalmasters/Roots.java   |   2 +-
 .../sets/eternalmasters/RorixBladewing.java   |   2 +-
 .../sets/eternalmasters/RuggedHighlands.java  |   2 +-
 .../sets/eternalmasters/ScouredBarrens.java   |   2 +-
 .../sets/eternalmasters/ScreechingSkaab.java  |   2 +-
 .../sets/eternalmasters/SealOfCleansing.java  |   2 +-
 .../sets/eternalmasters/SealOfStrength.java   |   2 +-
 .../sets/eternalmasters/SecondThoughts.java   |   2 +-
 .../sets/eternalmasters/SeismicStomp.java     |   2 +-
 .../sets/eternalmasters/SengirAutocrat.java   |   2 +-
 .../eternalmasters/SenseisDiviningTop.java    |   2 +-
 .../sets/eternalmasters/SentinelSpider.java   |   2 +-
 .../sets/eternalmasters/SerendibEfreet.java   |   2 +-
 .../mage/sets/eternalmasters/SerraAngel.java  |   2 +-
 .../sets/eternalmasters/ShamanOfThePack.java  |   2 +-
 .../sets/eternalmasters/ShardlessAgent.java   |   2 +-
 .../src/mage/sets/eternalmasters/Shelter.java |   2 +-
 .../sets/eternalmasters/ShorelineRanger.java  |   2 +-
 .../eternalmasters/SiegeGangCommander.java    |   2 +-
 .../sets/eternalmasters/SilentDeparture.java  |   2 +-
 .../eternalmasters/SilvosRogueElemental.java  |   2 +-
 .../mage/sets/eternalmasters/Sinkhole.java    |   2 +-
 .../sets/eternalmasters/SkulkingGhost.java    |   2 +-
 .../mage/sets/eternalmasters/SneakAttack.java |   2 +-
 .../mage/sets/eternalmasters/Soulcatcher.java |   2 +-
 .../eternalmasters/SphinxOfTheSteelWind.java  |   2 +-
 .../mage/sets/eternalmasters/SpriteNoble.java |   2 +-
 .../sets/eternalmasters/SquadronHawk.java     |   2 +-
 .../sets/eternalmasters/Stingscourger.java    |   2 +-
 .../sets/eternalmasters/StupefyingTouch.java  |   2 +-
 .../sets/eternalmasters/SulfuricVortex.java   |   2 +-
 .../sets/eternalmasters/SwiftwaterCliffs.java |   2 +-
 .../eternalmasters/SwordsToPlowshares.java    |   2 +-
 .../sets/eternalmasters/SylvanLibrary.java    |   2 +-
 .../mage/sets/eternalmasters/SylvanMight.java |   2 +-
 .../sets/eternalmasters/ThornwealdArcher.java |   2 +-
 .../sets/eternalmasters/ThornwoodFalls.java   |   2 +-
 .../eternalmasters/ThunderclapWyvern.java     |   2 +-
 .../sets/eternalmasters/TickingGnomes.java    |   2 +-
 .../mage/sets/eternalmasters/TidalWave.java   |   2 +-
 .../sets/eternalmasters/TimberwatchElf.java   |   2 +-
 .../sets/eternalmasters/ToothAndClaw.java     |   2 +-
 .../sets/eternalmasters/TorrentOfSouls.java   |   2 +-
 .../mage/sets/eternalmasters/ToxicDeluge.java |   2 +-
 .../mage/sets/eternalmasters/TragicSlip.java  |   2 +-
 .../sets/eternalmasters/TranquilCove.java     |   2 +-
 .../sets/eternalmasters/TrygonPredator.java   |   2 +-
 .../eternalmasters/TwistedAbomination.java    |   2 +-
 .../mage/sets/eternalmasters/UndyingRage.java |   2 +-
 .../eternalmasters/UnexpectedlyAbsent.java    |   2 +-
 .../sets/eternalmasters/UrborgUprising.java   |   2 +-
 .../sets/eternalmasters/VampiricTutor.java    |   2 +-
 .../mage/sets/eternalmasters/Victimize.java   |   2 +-
 .../mage/sets/eternalmasters/Vindicate.java   |   2 +-
 .../eternalmasters/VisaraTheDreadful.java     |   2 +-
 .../src/mage/sets/eternalmasters/Void.java    |   2 +-
 .../sets/eternalmasters/WakeOfVultures.java   |   2 +-
 .../mage/sets/eternalmasters/Wakedancer.java  |   2 +-
 .../mage/sets/eternalmasters/WallOfOmens.java |   2 +-
 .../sets/eternalmasters/WarPriestOfThune.java |   2 +-
 .../sets/eternalmasters/WardenOfEvosIsle.java |   2 +-
 .../mage/sets/eternalmasters/Wasteland.java   |   2 +-
 .../sets/eternalmasters/WeeDragonauts.java    |   2 +-
 .../mage/sets/eternalmasters/WelkinGuide.java |   2 +-
 .../mage/sets/eternalmasters/Werebear.java    |   2 +-
 .../sets/eternalmasters/WhitemaneLion.java    |   2 +-
 .../sets/eternalmasters/WildfireEmissary.java |   2 +-
 .../sets/eternalmasters/WindScarredCrag.java  |   2 +-
 .../mage/sets/eternalmasters/WinterOrb.java   |   2 +-
 .../sets/eternalmasters/WirewoodSymbiote.java |   2 +-
 .../src/mage/sets/eternalmasters/Wonder.java  |   2 +-
 .../eternalmasters/WorldgorgerDragon.java     |   2 +-
 .../sets/eternalmasters/WornPowerstone.java   |   2 +-
 .../mage/sets/eternalmasters/WrathOfGod.java  |   2 +-
 .../mage/sets/eternalmasters/XantidSwarm.java |   2 +-
 .../eternalmasters/YavimayaEnchantress.java   |   2 +-
 .../sets/eternalmasters/YoungPyromancer.java  |   2 +-
 .../eternalmasters/ZealousPersecution.java    |   2 +-
 .../mage/sets/eventide/CallTheSkybreaker.java |   2 +-
 .../src/mage/sets/eventide/DesecratorHag.java |   2 +-
 .../mage/sets/eventide/DuergarHedgeMage.java  |   2 +-
 .../src/mage/sets/eventide/DuskdaleWurm.java  |   2 +-
 .../mage/sets/eventide/GwyllionHedgeMage.java |   2 +-
 .../mage/sets/eventide/MurkfiendLiege.java    |   2 +-
 .../mage/sets/eventide/NoggleRansacker.java   |   2 +-
 .../mage/sets/eventide/SpringjackPasture.java |   2 +-
 Mage.Sets/src/mage/sets/exodus/Anarchist.java |   2 +-
 .../src/mage/sets/exodus/AngelicBlessing.java |   2 +-
 .../src/mage/sets/exodus/ChargingPaladin.java |   2 +-
 .../src/mage/sets/exodus/CoatOfArms.java      |   2 +-
 .../src/mage/sets/exodus/CrashingBoars.java   |   2 +-
 Mage.Sets/src/mage/sets/exodus/Curiosity.java |   2 +-
 .../src/mage/sets/exodus/CursedFlesh.java     |   2 +-
 .../src/mage/sets/exodus/DauthiJackal.java    |   2 +-
 .../src/mage/sets/exodus/DauthiWarlord.java   |   2 +-
 .../src/mage/sets/exodus/DeathsDuet.java      |   2 +-
 .../src/mage/sets/exodus/ElvishBerserker.java |   2 +-
 Mage.Sets/src/mage/sets/exodus/Fugue.java     |   2 +-
 .../src/mage/sets/exodus/FurnaceBrood.java    |   2 +-
 .../src/mage/sets/exodus/KillerWhale.java     |   2 +-
 .../src/mage/sets/exodus/ManiacalRage.java    |   2 +-
 .../src/mage/sets/exodus/MerfolkLooter.java   |   2 +-
 .../src/mage/sets/exodus/MirriCatWarrior.java |   2 +-
 Mage.Sets/src/mage/sets/exodus/Nausea.java    |   2 +-
 .../src/mage/sets/exodus/Necrologia.java      |   2 +-
 .../src/mage/sets/exodus/PaladinEnVec.java    |   2 +-
 .../src/mage/sets/exodus/Pandemonium.java     |   2 +-
 .../src/mage/sets/exodus/PeaceOfMind.java     |   2 +-
 .../src/mage/sets/exodus/RagingGoblin.java    |   2 +-
 Mage.Sets/src/mage/sets/exodus/Reclaim.java   |   2 +-
 .../src/mage/sets/exodus/RobeOfMirrors.java   |   2 +-
 .../src/mage/sets/exodus/SeismicAssault.java  |   2 +-
 Mage.Sets/src/mage/sets/exodus/Shackles.java  |   2 +-
 Mage.Sets/src/mage/sets/exodus/Skyshaper.java |   2 +-
 .../src/mage/sets/exodus/SoulWarden.java      |   2 +-
 Mage.Sets/src/mage/sets/exodus/Spellbook.java |   2 +-
 .../src/mage/sets/exodus/Spellshock.java      |   2 +-
 .../src/mage/sets/exodus/SpikeHatcher.java    |   2 +-
 .../src/mage/sets/exodus/StandingTroops.java  |   2 +-
 .../mage/sets/exodus/ThalakosDrifters.java    |   2 +-
 .../src/mage/sets/exodus/ThalakosScout.java   |   2 +-
 .../src/mage/sets/exodus/ThopterSquadron.java |   2 +-
 .../src/mage/sets/exodus/ThrullSurgeon.java   |   2 +-
 .../src/mage/sets/exodus/TreasureHunter.java  |   2 +-
 .../src/mage/sets/exodus/TreasureTrove.java   |   2 +-
 .../src/mage/sets/exodus/WaywardSoul.java     |   2 +-
 Mage.Sets/src/mage/sets/exodus/WoodElves.java |   2 +-
 .../mage/sets/fallenempires/Aeolipile.java    |   2 +-
 .../mage/sets/fallenempires/ArmorThrull1.java |   2 +-
 .../mage/sets/fallenempires/ArmorThrull2.java |   2 +-
 .../mage/sets/fallenempires/ArmorThrull3.java |   2 +-
 .../mage/sets/fallenempires/ArmorThrull4.java |   2 +-
 .../mage/sets/fallenempires/BasalThrull2.java |   2 +-
 .../mage/sets/fallenempires/BasalThrull3.java |   2 +-
 .../mage/sets/fallenempires/BasalThrull4.java |   2 +-
 .../sets/fallenempires/BrassclawOrcs2.java    |   2 +-
 .../sets/fallenempires/BrassclawOrcs3.java    |   2 +-
 .../sets/fallenempires/BrassclawOrcs4.java    |   2 +-
 .../mage/sets/fallenempires/BreedingPit.java  |   2 +-
 .../mage/sets/fallenempires/CombatMedic1.java |   2 +-
 .../mage/sets/fallenempires/CombatMedic2.java |   2 +-
 .../mage/sets/fallenempires/CombatMedic3.java |   2 +-
 .../mage/sets/fallenempires/CombatMedic4.java |   2 +-
 .../sets/fallenempires/DwarvenCatapult.java   |   2 +-
 .../mage/sets/fallenempires/DwarvenHold.java  |   2 +-
 .../sets/fallenempires/DwarvenSoldier2.java   |   2 +-
 .../sets/fallenempires/DwarvenSoldier3.java   |   2 +-
 .../mage/sets/fallenempires/EbonPraetor.java  |   2 +-
 .../sets/fallenempires/ElvenFortress2.java    |   2 +-
 .../sets/fallenempires/ElvenFortress3.java    |   2 +-
 .../sets/fallenempires/ElvenFortress4.java    |   2 +-
 .../mage/sets/fallenempires/ElvenLyre.java    |   2 +-
 .../mage/sets/fallenempires/ElvishFarmer.java |   2 +-
 .../sets/fallenempires/ElvishHunter1.java     |   2 +-
 .../sets/fallenempires/ElvishHunter2.java     |   2 +-
 .../sets/fallenempires/ElvishHunter3.java     |   2 +-
 .../mage/sets/fallenempires/ElvishScout2.java |   2 +-
 .../mage/sets/fallenempires/ElvishScout3.java |   2 +-
 .../sets/fallenempires/FarrelsZealot2.java    |   2 +-
 .../sets/fallenempires/FarrelsZealot3.java    |   2 +-
 .../sets/fallenempires/GoblinChirurgeon2.java |   2 +-
 .../sets/fallenempires/GoblinChirurgeon3.java |   2 +-
 .../sets/fallenempires/GoblinGrenade1.java    |   2 +-
 .../sets/fallenempires/GoblinGrenade2.java    |   2 +-
 .../sets/fallenempires/GoblinGrenade3.java    |   2 +-
 .../sets/fallenempires/GoblinWarDrums2.java   |   2 +-
 .../sets/fallenempires/GoblinWarDrums3.java   |   2 +-
 .../sets/fallenempires/GoblinWarDrums4.java   |   2 +-
 .../sets/fallenempires/HandOfJustice.java     |   2 +-
 .../mage/sets/fallenempires/HighTide2.java    |   2 +-
 .../mage/sets/fallenempires/HighTide3.java    |   2 +-
 .../src/mage/sets/fallenempires/Homarid2.java |   2 +-
 .../src/mage/sets/fallenempires/Homarid3.java |   2 +-
 .../src/mage/sets/fallenempires/Homarid4.java |   2 +-
 .../sets/fallenempires/HomaridWarrior2.java   |   2 +-
 .../sets/fallenempires/HomaridWarrior3.java   |   2 +-
 .../sets/fallenempires/HymnToTourach2.java    |   2 +-
 .../sets/fallenempires/HymnToTourach3.java    |   2 +-
 .../sets/fallenempires/HymnToTourach4.java    |   2 +-
 .../fallenempires/IcatianJavelineers2.java    |   2 +-
 .../fallenempires/IcatianJavelineers3.java    |   2 +-
 .../fallenempires/IcatianMoneychanger2.java   |   2 +-
 .../fallenempires/IcatianMoneychanger3.java   |   2 +-
 .../sets/fallenempires/IcatianPriest.java     |   2 +-
 .../sets/fallenempires/IcatianScout1.java     |   2 +-
 .../sets/fallenempires/IcatianScout2.java     |   2 +-
 .../sets/fallenempires/IcatianScout3.java     |   2 +-
 .../sets/fallenempires/IcatianScout4.java     |   2 +-
 .../InitiatesOfTheEbonHand2.java              |   2 +-
 .../InitiatesOfTheEbonHand3.java              |   2 +-
 .../sets/fallenempires/MindstabThrull1.java   |   2 +-
 .../sets/fallenempires/MindstabThrull2.java   |   2 +-
 .../sets/fallenempires/MindstabThrull3.java   |   2 +-
 .../src/mage/sets/fallenempires/Necrite2.java |   2 +-
 .../src/mage/sets/fallenempires/Necrite3.java |   2 +-
 .../mage/sets/fallenempires/NightSoil2.java   |   2 +-
 .../mage/sets/fallenempires/NightSoil3.java   |   2 +-
 .../sets/fallenempires/OrcishCaptain.java     |   2 +-
 .../mage/sets/fallenempires/OrcishSpy2.java   |   2 +-
 .../mage/sets/fallenempires/OrcishSpy3.java   |   2 +-
 .../sets/fallenempires/OrcishVeteran1.java    |   2 +-
 .../sets/fallenempires/OrcishVeteran2.java    |   2 +-
 .../sets/fallenempires/OrcishVeteran3.java    |   2 +-
 .../sets/fallenempires/OrcishVeteran4.java    |   2 +-
 .../sets/fallenempires/OrderOfLeitbur1.java   |   2 +-
 .../sets/fallenempires/OrderOfLeitbur2.java   |   2 +-
 .../sets/fallenempires/OrderOfLeitbur3.java   |   2 +-
 .../fallenempires/OrderOfTheEbonHand1.java    |   2 +-
 .../fallenempires/OrderOfTheEbonHand2.java    |   2 +-
 .../fallenempires/OrderOfTheEbonHand3.java    |   2 +-
 .../src/mage/sets/fallenempires/Orgg.java     |   2 +-
 .../mage/sets/fallenempires/RainbowVale.java  |   2 +-
 .../sets/fallenempires/RingOfRenewal.java     |   2 +-
 .../mage/sets/fallenempires/RiverMerfolk.java |   2 +-
 .../mage/sets/fallenempires/SandSilos.java    |   2 +-
 .../mage/sets/fallenempires/SoulExchange.java |   2 +-
 .../src/mage/sets/fallenempires/Thallid1.java |   2 +-
 .../src/mage/sets/fallenempires/Thallid2.java |   2 +-
 .../src/mage/sets/fallenempires/Thallid3.java |   2 +-
 .../src/mage/sets/fallenempires/Thallid4.java |   2 +-
 .../sets/fallenempires/TheloniteDruid.java    |   2 +-
 .../sets/fallenempires/ThornThallid2.java     |   2 +-
 .../sets/fallenempires/ThornThallid3.java     |   2 +-
 .../sets/fallenempires/ThornThallid4.java     |   2 +-
 .../sets/fallenempires/ThrullChampion.java    |   2 +-
 .../sets/fallenempires/ThrullRetainer.java    |   2 +-
 .../sets/fallenempires/VodalianMage2.java     |   2 +-
 .../sets/fallenempires/VodalianMage3.java     |   2 +-
 .../sets/fallenempires/VodalianSoldiers1.java |   2 +-
 .../sets/fallenempires/VodalianSoldiers2.java |   2 +-
 .../sets/fallenempires/VodalianSoldiers3.java |   2 +-
 .../sets/fallenempires/VodalianSoldiers4.java |   2 +-
 .../sets/fatereforged/BloodfellCaves.java     |   2 +-
 .../sets/fatereforged/BlossomingSands.java    |   2 +-
 .../sets/fatereforged/DismalBackwater.java    |   2 +-
 .../mage/sets/fatereforged/DouseInGloom.java  |   2 +-
 .../mage/sets/fatereforged/HuntTheWeak.java   |   2 +-
 .../mage/sets/fatereforged/JungleHollow.java  |   2 +-
 .../mage/sets/fatereforged/Pyrotechnics.java  |   2 +-
 .../sets/fatereforged/RuggedHighlands.java    |   2 +-
 .../sets/fatereforged/ScouredBarrens.java     |   2 +-
 .../sets/fatereforged/SwiftwaterCliffs.java   |   2 +-
 .../sets/fatereforged/ThornwoodFalls.java     |   2 +-
 .../mage/sets/fatereforged/TranquilCove.java  |   2 +-
 .../mage/sets/fatereforged/TyphoidRats.java   |   2 +-
 .../sets/fatereforged/WindScarredCrag.java    |   2 +-
 .../src/mage/sets/fifthdawn/AllSunsDawn.java  |   2 +-
 .../mage/sets/fifthdawn/ArcboundWanderer.java |   2 +-
 .../mage/sets/fifthdawn/AuriokSalvagers.java  |   2 +-
 .../sets/fifthdawn/BeaconOfDestruction.java   |   2 +-
 .../sets/fifthdawn/BeaconOfImmortality.java   |   2 +-
 .../mage/sets/fifthdawn/BeaconOfUnrest.java   |   2 +-
 .../src/mage/sets/fifthdawn/CacklingImp.java  |   2 +-
 .../src/mage/sets/fifthdawn/ClockOfOmens.java |   2 +-
 .../mage/sets/fifthdawn/CompositeGolem.java   |   2 +-
 .../mage/sets/fifthdawn/CranialPlating.java   |   2 +-
 .../mage/sets/fifthdawn/CrucibleOfWorlds.java |   2 +-
 .../sets/fifthdawn/DoorToNothingness.java     |   2 +-
 .../src/mage/sets/fifthdawn/DoublingCube.java |   2 +-
 .../mage/sets/fifthdawn/DrossCrocodile.java   |   2 +-
 .../mage/sets/fifthdawn/EnergyChamber.java    |   2 +-
 .../src/mage/sets/fifthdawn/EtchedOracle.java |   2 +-
 .../src/mage/sets/fifthdawn/FurnaceWhelp.java |   2 +-
 .../src/mage/sets/fifthdawn/JoinerAdept.java  |   2 +-
 .../src/mage/sets/fifthdawn/MagmaGiant.java   |   2 +-
 .../src/mage/sets/fifthdawn/ManaGeyser.java   |   2 +-
 .../src/mage/sets/fifthdawn/PentadPrism.java  |   2 +-
 .../src/mage/sets/fifthdawn/Qumulox.java      |   2 +-
 .../sets/fifthdawn/RazormaneMasticore.java    |   2 +-
 .../mage/sets/fifthdawn/RelentlessRats.java   |   2 +-
 .../src/mage/sets/fifthdawn/RelicBarrier.java |   2 +-
 .../mage/sets/fifthdawn/RudeAwakening.java    |   2 +-
 .../src/mage/sets/fifthdawn/Skullcage.java    |   2 +-
 .../mage/sets/fifthdawn/SkyhunterProwler.java |   2 +-
 .../sets/fifthdawn/SkyhunterSkirmisher.java   |   2 +-
 .../mage/sets/fifthdawn/SparkElemental.java   |   2 +-
 .../mage/sets/fifthdawn/SuntouchedMyr.java    |   2 +-
 .../mage/sets/fifthdawn/SynodCenturion.java   |   2 +-
 .../mage/sets/fifthdawn/ThoughtCourier.java   |   2 +-
 .../src/mage/sets/fifthdawn/TrinketMage.java  |   2 +-
 .../sets/fifthdawn/VedalkenMastermind.java    |   2 +-
 .../mage/sets/fifthdawn/VedalkenShackles.java |   2 +-
 .../mage/sets/fifthdawn/WayfarersBauble.java  |   2 +-
 .../mage/sets/fifthedition/AdarkarWastes.java |   2 +-
 .../mage/sets/fifthedition/AirElemental.java  |   2 +-
 .../sets/fifthedition/AkronLegionnaire.java   |   2 +-
 .../mage/sets/fifthedition/AladdinsRing.java  |   2 +-
 .../mage/sets/fifthedition/AnimateDead.java   |   2 +-
 .../mage/sets/fifthedition/AnimateWall.java   |   2 +-
 .../mage/sets/fifthedition/AnkhOfMishra.java  |   2 +-
 .../mage/sets/fifthedition/ArmorOfFaith.java  |   2 +-
 .../mage/sets/fifthedition/AspectOfWolf.java  |   2 +-
 .../src/mage/sets/fifthedition/Atog.java      |   2 +-
 .../src/mage/sets/fifthedition/Aurochs.java   |   2 +-
 .../sets/fifthedition/AysenBureaucrats.java   |   2 +-
 .../mage/sets/fifthedition/AzureDrake.java    |   2 +-
 .../mage/sets/fifthedition/BallLightning.java |   2 +-
 .../mage/sets/fifthedition/BarbedSextant.java |   2 +-
 .../src/mage/sets/fifthedition/BarlsCage.java |   2 +-
 .../mage/sets/fifthedition/BindingGrasp.java  |   2 +-
 .../sets/fifthedition/BirdsOfParadise.java    |   2 +-
 .../mage/sets/fifthedition/BlackKnight.java   |   2 +-
 .../sets/fifthedition/BlinkingSpirit.java     |   2 +-
 .../src/mage/sets/fifthedition/BloodLust.java |   2 +-
 .../src/mage/sets/fifthedition/BogRats.java   |   2 +-
 .../src/mage/sets/fifthedition/BogWraith.java |   2 +-
 .../src/mage/sets/fifthedition/Boomerang.java |   2 +-
 .../sets/fifthedition/BottomlessVault.java    |   2 +-
 .../mage/sets/fifthedition/BrassclawOrcs.java |   2 +-
 .../sets/fifthedition/BrothersOfFire.java     |   2 +-
 .../src/mage/sets/fifthedition/Brushland.java |   2 +-
 .../src/mage/sets/fifthedition/Castle.java    |   2 +-
 .../mage/sets/fifthedition/CavePeople.java    |   2 +-
 .../src/mage/sets/fifthedition/ChubToad.java  |   2 +-
 .../CircleOfProtectionArtifacts.java          |   2 +-
 .../fifthedition/CircleOfProtectionBlack.java |   2 +-
 .../fifthedition/CircleOfProtectionBlue.java  |   2 +-
 .../fifthedition/CircleOfProtectionGreen.java |   2 +-
 .../fifthedition/CircleOfProtectionRed.java   |   2 +-
 .../fifthedition/CircleOfProtectionWhite.java |   2 +-
 .../mage/sets/fifthedition/CityOfBrass.java   |   2 +-
 .../mage/sets/fifthedition/ClayStatue.java    |   2 +-
 .../sets/fifthedition/ClockworkBeast.java     |   2 +-
 .../mage/sets/fifthedition/Cockatrice.java    |   2 +-
 .../src/mage/sets/fifthedition/Conquer.java   |   2 +-
 .../src/mage/sets/fifthedition/CoralHelm.java |   2 +-
 .../mage/sets/fifthedition/Counterspell.java  |   2 +-
 .../src/mage/sets/fifthedition/CrawGiant.java |   2 +-
 .../src/mage/sets/fifthedition/CrawWurm.java  |   2 +-
 .../sets/fifthedition/CrimsonManticore.java   |   2 +-
 .../src/mage/sets/fifthedition/Crumble.java   |   2 +-
 .../src/mage/sets/fifthedition/Crusade.java   |   2 +-
 .../mage/sets/fifthedition/CrystalRod.java    |   2 +-
 .../mage/sets/fifthedition/CursedLand.java    |   2 +-
 .../mage/sets/fifthedition/DanceOfMany.java   |   2 +-
 .../sets/fifthedition/DancingScimitar.java    |   2 +-
 .../mage/sets/fifthedition/DarkRitual.java    |   2 +-
 .../mage/sets/fifthedition/DeathSpeakers.java |   2 +-
 .../src/mage/sets/fifthedition/DeathWard.java |   2 +-
 .../src/mage/sets/fifthedition/Deathgrip.java |   2 +-
 .../mage/sets/fifthedition/Deflection.java    |   2 +-
 .../src/mage/sets/fifthedition/Derelor.java   |   2 +-
 .../mage/sets/fifthedition/DesertTwister.java |   2 +-
 .../sets/fifthedition/DiabolicMachine.java    |   2 +-
 .../src/mage/sets/fifthedition/DingusEgg.java |   2 +-
 .../mage/sets/fifthedition/Disenchant.java    |   2 +-
 .../mage/sets/fifthedition/Disintegrate.java  |   2 +-
 .../sets/fifthedition/DisruptingScepter.java  |   2 +-
 .../sets/fifthedition/DivineOffering.java     |   2 +-
 .../src/mage/sets/fifthedition/DrainLife.java |   2 +-
 .../sets/fifthedition/DrudgeSkeletons.java    |   2 +-
 .../mage/sets/fifthedition/DustToDust.java    |   2 +-
 .../mage/sets/fifthedition/DwarvenRuins.java  |   2 +-
 .../sets/fifthedition/DwarvenSoldier.java     |   2 +-
 .../sets/fifthedition/DwarvenWarriors.java    |   2 +-
 .../mage/sets/fifthedition/Earthquake.java    |   2 +-
 .../sets/fifthedition/EbonStronghold.java     |   2 +-
 .../mage/sets/fifthedition/ElderDruid.java    |   2 +-
 .../mage/sets/fifthedition/ElvenRiders.java   |   2 +-
 .../mage/sets/fifthedition/EnergyFlux.java    |   2 +-
 .../src/mage/sets/fifthedition/Enervate.java  |   2 +-
 .../mage/sets/fifthedition/ErgRaiders.java    |   2 +-
 .../src/mage/sets/fifthedition/Errantry.java  |   2 +-
 .../mage/sets/fifthedition/EvilPresence.java  |   2 +-
 .../mage/sets/fifthedition/EyeForAnEye.java   |   2 +-
 .../mage/sets/fifthedition/FallenAngel.java   |   2 +-
 .../src/mage/sets/fifthedition/Fear.java      |   2 +-
 .../src/mage/sets/fifthedition/Feedback.java  |   2 +-
 .../mage/sets/fifthedition/FeldonsCane.java   |   2 +-
 .../mage/sets/fifthedition/FellwarStone.java  |   2 +-
 .../src/mage/sets/fifthedition/Fireball.java  |   2 +-
 .../mage/sets/fifthedition/Firebreathing.java |   2 +-
 .../mage/sets/fifthedition/FlameSpirit.java   |   2 +-
 .../src/mage/sets/fifthedition/Flight.java    |   2 +-
 .../src/mage/sets/fifthedition/Flood.java     |   2 +-
 .../mage/sets/fifthedition/FlyingCarpet.java  |   2 +-
 Mage.Sets/src/mage/sets/fifthedition/Fog.java |   2 +-
 .../mage/sets/fifthedition/ForceOfNature.java |   2 +-
 .../mage/sets/fifthedition/ForceSpike.java    |   2 +-
 .../src/mage/sets/fifthedition/Forget.java    |   2 +-
 .../sets/fifthedition/FountainOfYouth.java    |   2 +-
 .../mage/sets/fifthedition/FrozenShade.java   |   2 +-
 .../src/mage/sets/fifthedition/Fungusaur.java |   2 +-
 .../mage/sets/fifthedition/FyndhornElder.java |   2 +-
 .../mage/sets/fifthedition/GameOfChaos.java   |   2 +-
 .../mage/sets/fifthedition/GaseousForm.java   |   2 +-
 .../mage/sets/fifthedition/GiantGrowth.java   |   2 +-
 .../mage/sets/fifthedition/GiantSpider.java   |   2 +-
 .../mage/sets/fifthedition/GiantStrength.java |   2 +-
 .../mage/sets/fifthedition/GlassesOfUrza.java |   2 +-
 .../src/mage/sets/fifthedition/Gloom.java     |   2 +-
 .../sets/fifthedition/GoblinDiggingTeam.java  |   2 +-
 .../mage/sets/fifthedition/GoblinKing.java    |   2 +-
 .../sets/fifthedition/GoblinWarDrums.java     |   2 +-
 .../mage/sets/fifthedition/GoblinWarrens.java |   2 +-
 .../sets/fifthedition/GrapeshotCatapult.java  |   2 +-
 .../mage/sets/fifthedition/GrizzlyBears.java  |   2 +-
 .../fifthedition/HavenwoodBattleground.java   |   2 +-
 .../src/mage/sets/fifthedition/Heal.java      |   2 +-
 .../mage/sets/fifthedition/HealingSalve.java  |   2 +-
 .../src/mage/sets/fifthedition/Hecatomb.java  |   2 +-
 .../src/mage/sets/fifthedition/HillGiant.java |   2 +-
 .../mage/sets/fifthedition/HollowTrees.java   |   2 +-
 .../mage/sets/fifthedition/HolyStrength.java  |   2 +-
 .../sets/fifthedition/HomaridWarrior.java     |   2 +-
 .../sets/fifthedition/HowlFromBeyond.java     |   2 +-
 .../mage/sets/fifthedition/HowlingMine.java   |   2 +-
 .../src/mage/sets/fifthedition/Hurricane.java |   2 +-
 .../mage/sets/fifthedition/IcatianScout.java  |   2 +-
 .../mage/sets/fifthedition/IcatianStore.java  |   2 +-
 .../mage/sets/fifthedition/IcatianTown.java   |   2 +-
 .../sets/fifthedition/ImposingVisage.java     |   2 +-
 .../mage/sets/fifthedition/Incinerate.java    |   2 +-
 .../src/mage/sets/fifthedition/Inferno.java   |   2 +-
 .../fifthedition/InitiatesOfTheEbonHand.java  |   2 +-
 .../src/mage/sets/fifthedition/IronStar.java  |   2 +-
 .../mage/sets/fifthedition/IronclawOrcs.java  |   2 +-
 .../sets/fifthedition/IslandSanctuary.java    |   2 +-
 .../src/mage/sets/fifthedition/IvoryCup.java  |   2 +-
 .../sets/fifthedition/IvoryGuardians.java     |   2 +-
 .../mage/sets/fifthedition/JadeMonolith.java  |   2 +-
 .../src/mage/sets/fifthedition/JalumTome.java |   2 +-
 .../sets/fifthedition/JandorsSaddlebags.java  |   2 +-
 .../mage/sets/fifthedition/JayemdaeTome.java  |   2 +-
 .../mage/sets/fifthedition/JohtullWurm.java   |   2 +-
 .../mage/sets/fifthedition/Jokulhaups.java    |   2 +-
 .../sets/fifthedition/KarplusanForest.java    |   2 +-
 .../mage/sets/fifthedition/KeldonWarlord.java |   2 +-
 .../mage/sets/fifthedition/KjeldoranDead.java |   2 +-
 .../fifthedition/KjeldoranRoyalGuard.java     |   2 +-
 .../sets/fifthedition/KnightOfStromgald.java  |   2 +-
 .../sets/fifthedition/KrovikanSorcerer.java   |   2 +-
 .../mage/sets/fifthedition/LeshracsRite.java  |   2 +-
 .../src/mage/sets/fifthedition/LeyDruid.java  |   2 +-
 .../src/mage/sets/fifthedition/Lhurgoyf.java  |   2 +-
 .../mage/sets/fifthedition/LibraryOfLeng.java |   2 +-
 .../src/mage/sets/fifthedition/Lifeforce.java |   2 +-
 .../mage/sets/fifthedition/LivingLands.java   |   2 +-
 .../mage/sets/fifthedition/LlanowarElves.java |   2 +-
 .../mage/sets/fifthedition/LordOfThePit.java  |   2 +-
 .../src/mage/sets/fifthedition/Lure.java      |   2 +-
 .../sets/fifthedition/MagusOfTheUnseen.java   |   2 +-
 .../src/mage/sets/fifthedition/ManaClash.java |   2 +-
 .../src/mage/sets/fifthedition/ManaFlare.java |   2 +-
 .../src/mage/sets/fifthedition/ManaVault.java |   2 +-
 .../src/mage/sets/fifthedition/Manabarbs.java |   2 +-
 .../mage/sets/fifthedition/MarshViper.java    |   2 +-
 .../src/mage/sets/fifthedition/Meekstone.java |   2 +-
 .../mage/sets/fifthedition/MemoryLapse.java   |   2 +-
 .../mage/sets/fifthedition/MesaFalcon.java    |   2 +-
 .../src/mage/sets/fifthedition/MindWarp.java  |   2 +-
 .../sets/fifthedition/MindstabThrull.java     |   2 +-
 .../mage/sets/fifthedition/NaturesLore.java   |   2 +-
 .../src/mage/sets/fifthedition/Necrite.java   |   2 +-
 .../mage/sets/fifthedition/Necropotence.java  |   2 +-
 .../mage/sets/fifthedition/NetherShadow.java  |   2 +-
 .../src/mage/sets/fifthedition/Nightmare.java |   2 +-
 .../sets/fifthedition/ObeliskOfUndoing.java   |   2 +-
 .../sets/fifthedition/OrcishArtillery.java    |   2 +-
 .../mage/sets/fifthedition/OrcishCaptain.java |   2 +-
 .../sets/fifthedition/OrcishOriflamme.java    |   2 +-
 .../fifthedition/OrderOfTheSacredTorch.java   |   2 +-
 .../fifthedition/OrderOfTheWhiteShield.java   |   2 +-
 .../src/mage/sets/fifthedition/Orgg.java      |   2 +-
 .../mage/sets/fifthedition/Ornithopter.java   |   2 +-
 .../src/mage/sets/fifthedition/Panic.java     |   2 +-
 .../src/mage/sets/fifthedition/Paralyze.java  |   2 +-
 .../sets/fifthedition/PentagramOfTheAges.java |   2 +-
 .../mage/sets/fifthedition/Pestilence.java    |   2 +-
 .../sets/fifthedition/PhantasmalForces.java   |   2 +-
 .../sets/fifthedition/PhantasmalTerrain.java  |   2 +-
 .../mage/sets/fifthedition/PirateShip.java    |   2 +-
 .../mage/sets/fifthedition/PlagueRats.java    |   2 +-
 .../src/mage/sets/fifthedition/PowerSink.java |   2 +-
 .../mage/sets/fifthedition/PrimalOrder.java   |   2 +-
 .../sets/fifthedition/ProdigalSorcerer.java   |   2 +-
 .../mage/sets/fifthedition/PsychicVenom.java  |   2 +-
 .../src/mage/sets/fifthedition/Pyroblast.java |   2 +-
 .../mage/sets/fifthedition/Pyrotechnics.java  |   2 +-
 .../src/mage/sets/fifthedition/RagMan.java    |   2 +-
 .../src/mage/sets/fifthedition/RaiseDead.java |   2 +-
 .../mage/sets/fifthedition/RayOfCommand.java  |   2 +-
 .../mage/sets/fifthedition/ReefPirates.java   |   2 +-
 .../mage/sets/fifthedition/Regeneration.java  |   2 +-
 .../mage/sets/fifthedition/RemoveSoul.java    |   2 +-
 .../mage/sets/fifthedition/ReverseDamage.java |   2 +-
 .../mage/sets/fifthedition/Righteousness.java |   2 +-
 .../src/mage/sets/fifthedition/RodOfRuin.java |   2 +-
 .../sets/fifthedition/RuinsOfTrokair.java     |   2 +-
 .../mage/sets/fifthedition/SamiteHealer.java  |   2 +-
 .../mage/sets/fifthedition/ScaledWurm.java    |   2 +-
 .../mage/sets/fifthedition/ScatheZombies.java |   2 +-
 .../mage/sets/fifthedition/SeaSerpent.java    |   2 +-
 .../src/mage/sets/fifthedition/SeaSpirit.java |   2 +-
 .../src/mage/sets/fifthedition/SeaSprite.java |   2 +-
 .../src/mage/sets/fifthedition/Seasinger.java |   2 +-
 .../sets/fifthedition/SengirAutocrat.java     |   2 +-
 .../mage/sets/fifthedition/Shapeshifter.java  |   2 +-
 .../src/mage/sets/fifthedition/Shatter.java   |   2 +-
 .../mage/sets/fifthedition/ShieldWall.java    |   2 +-
 .../mage/sets/fifthedition/ShivanDragon.java  |   2 +-
 .../sets/fifthedition/SibilantSpirit.java     |   2 +-
 .../mage/sets/fifthedition/SkullCatapult.java |   2 +-
 .../src/mage/sets/fifthedition/Smoke.java     |   2 +-
 .../sets/fifthedition/SorceressQueen.java     |   2 +-
 .../src/mage/sets/fifthedition/SoulNet.java   |   2 +-
 .../mage/sets/fifthedition/SpellBlast.java    |   2 +-
 .../mage/sets/fifthedition/SpiritLink.java    |   2 +-
 .../src/mage/sets/fifthedition/Stampede.java  |   2 +-
 .../mage/sets/fifthedition/StealArtifact.java |   2 +-
 .../mage/sets/fifthedition/StoneGiant.java    |   2 +-
 .../src/mage/sets/fifthedition/StoneRain.java |   2 +-
 .../mage/sets/fifthedition/StoneSpirit.java   |   2 +-
 .../mage/sets/fifthedition/StreamOfLife.java  |   2 +-
 .../sets/fifthedition/StromgaldCabal.java     |   2 +-
 .../sets/fifthedition/SulfurousSprings.java   |   2 +-
 .../sets/fifthedition/SvyeluniteTemple.java   |   2 +-
 .../src/mage/sets/fifthedition/Tarpan.java    |   2 +-
 .../src/mage/sets/fifthedition/Terror.java    |   2 +-
 .../src/mage/sets/fifthedition/TheHive.java   |   2 +-
 .../sets/fifthedition/ThicketBasilisk.java    |   2 +-
 .../mage/sets/fifthedition/ThroneOfBone.java  |   2 +-
 .../src/mage/sets/fifthedition/TimeBomb.java  |   2 +-
 .../mage/sets/fifthedition/TitaniasSong.java  |   2 +-
 .../src/mage/sets/fifthedition/Torture.java   |   2 +-
 .../mage/sets/fifthedition/TouchOfDeath.java  |   2 +-
 .../mage/sets/fifthedition/Tranquility.java   |   2 +-
 .../src/mage/sets/fifthedition/Tsunami.java   |   2 +-
 .../mage/sets/fifthedition/TundraWolves.java  |   2 +-
 .../src/mage/sets/fifthedition/Twiddle.java   |   2 +-
 .../sets/fifthedition/UndergroundRiver.java   |   2 +-
 .../sets/fifthedition/UnholyStrength.java     |   2 +-
 .../sets/fifthedition/UnstableMutation.java   |   2 +-
 .../src/mage/sets/fifthedition/Unsummon.java  |   2 +-
 .../mage/sets/fifthedition/UntamedWilds.java  |   2 +-
 .../src/mage/sets/fifthedition/Updraft.java   |   2 +-
 .../mage/sets/fifthedition/UrzasBauble.java   |   2 +-
 .../src/mage/sets/fifthedition/Venom.java     |   2 +-
 .../fifthedition/VerduranEnchantress.java     |   2 +-
 .../src/mage/sets/fifthedition/WallOfAir.java |   2 +-
 .../mage/sets/fifthedition/WallOfBone.java    |   2 +-
 .../sets/fifthedition/WallOfBrambles.java     |   2 +-
 .../mage/sets/fifthedition/WallOfFire.java    |   2 +-
 .../mage/sets/fifthedition/WallOfSwords.java  |   2 +-
 .../mage/sets/fifthedition/Wanderlust.java    |   2 +-
 .../src/mage/sets/fifthedition/Weakness.java  |   2 +-
 .../sets/fifthedition/WhirlingDervish.java    |   2 +-
 .../mage/sets/fifthedition/WhiteKnight.java   |   2 +-
 .../mage/sets/fifthedition/WildGrowth.java    |   2 +-
 .../mage/sets/fifthedition/WindSpirit.java    |   2 +-
 .../src/mage/sets/fifthedition/WinterOrb.java |   2 +-
 .../mage/sets/fifthedition/WolverinePack.java |   2 +-
 .../mage/sets/fifthedition/WoodenSphere.java  |   2 +-
 .../sets/fifthedition/WordOfBlasting.java     |   2 +-
 .../mage/sets/fifthedition/WrathOfGod.java    |   2 +-
 .../sets/fifthedition/XenicPoltergeist.java   |   2 +-
 .../mage/sets/fifthedition/ZombieMaster.java  |   2 +-
 .../mage/sets/fifthedition/ZursWeirding.java  |   2 +-
 .../mage/sets/fourthedition/Abomination.java  |   2 +-
 .../mage/sets/fourthedition/AirElemental.java |   2 +-
 .../mage/sets/fourthedition/AladdinsLamp.java |   2 +-
 .../mage/sets/fourthedition/AladdinsRing.java |   2 +-
 .../src/mage/sets/fourthedition/AliBaba.java  |   2 +-
 .../mage/sets/fourthedition/AmrouKithkin.java |   2 +-
 .../sets/fourthedition/AmuletOfKroog.java     |   2 +-
 .../mage/sets/fourthedition/AnimateDead.java  |   2 +-
 .../mage/sets/fourthedition/AnimateWall.java  |   2 +-
 .../mage/sets/fourthedition/AnkhOfMishra.java |   2 +-
 .../sets/fourthedition/ApprenticeWizard.java  |   2 +-
 .../mage/sets/fourthedition/Armageddon.java   |   2 +-
 .../sets/fourthedition/ArmageddonClock.java   |   2 +-
 .../mage/sets/fourthedition/AshesToAshes.java |   2 +-
 .../sets/fourthedition/AshnodsBattleGear.java |   2 +-
 .../mage/sets/fourthedition/AspectOfWolf.java |   2 +-
 .../src/mage/sets/fourthedition/BadMoon.java  |   2 +-
 .../src/mage/sets/fourthedition/Balance.java  |   2 +-
 .../sets/fourthedition/BallLightning.java     |   2 +-
 .../mage/sets/fourthedition/BirdMaiden.java   |   2 +-
 .../sets/fourthedition/BirdsOfParadise.java   |   2 +-
 .../mage/sets/fourthedition/BlackKnight.java  |   2 +-
 .../mage/sets/fourthedition/BlackVise.java    |   2 +-
 .../mage/sets/fourthedition/BlackWard.java    |   2 +-
 .../src/mage/sets/fourthedition/Blight.java   |   2 +-
 .../fourthedition/BlueElementalBlast.java     |   2 +-
 .../src/mage/sets/fourthedition/BlueWard.java |   2 +-
 .../src/mage/sets/fourthedition/BogImp.java   |   2 +-
 .../mage/sets/fourthedition/BogWraith.java    |   2 +-
 .../sets/fourthedition/BottleOfSuleiman.java  |   2 +-
 .../mage/sets/fourthedition/Burrowing.java    |   2 +-
 .../mage/sets/fourthedition/CarrionAnts.java  |   2 +-
 .../src/mage/sets/fourthedition/Castle.java   |   2 +-
 .../mage/sets/fourthedition/CavePeople.java   |   2 +-
 .../sets/fourthedition/CelestialPrism.java    |   2 +-
 .../src/mage/sets/fourthedition/Channel.java  |   2 +-
 .../CircleOfProtectionArtifacts.java          |   2 +-
 .../CircleOfProtectionBlack.java              |   2 +-
 .../fourthedition/CircleOfProtectionBlue.java |   2 +-
 .../CircleOfProtectionGreen.java              |   2 +-
 .../fourthedition/CircleOfProtectionRed.java  |   2 +-
 .../CircleOfProtectionWhite.java              |   2 +-
 .../mage/sets/fourthedition/ClayStatue.java   |   2 +-
 .../sets/fourthedition/ClockworkBeast.java    |   2 +-
 .../mage/sets/fourthedition/Cockatrice.java   |   2 +-
 .../sets/fourthedition/ColossusOfSardia.java  |   2 +-
 .../mage/sets/fourthedition/Conservator.java  |   2 +-
 .../mage/sets/fourthedition/ControlMagic.java |   2 +-
 .../mage/sets/fourthedition/Conversion.java   |   2 +-
 .../mage/sets/fourthedition/CoralHelm.java    |   2 +-
 .../mage/sets/fourthedition/CosmicHorror.java |   2 +-
 .../mage/sets/fourthedition/Counterspell.java |   2 +-
 .../src/mage/sets/fourthedition/CrawWurm.java |   2 +-
 .../sets/fourthedition/CrimsonManticore.java  |   2 +-
 .../src/mage/sets/fourthedition/Crumble.java  |   2 +-
 .../src/mage/sets/fourthedition/Crusade.java  |   2 +-
 .../mage/sets/fourthedition/CrystalRod.java   |   2 +-
 .../mage/sets/fourthedition/CursedRack.java   |   2 +-
 .../sets/fourthedition/DancingScimitar.java   |   2 +-
 .../mage/sets/fourthedition/DarkRitual.java   |   2 +-
 .../mage/sets/fourthedition/DeathWard.java    |   2 +-
 .../mage/sets/fourthedition/Deathgrip.java    |   2 +-
 .../mage/sets/fourthedition/Deathlace.java    |   2 +-
 .../sets/fourthedition/DesertTwister.java     |   2 +-
 .../src/mage/sets/fourthedition/Detonate.java |   2 +-
 .../mage/sets/fourthedition/DingusEgg.java    |   2 +-
 .../mage/sets/fourthedition/Disenchant.java   |   2 +-
 .../mage/sets/fourthedition/Disintegrate.java |   2 +-
 .../sets/fourthedition/DisruptingScepter.java |   2 +-
 .../fourthedition/DivineTransformation.java   |   2 +-
 .../mage/sets/fourthedition/DragonEngine.java |   2 +-
 .../mage/sets/fourthedition/DragonWhelp.java  |   2 +-
 .../mage/sets/fourthedition/DrainLife.java    |   2 +-
 .../sets/fourthedition/DrudgeSkeletons.java   |   2 +-
 .../sets/fourthedition/DurkwoodBoars.java     |   2 +-
 .../sets/fourthedition/DwarvenWarriors.java   |   2 +-
 .../sets/fourthedition/EarthElemental.java    |   2 +-
 .../mage/sets/fourthedition/Earthquake.java   |   2 +-
 .../src/mage/sets/fourthedition/ElHajjaj.java |   2 +-
 .../mage/sets/fourthedition/ElvenRiders.java  |   2 +-
 .../sets/fourthedition/ElvishArchers.java     |   2 +-
 .../mage/sets/fourthedition/EnergyFlux.java   |   2 +-
 .../mage/sets/fourthedition/EnergyTap.java    |   2 +-
 .../sets/fourthedition/EternalWarrior.java    |   2 +-
 .../mage/sets/fourthedition/EvilPresence.java |   2 +-
 .../mage/sets/fourthedition/EyeForAnEye.java  |   2 +-
 .../src/mage/sets/fourthedition/Fear.java     |   2 +-
 .../src/mage/sets/fourthedition/Feedback.java |   2 +-
 .../mage/sets/fourthedition/FellwarStone.java |   2 +-
 .../sets/fourthedition/FireElemental.java     |   2 +-
 .../src/mage/sets/fourthedition/Fireball.java |   2 +-
 .../sets/fourthedition/Firebreathing.java     |   2 +-
 .../src/mage/sets/fourthedition/Fissure.java  |   2 +-
 .../mage/sets/fourthedition/Flashfires.java   |   2 +-
 .../src/mage/sets/fourthedition/Flight.java   |   2 +-
 .../mage/sets/fourthedition/FlyingCarpet.java |   2 +-
 .../src/mage/sets/fourthedition/Fog.java      |   2 +-
 .../mage/sets/fourthedition/FrozenShade.java  |   2 +-
 .../mage/sets/fourthedition/Fungusaur.java    |   2 +-
 .../mage/sets/fourthedition/GaseousForm.java  |   2 +-
 .../mage/sets/fourthedition/GhostShip.java    |   2 +-
 .../mage/sets/fourthedition/GiantGrowth.java  |   2 +-
 .../mage/sets/fourthedition/GiantSpider.java  |   2 +-
 .../sets/fourthedition/GiantStrength.java     |   2 +-
 .../sets/fourthedition/GlassesOfUrza.java     |   2 +-
 .../src/mage/sets/fourthedition/Gloom.java    |   2 +-
 .../fourthedition/GoblinBalloonBrigade.java   |   2 +-
 .../mage/sets/fourthedition/GoblinKing.java   |   2 +-
 .../sets/fourthedition/GrapeshotCatapult.java |   2 +-
 .../src/mage/sets/fourthedition/Greed.java    |   2 +-
 .../mage/sets/fourthedition/GreenWard.java    |   2 +-
 .../mage/sets/fourthedition/GrizzlyBears.java |   2 +-
 .../mage/sets/fourthedition/HealingSalve.java |   2 +-
 .../mage/sets/fourthedition/HillGiant.java    |   2 +-
 .../mage/sets/fourthedition/HolyStrength.java |   2 +-
 .../sets/fourthedition/HowlFromBeyond.java    |   2 +-
 .../mage/sets/fourthedition/HowlingMine.java  |   2 +-
 .../sets/fourthedition/HurkylsRecall.java     |   2 +-
 .../sets/fourthedition/HurloonMinotaur.java   |   2 +-
 .../mage/sets/fourthedition/HurrJackal.java   |   2 +-
 .../mage/sets/fourthedition/Hurricane.java    |   2 +-
 .../sets/fourthedition/HypnoticSpecter.java   |   2 +-
 .../src/mage/sets/fourthedition/Inferno.java  |   2 +-
 .../sets/fourthedition/InstillEnergy.java     |   2 +-
 .../src/mage/sets/fourthedition/IronStar.java |   2 +-
 .../mage/sets/fourthedition/IronclawOrcs.java |   2 +-
 .../sets/fourthedition/IronrootTreefolk.java  |   2 +-
 .../sets/fourthedition/IslandSanctuary.java   |   2 +-
 .../src/mage/sets/fourthedition/IvoryCup.java |   2 +-
 .../mage/sets/fourthedition/IvoryTower.java   |   2 +-
 .../mage/sets/fourthedition/JadeMonolith.java |   2 +-
 .../sets/fourthedition/JandorsSaddlebags.java |   2 +-
 .../mage/sets/fourthedition/JayemdaeTome.java |   2 +-
 .../src/mage/sets/fourthedition/Jump.java     |   2 +-
 .../src/mage/sets/fourthedition/Karma.java    |   2 +-
 .../sets/fourthedition/KeldonWarlord.java     |   2 +-
 .../mage/sets/fourthedition/KillerBees.java   |   2 +-
 .../src/mage/sets/fourthedition/Kismet.java   |   2 +-
 .../mage/sets/fourthedition/KormusBell.java   |   2 +-
 .../src/mage/sets/fourthedition/LandTax.java  |   2 +-
 .../src/mage/sets/fourthedition/LeyDruid.java |   2 +-
 .../sets/fourthedition/LibraryOfLeng.java     |   2 +-
 .../mage/sets/fourthedition/Lifeforce.java    |   2 +-
 .../src/mage/sets/fourthedition/Lifelace.java |   2 +-
 .../src/mage/sets/fourthedition/Lifetap.java  |   2 +-
 .../sets/fourthedition/LightningBolt.java     |   2 +-
 .../sets/fourthedition/LivingArtifact.java    |   2 +-
 .../mage/sets/fourthedition/LivingLands.java  |   2 +-
 .../sets/fourthedition/LlanowarElves.java     |   2 +-
 .../sets/fourthedition/LordOfAtlantis.java    |   2 +-
 .../mage/sets/fourthedition/LordOfThePit.java |   2 +-
 .../src/mage/sets/fourthedition/LostSoul.java |   2 +-
 .../src/mage/sets/fourthedition/Lure.java     |   2 +-
 .../sets/fourthedition/MagneticMountain.java  |   2 +-
 .../sets/fourthedition/MahamotiDjinn.java     |   2 +-
 .../mage/sets/fourthedition/ManaShort.java    |   2 +-
 .../mage/sets/fourthedition/ManaVault.java    |   2 +-
 .../mage/sets/fourthedition/Manabarbs.java    |   2 +-
 .../src/mage/sets/fourthedition/MarshGas.java |   2 +-
 .../mage/sets/fourthedition/MarshViper.java   |   2 +-
 .../mage/sets/fourthedition/Meekstone.java    |   2 +-
 .../MerfolkOfThePearlTrident.java             |   2 +-
 .../mage/sets/fourthedition/Millstone.java    |   2 +-
 .../mage/sets/fourthedition/MindTwist.java    |   2 +-
 .../sets/fourthedition/MishrasFactory.java    |   2 +-
 .../fourthedition/MonssGoblinRaiders.java     |   2 +-
 .../mage/sets/fourthedition/MurkDwellers.java |   2 +-
 .../src/mage/sets/fourthedition/NafsAsp.java  |   2 +-
 .../mage/sets/fourthedition/NetherShadow.java |   2 +-
 .../sets/fourthedition/NevinyrralsDisk.java   |   2 +-
 .../mage/sets/fourthedition/Nightmare.java    |   2 +-
 .../sets/fourthedition/NorthernPaladin.java   |   2 +-
 .../sets/fourthedition/ObsianusGolem.java     |   2 +-
 .../src/mage/sets/fourthedition/Onulet.java   |   2 +-
 .../sets/fourthedition/OrcishArtillery.java   |   2 +-
 .../sets/fourthedition/OrcishOriflamme.java   |   2 +-
 .../mage/sets/fourthedition/Ornithopter.java  |   2 +-
 .../mage/sets/fourthedition/OsaiVultures.java |   2 +-
 .../src/mage/sets/fourthedition/Paralyze.java |   2 +-
 .../sets/fourthedition/PearledUnicorn.java    |   2 +-
 .../mage/sets/fourthedition/Pestilence.java   |   2 +-
 .../sets/fourthedition/PhantasmalTerrain.java |   2 +-
 .../sets/fourthedition/PhantomMonster.java    |   2 +-
 .../src/mage/sets/fourthedition/Piety.java    |   2 +-
 .../mage/sets/fourthedition/PirateShip.java   |   2 +-
 .../mage/sets/fourthedition/PitScorpion.java  |   2 +-
 .../mage/sets/fourthedition/PlagueRats.java   |   2 +-
 .../mage/sets/fourthedition/PowerSink.java    |   2 +-
 .../sets/fourthedition/PradeshGypsies.java    |   2 +-
 .../mage/sets/fourthedition/PrimalClay.java   |   2 +-
 .../sets/fourthedition/ProdigalSorcerer.java  |   2 +-
 .../mage/sets/fourthedition/PsychicVenom.java |   2 +-
 .../src/mage/sets/fourthedition/Purelace.java |   2 +-
 .../mage/sets/fourthedition/Pyrotechnics.java |   2 +-
 .../mage/sets/fourthedition/RadjanSpirit.java |   2 +-
 .../src/mage/sets/fourthedition/RagMan.java   |   2 +-
 .../mage/sets/fourthedition/RaiseDead.java    |   2 +-
 .../sets/fourthedition/RedElementalBlast.java |   2 +-
 .../src/mage/sets/fourthedition/RedWard.java  |   2 +-
 .../mage/sets/fourthedition/Regeneration.java |   2 +-
 .../sets/fourthedition/ReverseDamage.java     |   2 +-
 .../sets/fourthedition/Righteousness.java     |   2 +-
 .../mage/sets/fourthedition/RodOfRuin.java    |   2 +-
 .../sets/fourthedition/RoyalAssassin.java     |   2 +-
 .../mage/sets/fourthedition/SamiteHealer.java |   2 +-
 .../sets/fourthedition/SavannahLions.java     |   2 +-
 .../sets/fourthedition/ScatheZombies.java     |   2 +-
 .../sets/fourthedition/ScavengingGhoul.java   |   2 +-
 .../mage/sets/fourthedition/ScrybSprites.java |   2 +-
 .../mage/sets/fourthedition/SeaSerpent.java   |   2 +-
 .../sets/fourthedition/SegovianLeviathan.java |   2 +-
 .../sets/fourthedition/SengirVampire.java     |   2 +-
 .../mage/sets/fourthedition/SerraAngel.java   |   2 +-
 .../sets/fourthedition/ShanodinDryads.java    |   2 +-
 .../mage/sets/fourthedition/Shapeshifter.java |   2 +-
 .../src/mage/sets/fourthedition/Shatter.java  |   2 +-
 .../mage/sets/fourthedition/ShivanDragon.java |   2 +-
 .../src/mage/sets/fourthedition/Smoke.java    |   2 +-
 .../sets/fourthedition/SorceressQueen.java    |   2 +-
 .../src/mage/sets/fourthedition/SoulNet.java  |   2 +-
 .../mage/sets/fourthedition/SpellBlast.java   |   2 +-
 .../mage/sets/fourthedition/SpiritLink.java   |   2 +-
 .../src/mage/sets/fourthedition/Stasis.java   |   2 +-
 .../sets/fourthedition/StealArtifact.java     |   2 +-
 .../mage/sets/fourthedition/StoneGiant.java   |   2 +-
 .../mage/sets/fourthedition/StoneRain.java    |   2 +-
 .../mage/sets/fourthedition/StreamOfLife.java |   2 +-
 .../sets/fourthedition/SunglassesOfUrza.java  |   2 +-
 .../mage/sets/fourthedition/SunkenCity.java   |   2 +-
 .../sets/fourthedition/SylvanLibrary.java     |   2 +-
 .../mage/sets/fourthedition/TawnossWand.java  |   2 +-
 .../sets/fourthedition/TawnossWeaponry.java   |   2 +-
 .../src/mage/sets/fourthedition/Terror.java   |   2 +-
 .../src/mage/sets/fourthedition/Tetravus.java |   2 +-
 .../src/mage/sets/fourthedition/TheHive.java  |   2 +-
 .../sets/fourthedition/ThicketBasilisk.java   |   2 +-
 .../mage/sets/fourthedition/Thoughtlace.java  |   2 +-
 .../mage/sets/fourthedition/ThroneOfBone.java |   2 +-
 .../mage/sets/fourthedition/Tranquility.java  |   2 +-
 .../mage/sets/fourthedition/Triskelion.java   |   2 +-
 .../mage/sets/fourthedition/TundraWolves.java |   2 +-
 .../src/mage/sets/fourthedition/Tunnel.java   |   2 +-
 .../src/mage/sets/fourthedition/Twiddle.java  |   2 +-
 .../mage/sets/fourthedition/UncleIstvan.java  |   2 +-
 .../sets/fourthedition/UnholyStrength.java    |   2 +-
 .../sets/fourthedition/UnstableMutation.java  |   2 +-
 .../src/mage/sets/fourthedition/Unsummon.java |   2 +-
 .../mage/sets/fourthedition/UntamedWilds.java |   2 +-
 .../mage/sets/fourthedition/UthdenTroll.java  |   2 +-
 .../mage/sets/fourthedition/VampireBats.java  |   2 +-
 .../src/mage/sets/fourthedition/Venom.java    |   2 +-
 .../fourthedition/VerduranEnchantress.java    |   2 +-
 .../sets/fourthedition/VolcanicEruption.java  |   2 +-
 .../mage/sets/fourthedition/WallOfAir.java    |   2 +-
 .../mage/sets/fourthedition/WallOfBone.java   |   2 +-
 .../sets/fourthedition/WallOfBrambles.java    |   2 +-
 .../mage/sets/fourthedition/WallOfFire.java   |   2 +-
 .../mage/sets/fourthedition/WallOfSpears.java |   2 +-
 .../mage/sets/fourthedition/WallOfStone.java  |   2 +-
 .../mage/sets/fourthedition/WallOfSwords.java |   2 +-
 .../mage/sets/fourthedition/WallOfWater.java  |   2 +-
 .../mage/sets/fourthedition/WallOfWood.java   |   2 +-
 .../mage/sets/fourthedition/Wanderlust.java   |   2 +-
 .../mage/sets/fourthedition/WarMammoth.java   |   2 +-
 .../mage/sets/fourthedition/WarpArtifact.java |   2 +-
 .../src/mage/sets/fourthedition/Weakness.java |   2 +-
 .../src/mage/sets/fourthedition/Web.java      |   2 +-
 .../sets/fourthedition/WhirlingDervish.java   |   2 +-
 .../mage/sets/fourthedition/WhiteKnight.java  |   2 +-
 .../mage/sets/fourthedition/WhiteWard.java    |   2 +-
 .../mage/sets/fourthedition/WildGrowth.java   |   2 +-
 .../mage/sets/fourthedition/WillOTheWisp.java |   2 +-
 .../sets/fourthedition/WindsOfChange.java     |   2 +-
 .../mage/sets/fourthedition/WinterOrb.java    |   2 +-
 .../mage/sets/fourthedition/WoodenSphere.java |   2 +-
 .../mage/sets/fourthedition/WrathOfGod.java   |   2 +-
 .../sets/fourthedition/XenicPoltergeist.java  |   2 +-
 .../sets/fourthedition/YotianSoldier.java     |   2 +-
 .../mage/sets/fourthedition/ZephyrFalcon.java |   2 +-
 .../mage/sets/fourthedition/ZombieMaster.java |   2 +-
 .../fridaynightmagic/AbzanBeastmaster.java    |   2 +-
 .../AccumulatedKnowledge.java                 |   2 +-
 .../sets/fridaynightmagic/AcidicSlime.java    |   2 +-
 .../sets/fridaynightmagic/AlbinoTroll.java    |   2 +-
 .../sets/fridaynightmagic/Anathemancer.java   |   2 +-
 .../sets/fridaynightmagic/AncientGrudge.java  |   2 +-
 .../fridaynightmagic/AncientZiggurat.java     |   2 +-
 .../sets/fridaynightmagic/Anticipate.java     |   2 +-
 .../sets/fridaynightmagic/ArmadilloCloak.java |   2 +-
 .../sets/fridaynightmagic/ArrogantWurm.java   |   2 +-
 .../fridaynightmagic/ArtisanOfKozilek.java    |   2 +-
 .../sets/fridaynightmagic/AstralSlide.java    |   2 +-
 .../sets/fridaynightmagic/AuraOfSilence.java  |   2 +-
 .../sets/fridaynightmagic/AvacynsPilgrim.java |   2 +-
 .../fridaynightmagic/AvalancheRiders.java     |   2 +-
 .../sets/fridaynightmagic/BanisherPriest.java |   2 +-
 .../sets/fridaynightmagic/BanishingLight.java |   2 +-
 .../fridaynightmagic/BaskingRootwalla.java    |   2 +-
 .../sets/fridaynightmagic/BileBlight.java     |   2 +-
 .../sets/fridaynightmagic/BlackKnight.java    |   2 +-
 .../sets/fridaynightmagic/Blastoderm.java     |   2 +-
 .../sets/fridaynightmagic/BlightedFen.java    |   2 +-
 .../sets/fridaynightmagic/BloodbraidElf.java  |   2 +-
 .../sets/fridaynightmagic/BottleGnomes.java   |   2 +-
 .../sets/fridaynightmagic/BrainMaggot.java    |   2 +-
 .../sets/fridaynightmagic/Brainstorm.java     |   2 +-
 .../mage/sets/fridaynightmagic/Browbeat.java  |   2 +-
 .../sets/fridaynightmagic/CabalCoffers.java   |   2 +-
 .../sets/fridaynightmagic/CabalTherapy.java   |   2 +-
 .../fridaynightmagic/CallOfTheConclave.java   |   2 +-
 .../mage/sets/fridaynightmagic/Capsize.java   |   2 +-
 .../sets/fridaynightmagic/Carnophage.java     |   2 +-
 .../sets/fridaynightmagic/CarrionFeeder.java  |   2 +-
 .../sets/fridaynightmagic/ChainersEdict.java  |   2 +-
 .../CircleOfProtectionRed.java                |   2 +-
 .../sets/fridaynightmagic/CircularLogic.java  |   2 +-
 .../sets/fridaynightmagic/ClashOfWills.java   |   2 +-
 .../mage/sets/fridaynightmagic/Cloudpost.java |   2 +-
 .../sets/fridaynightmagic/ContagionClasp.java |   2 +-
 .../sets/fridaynightmagic/Counterspell.java   |   2 +-
 .../fridaynightmagic/CrumblingVestige.java    |   2 +-
 .../fridaynightmagic/CrystallineSliver.java   |   2 +-
 .../mage/sets/fridaynightmagic/Cultivate.java |   2 +-
 .../sets/fridaynightmagic/DeepAnalysis.java   |   2 +-
 .../mage/sets/fridaynightmagic/Desert.java    |   2 +-
 .../mage/sets/fridaynightmagic/Despise.java   |   2 +-
 .../sets/fridaynightmagic/DimirCharm.java     |   2 +-
 .../fridaynightmagic/DisdainfulStroke.java    |   2 +-
 .../sets/fridaynightmagic/Disenchant.java     |   2 +-
 .../mage/sets/fridaynightmagic/Dismember.java |   2 +-
 .../mage/sets/fridaynightmagic/Dissipate.java |   2 +-
 .../mage/sets/fridaynightmagic/Dissolve.java  |   2 +-
 .../mage/sets/fridaynightmagic/DrainLife.java |   2 +-
 .../mage/sets/fridaynightmagic/Duress.java    |   2 +-
 .../fridaynightmagic/ElvesOfDeepShadow.java   |   2 +-
 .../sets/fridaynightmagic/ElvishMystic.java   |   2 +-
 .../fridaynightmagic/ElvishVisionary.java     |   2 +-
 .../fridaynightmagic/EncroachingWastes.java   |   2 +-
 .../fridaynightmagic/EngineeredPlague.java    |   2 +-
 .../sets/fridaynightmagic/EternalWitness.java |   2 +-
 .../fridaynightmagic/EverflowingChalice.java  |   2 +-
 .../sets/fridaynightmagic/EvolvingWilds.java  |   2 +-
 .../sets/fridaynightmagic/ExperimentOne.java  |   2 +-
 .../sets/fridaynightmagic/FactOrFiction.java  |   2 +-
 .../fridaynightmagic/FanaticOfXenagos.java    |   2 +-
 .../mage/sets/fridaynightmagic/Farseek.java   |   2 +-
 .../mage/sets/fridaynightmagic/FireIce.java   |   2 +-
 .../mage/sets/fridaynightmagic/Fireblast.java |   2 +-
 .../mage/sets/fridaynightmagic/Firebolt.java  |   2 +-
 .../sets/fridaynightmagic/Fireslinger.java    |   2 +-
 .../fridaynightmagic/FlametongueKavu.java     |   2 +-
 .../fridaynightmagic/FlayingTendrils.java     |   2 +-
 .../mage/sets/fridaynightmagic/Forbid.java    |   2 +-
 .../fridaynightmagic/ForbiddenAlchemy.java    |   2 +-
 .../sets/fridaynightmagic/ForceSpike.java     |   2 +-
 .../sets/fridaynightmagic/FrenziedGoblin.java |   2 +-
 .../sets/fridaynightmagic/FrostWalker.java    |   2 +-
 .../fridaynightmagic/GatekeeperOfMalakir.java |   2 +-
 .../fridaynightmagic/GerrardsVerdict.java     |   2 +-
 .../fridaynightmagic/GhorClanRampager.java    |   2 +-
 .../sets/fridaynightmagic/GhostlyPrison.java  |   2 +-
 .../sets/fridaynightmagic/GiantGrowth.java    |   2 +-
 .../sets/fridaynightmagic/GitaxianProbe.java  |   2 +-
 .../sets/fridaynightmagic/GlistenerElf.java   |   2 +-
 .../sets/fridaynightmagic/GoForTheThroat.java |   2 +-
 .../fridaynightmagic/GoblinBombardment.java   |   2 +-
 .../fridaynightmagic/GoblinLegionnaire.java   |   2 +-
 .../fridaynightmagic/GoblinRingleader.java    |   2 +-
 .../fridaynightmagic/GoblinWarchief1.java     |   2 +-
 .../fridaynightmagic/GoblinWarchief2.java     |   2 +-
 .../sets/fridaynightmagic/GrislySalvage.java  |   2 +-
 .../fridaynightmagic/HordelingOutburst.java   |   2 +-
 .../sets/fridaynightmagic/IcyManipulator.java |   2 +-
 .../mage/sets/fridaynightmagic/Impulse.java   |   2 +-
 .../fridaynightmagic/IsochronScepter.java     |   2 +-
 .../sets/fridaynightmagic/IzzetCharm.java     |   2 +-
 .../sets/fridaynightmagic/JacesIngenuity.java |   2 +-
 .../mage/sets/fridaynightmagic/JackalPup.java |   2 +-
 .../sets/fridaynightmagic/JudgesFamiliar.java |   2 +-
 .../sets/fridaynightmagic/Juggernaut.java     |   2 +-
 .../mage/sets/fridaynightmagic/KirdApe.java   |   2 +-
 .../sets/fridaynightmagic/KitchenFinks.java   |   2 +-
 .../sets/fridaynightmagic/KrosanGrip.java     |   2 +-
 .../sets/fridaynightmagic/KrosanTusker.java   |   2 +-
 .../sets/fridaynightmagic/KrosanWarchief.java |   2 +-
 .../mage/sets/fridaynightmagic/LifeDeath.java |   2 +-
 .../fridaynightmagic/LightningGreaves.java    |   2 +-
 .../sets/fridaynightmagic/LightningRift.java  |   2 +-
 .../sets/fridaynightmagic/LingeringSouls.java |   2 +-
 .../sets/fridaynightmagic/LlanowarElves.java  |   2 +-
 .../mage/sets/fridaynightmagic/Lobotomy.java  |   2 +-
 .../sets/fridaynightmagic/LongbowArcher.java  |   2 +-
 .../mage/sets/fridaynightmagic/MagmaJet.java  |   2 +-
 .../sets/fridaynightmagic/MagmaSpray.java     |   2 +-
 .../sets/fridaynightmagic/MerrowReejerey.java |   2 +-
 .../mage/sets/fridaynightmagic/MindWarp.java  |   2 +-
 .../sets/fridaynightmagic/MoggFanatic.java    |   2 +-
 .../sets/fridaynightmagic/MotherOfRunes.java  |   2 +-
 .../sets/fridaynightmagic/Mulldrifter.java    |   2 +-
 .../fridaynightmagic/MurderousRedcap.java     |   2 +-
 .../sets/fridaynightmagic/MuscleSliver.java   |   2 +-
 .../sets/fridaynightmagic/MyrEnforcer.java    |   2 +-
 .../fridaynightmagic/NissasPilgrimage.java    |   2 +-
 .../sets/fridaynightmagic/OblivionRing.java   |   2 +-
 .../mage/sets/fridaynightmagic/Ophidian.java  |   2 +-
 .../sets/fridaynightmagic/OratorOfOjutai.java |   2 +-
 .../sets/fridaynightmagic/PathToExile.java    |   2 +-
 .../sets/fridaynightmagic/Pendelhaven.java    |   2 +-
 .../sets/fridaynightmagic/PillarOfFlame.java  |   2 +-
 .../fridaynightmagic/PriestOfTitania.java     |   2 +-
 .../fridaynightmagic/ProdigalSorcerer.java    |   2 +-
 .../fridaynightmagic/QasaliPridemage.java     |   2 +-
 .../sets/fridaynightmagic/QuirionRanger.java  |   2 +-
 .../sets/fridaynightmagic/RakdosCackler.java  |   2 +-
 .../mage/sets/fridaynightmagic/Rancor.java    |   2 +-
 .../mage/sets/fridaynightmagic/Reanimate.java |   2 +-
 .../sets/fridaynightmagic/ReliquaryTower.java |   2 +-
 .../mage/sets/fridaynightmagic/Remand.java    |   2 +-
 .../sets/fridaynightmagic/Resurrection.java   |   2 +-
 .../sets/fridaynightmagic/RhoxWarMonk.java    |   2 +-
 .../mage/sets/fridaynightmagic/RiftBolt.java  |   2 +-
 .../mage/sets/fridaynightmagic/RiverBoa.java  |   2 +-
 .../sets/fridaynightmagic/RoarOfTheWurm.java  |   2 +-
 .../src/mage/sets/fridaynightmagic/Roast.java |   2 +-
 .../fridaynightmagic/SakuraTribeElder.java    |   2 +-
 .../sets/fridaynightmagic/SavageLands.java    |   2 +-
 .../mage/sets/fridaynightmagic/Scragnoth.java |   2 +-
 .../fridaynightmagic/SealOfCleansing.java     |   2 +-
 .../sets/fridaynightmagic/SearingSpear.java   |   2 +-
 .../sets/fridaynightmagic/SerratedArrows.java |   2 +-
 .../sets/fridaynightmagic/SerumVisions.java   |   2 +-
 .../src/mage/sets/fridaynightmagic/Shock.java |   2 +-
 .../sets/fridaynightmagic/ShrapnelBlast.java  |   2 +-
 .../sets/fridaynightmagic/SilverKnight.java   |   2 +-
 .../sets/fridaynightmagic/SinCollector.java   |   2 +-
 .../sets/fridaynightmagic/SliceAndDice.java   |   2 +-
 .../fridaynightmagic/SmashToSmithereens.java  |   2 +-
 .../mage/sets/fridaynightmagic/Smother.java   |   2 +-
 .../sets/fridaynightmagic/SoltariPriest.java  |   2 +-
 .../sets/fridaynightmagic/Sparksmith.java     |   2 +-
 .../fridaynightmagic/SpatialContortion.java   |   2 +-
 .../fridaynightmagic/SpellstutterSprite.java  |   2 +-
 .../sets/fridaynightmagic/SpikeFeeder.java    |   2 +-
 .../sets/fridaynightmagic/SquadronHawk.java   |   2 +-
 .../fridaynightmagic/StaunchDefenders.java    |   2 +-
 .../sets/fridaynightmagic/StokeTheFlames.java |   2 +-
 .../mage/sets/fridaynightmagic/StoneRain.java |   2 +-
 .../fridaynightmagic/SuspensionField.java     |   2 +-
 .../fridaynightmagic/SwordsToPlowshares.java  |   2 +-
 .../sets/fridaynightmagic/SylvanScrying.java  |   2 +-
 .../sets/fridaynightmagic/TectonicEdge.java   |   2 +-
 .../sets/fridaynightmagic/TeeteringPeaks.java |   2 +-
 .../fridaynightmagic/TendrilsOfAgony.java     |   2 +-
 .../mage/sets/fridaynightmagic/Terminate.java |   2 +-
 .../mage/sets/fridaynightmagic/Terror.java    |   2 +-
 .../fridaynightmagic/ThirstForKnowledge.java  |   2 +-
 .../fridaynightmagic/TidehollowSculler.java   |   2 +-
 .../sets/fridaynightmagic/TormentedHero.java  |   2 +-
 .../sets/fridaynightmagic/TormodsCrypt.java   |   2 +-
 .../sets/fridaynightmagic/TreetopVillage.java |   2 +-
 .../sets/fridaynightmagic/UltimatePrice.java  |   2 +-
 .../sets/fridaynightmagic/VolcanicGeyser.java |   2 +-
 .../sets/fridaynightmagic/WallOfBlossoms.java |   2 +-
 .../sets/fridaynightmagic/WallOfOmens.java    |   2 +-
 .../sets/fridaynightmagic/WallOfRoots.java    |   2 +-
 .../fridaynightmagic/WarleadersHelix.java     |   2 +-
 .../mage/sets/fridaynightmagic/Watchwolf.java |   2 +-
 .../sets/fridaynightmagic/Whipcorder.java     |   2 +-
 .../sets/fridaynightmagic/WhiteKnight.java    |   2 +-
 .../sets/fridaynightmagic/WildMongrel.java    |   2 +-
 .../sets/fridaynightmagic/WildNacatl.java     |   2 +-
 .../sets/fridaynightmagic/Willbender.java     |   2 +-
 .../sets/fridaynightmagic/WingShards.java     |   2 +-
 .../sets/fridaynightmagic/WitheredWretch.java |   2 +-
 .../mage/sets/fridaynightmagic/Wonder.java    |   2 +-
 .../fridaynightmagic/WrensRunVanquisher.java  |   2 +-
 .../sets/ftvangels/AkromaAngelOfFury.java     |   2 +-
 .../sets/ftvangels/AkromaAngelOfWrath.java    |   2 +-
 .../sets/ftvangels/AureliaTheWarleader.java   |   2 +-
 .../sets/ftvangels/AvacynAngelOfHope.java     |   2 +-
 .../mage/sets/ftvangels/BaneslayerAngel.java  |   2 +-
 .../mage/sets/ftvangels/EntreatTheAngels.java |   2 +-
 .../src/mage/sets/ftvangels/ExaltedAngel.java |   2 +-
 .../sets/ftvangels/IonaShieldOfEmeria.java    |   2 +-
 .../mage/sets/ftvangels/IridescentAngel.java  |   2 +-
 .../mage/sets/ftvangels/JenaraAsuraOfWar.java |   2 +-
 .../mage/sets/ftvangels/LightningAngel.java   |   2 +-
 .../mage/sets/ftvangels/PlatinumAngel.java    |   2 +-
 .../src/mage/sets/ftvangels/SerraAngel.java   |   2 +-
 .../sets/ftvangels/TarielReckonerOfSouls.java |   2 +-
 .../mage/sets/ftvannihilation/Armageddon.java |   2 +-
 .../sets/ftvannihilation/BurningOfXinye.java  |   2 +-
 .../mage/sets/ftvannihilation/Cataclysm.java  |   2 +-
 .../sets/ftvannihilation/ChildOfAlara.java    |   2 +-
 .../ftvannihilation/DecreeOfAnnihilation.java |   2 +-
 .../mage/sets/ftvannihilation/Firespout.java  |   2 +-
 .../sets/ftvannihilation/FracturingGust.java  |   2 +-
 .../sets/ftvannihilation/LivingDeath.java     |   2 +-
 .../sets/ftvannihilation/MartialCoup.java     |   2 +-
 .../ftvannihilation/RollingEarthquake.java    |   2 +-
 .../mage/sets/ftvannihilation/Smokestack.java |   2 +-
 .../mage/sets/ftvannihilation/Terminus.java   |   2 +-
 .../mage/sets/ftvannihilation/Upheaval.java   |   2 +-
 .../sets/ftvannihilation/VirtuesRuin.java     |   2 +-
 .../mage/sets/ftvannihilation/WrathOfGod.java |   2 +-
 .../sets/ftvdragons/BladewingTheRisen.java    |   2 +-
 .../sets/ftvdragons/BogardanHellkite.java     |   2 +-
 .../src/mage/sets/ftvdragons/DragonWhelp.java |   2 +-
 .../src/mage/sets/ftvdragons/Dragonstorm.java |   2 +-
 .../mage/sets/ftvdragons/FormOfTheDragon.java |   2 +-
 .../sets/ftvdragons/HellkiteOverlord.java     |   2 +-
 .../ftvdragons/KokushoTheEveningStar.java     |   2 +-
 .../src/mage/sets/ftvdragons/NicolBolas.java  |   2 +-
 .../sets/ftvdragons/NivMizzetTheFiremind.java |   2 +-
 .../mage/sets/ftvdragons/RithTheAwakener.java |   2 +-
 .../mage/sets/ftvdragons/ShivanDragon.java    |   2 +-
 .../mage/sets/ftvdragons/ThunderDragon.java   |   2 +-
 .../mage/sets/ftvdragons/TwoHeadedDragon.java |   2 +-
 .../src/mage/sets/ftvexiled/Balance.java      |   2 +-
 .../src/mage/sets/ftvexiled/Berserk.java      |   2 +-
 .../src/mage/sets/ftvexiled/Channel.java      |   2 +-
 .../src/mage/sets/ftvexiled/GiftsUngiven.java |   2 +-
 .../src/mage/sets/ftvexiled/GoblinLackey.java |   2 +-
 .../src/mage/sets/ftvexiled/KirdApe.java      |   2 +-
 .../src/mage/sets/ftvexiled/LotusPetal.java   |   2 +-
 .../mage/sets/ftvexiled/MysticalTutor.java    |   2 +-
 .../src/mage/sets/ftvexiled/Necropotence.java |   2 +-
 .../sets/ftvexiled/SenseisDiviningTop.java    |   2 +-
 .../mage/sets/ftvexiled/SerendibEfreet.java   |   2 +-
 .../src/mage/sets/ftvexiled/Skullclamp.java   |   2 +-
 .../src/mage/sets/ftvexiled/StripMine.java    |   2 +-
 Mage.Sets/src/mage/sets/ftvexiled/Tinker.java |   2 +-
 .../src/mage/sets/ftvexiled/Trinisphere.java  |   2 +-
 .../mage/sets/ftvlegends/CaoCaoLordOfWei.java |   2 +-
 .../mage/sets/ftvlegends/CaptainSisay.java    |   2 +-
 .../sets/ftvlegends/DoranTheSiegeTower.java   |   2 +-
 .../ftvlegends/KikiJikiMirrorBreaker.java     |   2 +-
 .../sets/ftvlegends/KreshTheBloodbraided.java |   2 +-
 .../sets/ftvlegends/MikaeusTheLunarch.java    |   2 +-
 .../sets/ftvlegends/OmnathLocusOfMana.java    |   2 +-
 .../sets/ftvlegends/OonaQueenOfTheFae.java    |   2 +-
 .../src/mage/sets/ftvlegends/Progenitus.java  |   2 +-
 .../mage/sets/ftvlegends/RafiqOfTheMany.java  |   2 +-
 .../sets/ftvlegends/SharuumTheHegemon.java    |   2 +-
 .../mage/sets/ftvlegends/SunQuanLordOfWu.java |   2 +-
 .../sets/ftvlegends/TeferiMageOfZhalfir.java  |   2 +-
 .../ftvlegends/UlamogTheInfiniteGyre.java     |   2 +-
 .../sets/ftvlegends/VisaraTheDreadful.java    |   2 +-
 .../src/mage/sets/ftvrealms/AncientTomb.java  |   2 +-
 .../sets/ftvrealms/BoseijuWhoSheltersAll.java |   2 +-
 .../mage/sets/ftvrealms/CephalidColiseum.java |   2 +-
 Mage.Sets/src/mage/sets/ftvrealms/Desert.java |   2 +-
 .../src/mage/sets/ftvrealms/DryadArbor.java   |   2 +-
 .../mage/sets/ftvrealms/ForbiddenOrchard.java |   2 +-
 .../src/mage/sets/ftvrealms/GlacialChasm.java |   2 +-
 .../sets/ftvrealms/GroveOfTheBurnwillows.java |   2 +-
 .../src/mage/sets/ftvrealms/HighMarket.java   |   2 +-
 .../src/mage/sets/ftvrealms/MazeOfIth.java    |   2 +-
 .../mage/sets/ftvrealms/MurmuringBosk.java    |   2 +-
 .../src/mage/sets/ftvrealms/ShivanGorge.java  |   2 +-
 .../sets/ftvrealms/UrborgTombOfYawgmoth.java  |   2 +-
 Mage.Sets/src/mage/sets/ftvrealms/Vesuva.java |   2 +-
 .../mage/sets/ftvrealms/WindbriskHeights.java |   2 +-
 .../src/mage/sets/ftvrelics/AEtherVial.java   |   2 +-
 .../src/mage/sets/ftvrelics/BlackVise.java    |   2 +-
 .../mage/sets/ftvrelics/IsochronScepter.java  |   2 +-
 .../src/mage/sets/ftvrelics/IvoryTower.java   |   2 +-
 .../src/mage/sets/ftvrelics/JestersCap.java   |   2 +-
 .../mage/sets/ftvrelics/KarnSilverGolem.java  |   2 +-
 .../src/mage/sets/ftvrelics/Masticore.java    |   2 +-
 .../src/mage/sets/ftvrelics/MemoryJar.java    |   2 +-
 Mage.Sets/src/mage/sets/ftvrelics/Mirari.java |   2 +-
 .../src/mage/sets/ftvrelics/MoxDiamond.java   |   2 +-
 .../mage/sets/ftvrelics/NevinyrralsDisk.java  |   2 +-
 .../src/mage/sets/ftvrelics/SolRing.java      |   2 +-
 .../mage/sets/ftvrelics/SunderingTitan.java   |   2 +-
 .../sets/ftvrelics/SwordOfBodyAndMind.java    |   2 +-
 .../src/mage/sets/ftvrelics/ZuranOrb.java     |   2 +-
 .../mage/sets/ftvtwenty/AkromasVengeance.java |   2 +-
 .../mage/sets/ftvtwenty/ChainersEdict.java    |   2 +-
 .../sets/ftvtwenty/ChameleonColossus.java     |   2 +-
 Mage.Sets/src/mage/sets/ftvtwenty/Char.java   |   2 +-
 .../mage/sets/ftvtwenty/CruelUltimatum.java   |   2 +-
 .../src/mage/sets/ftvtwenty/DarkRitual.java   |   2 +-
 .../mage/sets/ftvtwenty/FactOrFiction.java    |   2 +-
 .../mage/sets/ftvtwenty/FyndhornElves.java    |   2 +-
 .../src/mage/sets/ftvtwenty/GildedLotus.java  |   2 +-
 .../mage/sets/ftvtwenty/GreenSunsZenith.java  |   2 +-
 .../mage/sets/ftvtwenty/HymnToTourach.java    |   2 +-
 .../src/mage/sets/ftvtwenty/Impulse.java      |   2 +-
 .../sets/ftvtwenty/InkEyesServantOfOni.java   |   2 +-
 .../sets/ftvtwenty/JaceTheMindSculptor.java   |   2 +-
 .../mage/sets/ftvtwenty/KessigWolfRun.java    |   2 +-
 .../sets/ftvtwenty/SwordsToPlowshares.java    |   2 +-
 .../src/mage/sets/ftvtwenty/TangleWire.java   |   2 +-
 .../src/mage/sets/ftvtwenty/ThranDynamo.java  |   2 +-
 .../sets/ftvtwenty/VenserShaperSavant.java    |   2 +-
 .../mage/sets/ftvtwenty/WallOfBlossoms.java   |   2 +-
 .../sets/futuresight/AkromasMemorial.java     |   2 +-
 .../sets/futuresight/AngelOfSalvation.java    |   2 +-
 .../sets/futuresight/BloodshotTrainee.java    |   2 +-
 .../sets/futuresight/BoldwyrIntimidator.java  |   2 +-
 .../mage/sets/futuresight/BoundInSilence.java |   2 +-
 .../mage/sets/futuresight/DeathRattle.java    |   2 +-
 .../mage/sets/futuresight/DeepcavernImp.java  |   2 +-
 .../mage/sets/futuresight/EdgeOfAutumn.java   |   2 +-
 .../sets/futuresight/EmberwildeAugur.java     |   2 +-
 .../mage/sets/futuresight/Epochrasite.java    |   2 +-
 .../src/mage/sets/futuresight/Foresee.java    |   2 +-
 .../src/mage/sets/futuresight/Ghostfire.java  |   2 +-
 .../mage/sets/futuresight/GravenCairns.java   |   2 +-
 .../mage/sets/futuresight/GrinningIgnus.java  |   2 +-
 .../mage/sets/futuresight/Imperiosaur.java    |   2 +-
 .../sets/futuresight/JhoiraOfTheGhitu.java    |   2 +-
 .../sets/futuresight/KeldonMegaliths.java     |   2 +-
 .../mage/sets/futuresight/LlanowarReborn.java |   2 +-
 .../src/mage/sets/futuresight/LogicKnot.java  |   2 +-
 .../sets/futuresight/MagusOfTheVineyard.java  |   2 +-
 .../mage/sets/futuresight/MassOfGhouls.java   |   2 +-
 .../sets/futuresight/MistmeadowSkulk.java     |   2 +-
 .../mage/sets/futuresight/MoltenDisaster.java |   2 +-
 .../sets/futuresight/PhosphorescentFeast.java |   2 +-
 .../sets/futuresight/PyromancersSwath.java    |   2 +-
 .../mage/sets/futuresight/QuietDisrepair.java |   2 +-
 .../sets/futuresight/RiddleOfLightning.java   |   2 +-
 .../mage/sets/futuresight/RiftElemental.java  |   2 +-
 .../mage/sets/futuresight/Riftsweeper.java    |   2 +-
 .../sets/futuresight/RitesOfFlourishing.java  |   2 +-
 .../mage/sets/futuresight/SarcomiteMyr.java   |   2 +-
 .../mage/sets/futuresight/ShimianSpecter.java |   2 +-
 .../mage/sets/futuresight/SpinIntoMyth.java   |   2 +-
 .../sets/futuresight/SporolothAncient.java    |   2 +-
 .../mage/sets/futuresight/TakePossession.java |   2 +-
 .../mage/sets/futuresight/Tombstalker.java    |   2 +-
 .../mage/sets/futuresight/WrapInVigor.java    |   2 +-
 .../mage/sets/futuresight/ZoeticCavern.java   |   2 +-
 .../mage/sets/gameday/AnguishedUnmaking.java  |   2 +-
 .../mage/sets/gameday/BlackSunsZenith.java    |   2 +-
 .../src/mage/sets/gameday/ChiefEngineer.java  |   2 +-
 .../sets/gameday/ConclaveNaturalists.java     |   2 +-
 .../mage/sets/gameday/CryptbornHorror.java    |   2 +-
 .../mage/sets/gameday/DictateOfKruphix.java   |   2 +-
 .../src/mage/sets/gameday/DiregrafGhoul.java  |   2 +-
 .../src/mage/sets/gameday/DryadMilitant.java  |   2 +-
 .../src/mage/sets/gameday/DungroveElder.java  |   2 +-
 .../mage/sets/gameday/EliteInquisitor.java    |   2 +-
 .../mage/sets/gameday/FiremaneAvenger.java    |   2 +-
 .../mage/sets/gameday/GoblinDiplomats.java    |   2 +-
 .../src/mage/sets/gameday/HallOfTriumph.java  |   2 +-
 .../src/mage/sets/gameday/HeirOfTheWilds.java |   2 +-
 .../sets/gameday/HeronsGraceChampion.java     |   2 +-
 .../src/mage/sets/gameday/HiveStirrings.java  |   2 +-
 .../mage/sets/gameday/ImmolatingGlare.java    |   2 +-
 .../mage/sets/gameday/IncorrigibleYouths.java |   2 +-
 .../mage/sets/gameday/JoriEnRuinDiver.java    |   2 +-
 .../src/mage/sets/gameday/KillingWave.java    |   2 +-
 .../src/mage/sets/gameday/KiorasFollower.java |   2 +-
 Mage.Sets/src/mage/sets/gameday/Languish.java |   2 +-
 .../src/mage/sets/gameday/LatchSeeker.java    |   2 +-
 .../mage/sets/gameday/LilianasSpecter.java    |   2 +-
 .../src/mage/sets/gameday/Magmaquake.java     |   2 +-
 .../mage/sets/gameday/MarduShadowspear.java   |   2 +-
 .../mage/sets/gameday/MelekIzzetParagon.java  |   2 +-
 Mage.Sets/src/mage/sets/gameday/Memnite.java  |   2 +-
 .../src/mage/sets/gameday/MitoticSlime.java   |   2 +-
 .../sets/gameday/MwonvuliBeastTracker.java    |   2 +-
 .../src/mage/sets/gameday/MyrSuperion.java    |   2 +-
 .../src/mage/sets/gameday/Nighthowler.java    |   2 +-
 Mage.Sets/src/mage/sets/gameday/PainSeer.java |   2 +-
 .../src/mage/sets/gameday/PhalanxLeader.java  |   2 +-
 .../mage/sets/gameday/PriestOfUrabrask.java   |   2 +-
 .../mage/sets/gameday/PristineTalisman.java   |   2 +-
 .../src/mage/sets/gameday/RadiantFlames.java  |   2 +-
 .../mage/sets/gameday/ReclamationSage.java    |   2 +-
 .../mage/sets/gameday/ReyaDawnbringer.java    |   2 +-
 .../mage/sets/gameday/SquelchingLeeches.java  |   2 +-
 .../src/mage/sets/gameday/StasisSnare.java    |   2 +-
 .../sets/gameday/StormbloodBerserker.java     |   2 +-
 .../mage/sets/gameday/StranglerootGeist.java  |   2 +-
 .../src/mage/sets/gameday/SupplantForm.java   |   2 +-
 .../src/mage/sets/gameday/SuturePriest.java   |   2 +-
 .../src/mage/sets/gameday/TemperedSteel.java  |   2 +-
 .../src/mage/sets/gameday/TreasureMage.java   |   2 +-
 .../mage/sets/gameday/TrostanisSummoner.java  |   2 +-
 .../src/mage/sets/gameday/Unsubstantiate.java |   2 +-
 Mage.Sets/src/mage/sets/gameday/UtterEnd.java |   2 +-
 .../mage/sets/gameday/ZameckGuildmage.java    |   2 +-
 .../mage/sets/gameday/ZombieApocalypse.java   |   2 +-
 .../sets/garrukvsliliana/AlbinoTroll.java     |   2 +-
 .../mage/sets/garrukvsliliana/BadMoon.java    |   2 +-
 .../garrukvsliliana/BaskingRootwalla.java     |   2 +-
 .../sets/garrukvsliliana/BeastAttack.java     |   2 +-
 .../mage/sets/garrukvsliliana/Blastoderm.java |   2 +-
 .../mage/sets/garrukvsliliana/Corrupt.java    |   2 +-
 .../sets/garrukvsliliana/Deathgreeter.java    |   2 +-
 .../sets/garrukvsliliana/DrudgeSkeletons.java |   2 +-
 .../sets/garrukvsliliana/ElephantGuide.java   |   2 +-
 .../mage/sets/garrukvsliliana/Enslave.java    |   2 +-
 .../sets/garrukvsliliana/FaerieMacabre.java   |   2 +-
 .../garrukvsliliana/FleshbagMarauder.java     |   2 +-
 .../garrukvsliliana/GarrukWildspeaker.java    |   2 +-
 .../garrukvsliliana/GenjuOfTheCedars.java     |   2 +-
 .../sets/garrukvsliliana/GenjuOfTheFens.java  |   2 +-
 .../sets/garrukvsliliana/GhostLitStalker.java |   2 +-
 .../sets/garrukvsliliana/GiantGrowth.java     |   2 +-
 .../mage/sets/garrukvsliliana/Harmonize.java  |   2 +-
 .../mage/sets/garrukvsliliana/HideousEnd.java |   2 +-
 .../sets/garrukvsliliana/HowlingBanshee.java  |   2 +-
 .../mage/sets/garrukvsliliana/IchorSlick.java |   2 +-
 .../garrukvsliliana/IndrikStomphowler.java    |   2 +-
 .../mage/sets/garrukvsliliana/Invigorate.java |   2 +-
 .../sets/garrukvsliliana/KeeningBanshee.java  |   2 +-
 .../sets/garrukvsliliana/KrosanTusker.java    |   2 +-
 .../mage/sets/garrukvsliliana/Lignify.java    |   2 +-
 .../sets/garrukvsliliana/LilianaVess.java     |   2 +-
 .../mage/sets/garrukvsliliana/Mutilate.java   |   2 +-
 .../sets/garrukvsliliana/NaturesLore.java     |   2 +-
 .../mage/sets/garrukvsliliana/Overrun.java    |   2 +-
 .../sets/garrukvsliliana/PhyrexianRager.java  |   2 +-
 .../sets/garrukvsliliana/PlatedSlagwurm.java  |   2 +-
 .../sets/garrukvsliliana/PollutedMire.java    |   2 +-
 .../src/mage/sets/garrukvsliliana/Rancor.java |   2 +-
 .../sets/garrukvsliliana/RavenousBaloth.java  |   2 +-
 .../sets/garrukvsliliana/RavenousRats.java    |   2 +-
 .../garrukvsliliana/RiseFromTheGrave.java     |   2 +-
 .../sets/garrukvsliliana/RudeAwakening.java   |   2 +-
 .../sets/garrukvsliliana/SerratedArrows.java  |   2 +-
 .../sets/garrukvsliliana/SignInBlood.java     |   2 +-
 .../sets/garrukvsliliana/SkeletalVampire.java |   2 +-
 .../sets/garrukvsliliana/SlipperyKarst.java   |   2 +-
 .../mage/sets/garrukvsliliana/SnuffOut.java   |   2 +-
 .../StampedingWildebeests.java                |   2 +-
 .../garrukvsliliana/TendrilsOfCorruption.java |   2 +-
 .../sets/garrukvsliliana/TreetopVillage.java  |   2 +-
 .../garrukvsliliana/TwistedAbomination.java   |   2 +-
 .../garrukvsliliana/UrborgSyphonMage.java     |   2 +-
 .../sets/garrukvsliliana/VampireBats.java     |   2 +-
 .../sets/garrukvsliliana/ViciousHunger.java   |   2 +-
 .../sets/garrukvsliliana/VineTrellis.java     |   2 +-
 .../mage/sets/garrukvsliliana/WallOfBone.java |   2 +-
 .../sets/garrukvsliliana/WildMongrel.java     |   2 +-
 .../mage/sets/garrukvsliliana/Windstorm.java  |   2 +-
 .../sets/garrukvsliliana/WirewoodSavage.java  |   2 +-
 .../src/mage/sets/gatecrash/ActOfTreason.java |   2 +-
 .../mage/sets/gatecrash/AssaultGriffin.java   |   2 +-
 .../mage/sets/gatecrash/BeckonApparition.java |   2 +-
 .../src/mage/sets/gatecrash/BreedingPool.java |   2 +-
 .../sets/gatecrash/ContaminatedGround.java    |   2 +-
 .../mage/sets/gatecrash/FrenziedTilling.java  |   2 +-
 .../mage/sets/gatecrash/GodlessShrine.java    |   2 +-
 .../src/mage/sets/gatecrash/Naturalize.java   |   2 +-
 .../mage/sets/gatecrash/PropheticPrism.java   |   2 +-
 .../mage/sets/gatecrash/SacredFoundry.java    |   2 +-
 .../sets/gatecrash/SkyknightLegionnaire.java  |   2 +-
 Mage.Sets/src/mage/sets/gatecrash/Smite.java  |   2 +-
 .../mage/sets/gatecrash/StompingGround.java   |   2 +-
 .../src/mage/sets/gatecrash/WateryGrave.java  |   2 +-
 .../src/mage/sets/grandprix/AllIsDust.java    |   2 +-
 .../src/mage/sets/grandprix/Batterskull.java  |   2 +-
 .../mage/sets/grandprix/CallOfTheHerd.java    |   2 +-
 .../src/mage/sets/grandprix/ChromeMox.java    |   2 +-
 .../src/mage/sets/grandprix/GoblinGuide.java  |   2 +-
 .../src/mage/sets/grandprix/Griselbrand.java  |   2 +-
 .../src/mage/sets/grandprix/LotusCobra.java   |   2 +-
 .../mage/sets/grandprix/MaelstromPulse.java   |   2 +-
 .../mage/sets/grandprix/PrimevalTitan.java    |   2 +-
 .../src/mage/sets/grandprix/Spiritmonger.java |   2 +-
 .../mage/sets/grandprix/StoneforgeMystic.java |   2 +-
 .../mage/sets/grandprix/UmezawasJitte.java    |   2 +-
 .../mage/sets/guildpact/DjinnIlluminatus.java |   2 +-
 .../src/mage/sets/guildpact/GhostWarden.java  |   2 +-
 .../src/mage/sets/guildpact/GruulTurf.java    |   2 +-
 .../mage/sets/guildpact/LeylineOfTheVoid.java |   2 +-
 .../guildpact/NivixAerieOfTheFiremind.java    |   2 +-
 .../src/mage/sets/guildpact/OgreSavant.java   |   2 +-
 .../sets/guildpact/RevenantPatriarch.java     |   2 +-
 .../mage/sets/guildpact/SavageTwister.java    |   2 +-
 .../mage/sets/guildpact/SkarrganFirebird.java |   2 +-
 .../sets/guildpact/SkarrganSkybreaker.java    |   2 +-
 .../mage/sets/guildpact/SteamcoreWeird.java   |   2 +-
 .../mage/sets/guildpact/SwordOfTheParuns.java |   2 +-
 .../sets/heroesvsmonsters/AnaxAndCymede.java  |   2 +-
 .../sets/heroesvsmonsters/ArmoryGuard.java    |   2 +-
 .../sets/heroesvsmonsters/Auramancer.java     |   2 +-
 .../sets/heroesvsmonsters/BattleMastery.java  |   2 +-
 .../sets/heroesvsmonsters/BeastWithin.java    |   2 +-
 .../mage/sets/heroesvsmonsters/BloodOgre.java |   2 +-
 .../sets/heroesvsmonsters/BondsOfFaith.java   |   2 +-
 .../sets/heroesvsmonsters/BorosGuildgate.java |   2 +-
 .../sets/heroesvsmonsters/CavalryPegasus.java |   2 +-
 .../mage/sets/heroesvsmonsters/Condemn.java   |   2 +-
 .../heroesvsmonsters/ConqueringManticore.java |   2 +-
 .../sets/heroesvsmonsters/CraterHellion.java  |   2 +-
 .../sets/heroesvsmonsters/CrownedCeratok.java |   2 +-
 .../sets/heroesvsmonsters/DailyRegimen.java   |   2 +-
 .../heroesvsmonsters/DawnstrikePaladin.java   |   2 +-
 .../sets/heroesvsmonsters/DeadlyRecluse.java  |   2 +-
 .../heroesvsmonsters/DestructiveRevelry.java  |   2 +-
 .../sets/heroesvsmonsters/DragonBlood.java    |   2 +-
 .../sets/heroesvsmonsters/FencingAce.java     |   2 +-
 .../heroesvsmonsters/FigureOfDestiny.java     |   2 +-
 .../heroesvsmonsters/FiresOfYavimaya.java     |   2 +-
 .../heroesvsmonsters/FreewindEquenaut.java    |   2 +-
 .../sets/heroesvsmonsters/GhorClanSavage.java |   2 +-
 .../heroesvsmonsters/GorehornMinotaurs.java   |   2 +-
 .../sets/heroesvsmonsters/GriffinGuide.java   |   2 +-
 .../heroesvsmonsters/GustcloakSentinel.java   |   2 +-
 .../heroesvsmonsters/KamahlPitFighter.java    |   2 +-
 .../sets/heroesvsmonsters/KazanduRefuge.java  |   2 +-
 .../mage/sets/heroesvsmonsters/MagmaJet.java  |   2 +-
 .../heroesvsmonsters/MiraculousRecovery.java  |   2 +-
 .../heroesvsmonsters/MomentOfHeroism.java     |   2 +-
 .../sets/heroesvsmonsters/NewBenalia.java     |   2 +-
 .../sets/heroesvsmonsters/NobilisOfWar.java   |   2 +-
 .../heroesvsmonsters/OrdealOfPurphoros.java   |   2 +-
 .../mage/sets/heroesvsmonsters/PayNoHeed.java |   2 +-
 .../PolukranosWorldEater.java                 |   2 +-
 .../mage/sets/heroesvsmonsters/PreyUpon.java  |   2 +-
 .../mage/sets/heroesvsmonsters/Pyroclasm.java |   2 +-
 .../sets/heroesvsmonsters/Pyrokinesis.java    |   2 +-
 .../mage/sets/heroesvsmonsters/Regrowth.java  |   2 +-
 .../sets/heroesvsmonsters/Righteousness.java  |   2 +-
 .../sets/heroesvsmonsters/SatyrHedonist.java  |   2 +-
 .../heroesvsmonsters/SkarrgTheRagePits.java   |   2 +-
 .../heroesvsmonsters/SmiteTheMonstrous.java   |   2 +-
 .../heroesvsmonsters/SomberwaldVigilante.java |   2 +-
 .../mage/sets/heroesvsmonsters/StandFirm.java |   2 +-
 .../sets/heroesvsmonsters/StunSniper.java     |   2 +-
 .../mage/sets/heroesvsmonsters/SunTitan.java  |   2 +-
 .../heroesvsmonsters/TerrifyingPresence.java  |   2 +-
 .../sets/heroesvsmonsters/ThrabenValiant.java |   2 +-
 .../sets/heroesvsmonsters/TrollAscetic.java   |   2 +-
 .../heroesvsmonsters/TruefirePaladin.java     |   2 +-
 .../sets/heroesvsmonsters/ValleyRannet.java   |   2 +-
 .../sets/heroesvsmonsters/VoltCharge.java     |   2 +-
 .../sets/heroesvsmonsters/ZhurTaaDruid.java   |   2 +-
 .../mage/sets/homelands/AbbeyGargoyles.java   |   2 +-
 .../src/mage/sets/homelands/AbbeyMatron2.java |   2 +-
 .../mage/sets/homelands/AlibansTower2.java    |   2 +-
 .../src/mage/sets/homelands/AmbushParty1.java |   2 +-
 .../src/mage/sets/homelands/AmbushParty2.java |   2 +-
 .../mage/sets/homelands/AnHavvaConstable.java |   2 +-
 .../mage/sets/homelands/AnabaBodyguard1.java  |   2 +-
 .../mage/sets/homelands/AnabaBodyguard2.java  |   2 +-
 .../src/mage/sets/homelands/AnabaShaman1.java |   2 +-
 .../src/mage/sets/homelands/AnabaShaman2.java |   2 +-
 .../sets/homelands/AysenBureaucrats1.java     |   2 +-
 .../sets/homelands/AysenBureaucrats2.java     |   2 +-
 .../src/mage/sets/homelands/BaronSengir.java  |   2 +-
 .../mage/sets/homelands/CemeteryGate2.java    |   2 +-
 .../mage/sets/homelands/ClockworkGnomes.java  |   2 +-
 .../src/mage/sets/homelands/DarkMaze1.java    |   2 +-
 .../src/mage/sets/homelands/DarkMaze2.java    |   2 +-
 .../src/mage/sets/homelands/DrySpell2.java    |   2 +-
 .../mage/sets/homelands/DwarvenTrader2.java   |   2 +-
 .../src/mage/sets/homelands/FaerieNoble.java  |   2 +-
 .../sets/homelands/FeastOfTheUnicorn2.java    |   2 +-
 .../src/mage/sets/homelands/FerozsBan.java    |   2 +-
 .../mage/sets/homelands/FolkOfAnHavva2.java   |   2 +-
 .../sets/homelands/GrandmotherSengir.java     |   2 +-
 .../src/mage/sets/homelands/HungryMist1.java  |   2 +-
 .../src/mage/sets/homelands/HungryMist2.java  |   2 +-
 .../src/mage/sets/homelands/Marjhan.java      |   2 +-
 .../src/mage/sets/homelands/MemoryLapse1.java |   2 +-
 .../src/mage/sets/homelands/MemoryLapse2.java |   2 +-
 .../mage/sets/homelands/MerchantScroll.java   |   2 +-
 .../src/mage/sets/homelands/MesaFalcon2.java  |   2 +-
 .../src/mage/sets/homelands/ReefPirates2.java |   2 +-
 .../sets/homelands/RevekaWizardSavant.java    |   2 +-
 .../src/mage/sets/homelands/SengirBats1.java  |   2 +-
 .../mage/sets/homelands/SpectralBears.java    |   2 +-
 .../src/mage/sets/homelands/Torture2.java     |   2 +-
 .../mage/sets/homelands/WillowFaerie2.java    |   2 +-
 .../src/mage/sets/iceage/AbyssalSpecter.java  |   2 +-
 .../src/mage/sets/iceage/AdarkarWastes.java   |   2 +-
 .../src/mage/sets/iceage/ArensonsAura.java    |   2 +-
 .../src/mage/sets/iceage/ArmorOfFaith.java    |   2 +-
 .../mage/sets/iceage/BalduvianBarbarians.java |   2 +-
 .../src/mage/sets/iceage/BindingGrasp.java    |   2 +-
 .../src/mage/sets/iceage/BlessedWine.java     |   2 +-
 .../src/mage/sets/iceage/BlinkingSpirit.java  |   2 +-
 .../src/mage/sets/iceage/Brainstorm.java      |   2 +-
 Mage.Sets/src/mage/sets/iceage/Brushland.java |   2 +-
 .../src/mage/sets/iceage/CaribouRange.java    |   2 +-
 .../src/mage/sets/iceage/Counterspell.java    |   2 +-
 .../src/mage/sets/iceage/DarkBanishing.java   |   2 +-
 .../src/mage/sets/iceage/DarkRitual.java      |   2 +-
 Mage.Sets/src/mage/sets/iceage/DeathWard.java |   2 +-
 .../src/mage/sets/iceage/DespoticScepter.java |   2 +-
 .../src/mage/sets/iceage/Disenchant.java      |   2 +-
 .../src/mage/sets/iceage/ElementalAugury.java |   2 +-
 Mage.Sets/src/mage/sets/iceage/Enervate.java  |   2 +-
 Mage.Sets/src/mage/sets/iceage/Errantry.java  |   2 +-
 Mage.Sets/src/mage/sets/iceage/Fear.java      |   2 +-
 Mage.Sets/src/mage/sets/iceage/Flare.java     |   2 +-
 .../src/mage/sets/iceage/FolkOfThePines.java  |   2 +-
 .../src/mage/sets/iceage/ForgottenLore.java   |   2 +-
 .../src/mage/sets/iceage/FoulFamiliar.java    |   2 +-
 Mage.Sets/src/mage/sets/iceage/Fumarole.java  |   2 +-
 .../src/mage/sets/iceage/GiantGrowth.java     |   2 +-
 .../src/mage/sets/iceage/GlacialWall.java     |   2 +-
 Mage.Sets/src/mage/sets/iceage/Gravebind.java |   2 +-
 .../src/mage/sets/iceage/HowlFromBeyond.java  |   2 +-
 Mage.Sets/src/mage/sets/iceage/Hurricane.java |   2 +-
 .../src/mage/sets/iceage/Hydroblast.java      |   2 +-
 .../src/mage/sets/iceage/HymnOfRebirth.java   |   2 +-
 .../src/mage/sets/iceage/IcyManipulator.java  |   2 +-
 .../mage/sets/iceage/IllusionaryForces.java   |   2 +-
 .../src/mage/sets/iceage/IllusionaryWall.java |   2 +-
 .../src/mage/sets/iceage/Incinerate.java      |   2 +-
 .../src/mage/sets/iceage/JestersCap.java      |   2 +-
 Mage.Sets/src/mage/sets/iceage/Justice.java   |   2 +-
 .../src/mage/sets/iceage/KarplusanForest.java |   2 +-
 .../src/mage/sets/iceage/KrovikanFetish.java  |   2 +-
 .../mage/sets/iceage/KrovikanSorcerer.java    |   2 +-
 Mage.Sets/src/mage/sets/iceage/Lure.java      |   2 +-
 .../src/mage/sets/iceage/MesmericTrance.java  |   2 +-
 Mage.Sets/src/mage/sets/iceage/MindRavel.java |   2 +-
 Mage.Sets/src/mage/sets/iceage/MoleWorms.java |   2 +-
 .../src/mage/sets/iceage/MountainGoat.java    |   2 +-
 .../mage/sets/iceage/OrcishLumberjack.java    |   2 +-
 Mage.Sets/src/mage/sets/iceage/Panic.java     |   2 +-
 Mage.Sets/src/mage/sets/iceage/PitTrap.java   |   2 +-
 Mage.Sets/src/mage/sets/iceage/Portent.java   |   2 +-
 Mage.Sets/src/mage/sets/iceage/PowerSink.java |   2 +-
 Mage.Sets/src/mage/sets/iceage/Pox.java       |   2 +-
 Mage.Sets/src/mage/sets/iceage/Pyroclasm.java |   2 +-
 .../src/mage/sets/iceage/SabretoothTiger.java |   2 +-
 .../src/mage/sets/iceage/ScaledWurm.java      |   2 +-
 Mage.Sets/src/mage/sets/iceage/SeaSpirit.java |   2 +-
 .../mage/sets/iceage/ShamblingStrider.java    |   2 +-
 Mage.Sets/src/mage/sets/iceage/Shatter.java   |   2 +-
 .../src/mage/sets/iceage/ShieldOfTheAges.java |   2 +-
 .../mage/sets/iceage/SoldeviMachinist.java    |   2 +-
 .../mage/sets/iceage/SoldeviSimulacrum.java   |   2 +-
 Mage.Sets/src/mage/sets/iceage/SoulKiss.java  |   2 +-
 Mage.Sets/src/mage/sets/iceage/StoneRain.java |   2 +-
 .../src/mage/sets/iceage/StormSpirit.java     |   2 +-
 .../mage/sets/iceage/SulfurousSprings.java    |   2 +-
 .../mage/sets/iceage/SwordsToPlowshares.java  |   2 +-
 .../src/mage/sets/iceage/Thermokarst.java     |   2 +-
 .../src/mage/sets/iceage/Thoughtleech.java    |   2 +-
 Mage.Sets/src/mage/sets/iceage/TimeBomb.java  |   2 +-
 .../mage/sets/iceage/UndergroundRiver.java    |   2 +-
 .../src/mage/sets/iceage/UrzasBauble.java     |   2 +-
 .../src/mage/sets/iceage/WalkingWall.java     |   2 +-
 Mage.Sets/src/mage/sets/iceage/Warning.java   |   2 +-
 .../src/mage/sets/iceage/WingsOfAesthir.java  |   2 +-
 .../src/mage/sets/innistrad/BlazingTorch.java |   2 +-
 .../src/mage/sets/innistrad/Naturalize.java   |   2 +-
 .../mage/sets/innistrad/ShimmeringGrotto.java |   2 +-
 Mage.Sets/src/mage/sets/invasion/Addle.java   |   2 +-
 .../mage/sets/invasion/AggressiveUrge.java    |   2 +-
 .../mage/sets/invasion/AgonizingDemise.java   |   2 +-
 .../src/mage/sets/invasion/AngelOfMercy.java  |   2 +-
 .../src/mage/sets/invasion/AngelicShield.java |   2 +-
 .../src/mage/sets/invasion/AuraShards.java    |   2 +-
 .../src/mage/sets/invasion/BlindingLight.java |   2 +-
 .../mage/sets/invasion/BreathOfDarigaaz.java  |   2 +-
 .../mage/sets/invasion/ChromaticSphere.java   |   2 +-
 .../mage/sets/invasion/CoalitionVictory.java  |   2 +-
 Mage.Sets/src/mage/sets/invasion/Cremate.java |   2 +-
 .../src/mage/sets/invasion/CrownOfFlames.java |   2 +-
 .../sets/invasion/DarigaazTheIgniter.java     |   2 +-
 .../mage/sets/invasion/DistortingWake.java    |   2 +-
 .../mage/sets/invasion/ElvishChampion.java    |   2 +-
 Mage.Sets/src/mage/sets/invasion/Exclude.java |   2 +-
 .../src/mage/sets/invasion/ExoticCurse.java   |   2 +-
 .../src/mage/sets/invasion/FertileGround.java |   2 +-
 .../mage/sets/invasion/FiresOfYavimaya.java   |   2 +-
 Mage.Sets/src/mage/sets/invasion/Harrow.java  |   2 +-
 .../src/mage/sets/invasion/HateWeaver.java    |   2 +-
 .../src/mage/sets/invasion/KavuClimber.java   |   2 +-
 .../src/mage/sets/invasion/Lobotomy.java      |   2 +-
 .../src/mage/sets/invasion/ManiacalRage.java  |   2 +-
 .../src/mage/sets/invasion/MightWeaver.java   |   2 +-
 .../sets/invasion/MolimoMaroSorcerer.java     |   2 +-
 .../mage/sets/invasion/PhantasmalTerrain.java |   2 +-
 .../sets/invasion/PhyrexianBattleflies.java   |   2 +-
 .../src/mage/sets/invasion/QuirionElves.java  |   2 +-
 .../src/mage/sets/invasion/RageWeaver.java    |   2 +-
 .../src/mage/sets/invasion/RavenousRats.java  |   2 +-
 .../mage/sets/invasion/RazorfootGriffin.java  |   2 +-
 .../src/mage/sets/invasion/RecklessSpite.java |   2 +-
 .../src/mage/sets/invasion/RevivingDose.java  |   2 +-
 .../mage/sets/invasion/ReyaDawnbringer.java   |   2 +-
 .../src/mage/sets/invasion/RogueKavu.java     |   2 +-
 Mage.Sets/src/mage/sets/invasion/Rout.java    |   2 +-
 .../mage/sets/invasion/ShimmeringWings.java   |   2 +-
 .../src/mage/sets/invasion/ShivanOasis.java   |   2 +-
 Mage.Sets/src/mage/sets/invasion/Simoon.java  |   2 +-
 .../src/mage/sets/invasion/SkyWeaver.java     |   2 +-
 .../src/mage/sets/invasion/SpiritWeaver.java  |   2 +-
 Mage.Sets/src/mage/sets/invasion/Stun.java    |   2 +-
 .../src/mage/sets/invasion/TeferisMoat.java   |   2 +-
 .../sets/invasion/ThornscapeApprentice.java   |   2 +-
 .../src/mage/sets/invasion/TowerDrake.java    |   2 +-
 .../src/mage/sets/invasion/Tranquility.java   |   2 +-
 .../mage/sets/invasion/TravelersCloak.java    |   2 +-
 .../src/mage/sets/invasion/UrzasRage.java     |   2 +-
 .../mage/sets/invasion/VerduranEmissary.java  |   2 +-
 Mage.Sets/src/mage/sets/invasion/WaxWane.java |   2 +-
 .../mage/sets/invasion/WorldlyCounsel.java    |   2 +-
 .../mage/sets/izzetvsgolgari/BarrenMoor.java  |   2 +-
 .../sets/izzetvsgolgari/BoneyardWurm.java     |   2 +-
 .../mage/sets/izzetvsgolgari/BrainWeevil.java |   2 +-
 .../mage/sets/izzetvsgolgari/Brainstorm.java  |   2 +-
 .../mage/sets/izzetvsgolgari/CallToHeel.java  |   2 +-
 .../sets/izzetvsgolgari/DakmorSalvage.java    |   2 +-
 .../mage/sets/izzetvsgolgari/Dissipate.java   |   2 +-
 .../sets/izzetvsgolgari/DjinnIlluminatus.java |   2 +-
 .../mage/sets/izzetvsgolgari/Doomgape.java    |   2 +-
 .../mage/sets/izzetvsgolgari/DregMangler.java |   2 +-
 .../izzetvsgolgari/ElvesOfDeepShadow.java     |   2 +-
 .../sets/izzetvsgolgari/EternalWitness.java   |   2 +-
 .../src/mage/sets/izzetvsgolgari/FireIce.java |   2 +-
 .../mage/sets/izzetvsgolgari/ForceSpike.java  |   2 +-
 .../sets/izzetvsgolgari/ForgottenCave.java    |   2 +-
 .../mage/sets/izzetvsgolgari/Galvanoth.java   |   2 +-
 .../mage/sets/izzetvsgolgari/Gelectrode.java  |   2 +-
 .../sets/izzetvsgolgari/Gleancrawler.java     |   2 +-
 .../izzetvsgolgari/GoblinElectromancer.java   |   2 +-
 .../izzetvsgolgari/GolgariGraveTroll.java     |   2 +-
 .../sets/izzetvsgolgari/GolgariRotFarm.java   |   2 +-
 .../sets/izzetvsgolgari/GolgariRotwurm.java   |   2 +-
 .../sets/izzetvsgolgari/GolgariSignet.java    |   2 +-
 .../mage/sets/izzetvsgolgari/GolgariThug.java |   2 +-
 .../sets/izzetvsgolgari/GreaterMossdog.java   |   2 +-
 .../sets/izzetvsgolgari/GrimFlowering.java    |   2 +-
 .../izzetvsgolgari/InvokeTheFiremind.java     |   2 +-
 .../sets/izzetvsgolgari/IsochronScepter.java  |   2 +-
 .../sets/izzetvsgolgari/IzzetBoilerworks.java |   2 +-
 .../mage/sets/izzetvsgolgari/IzzetCharm.java  |   2 +-
 .../sets/izzetvsgolgari/IzzetChronarch.java   |   2 +-
 .../sets/izzetvsgolgari/IzzetGuildmage.java   |   2 +-
 .../mage/sets/izzetvsgolgari/IzzetSignet.java |   2 +-
 .../izzetvsgolgari/JaradGolgariLichLord.java  |   2 +-
 .../mage/sets/izzetvsgolgari/KilnFiend.java   |   2 +-
 .../sets/izzetvsgolgari/KorozdaGuildmage.java |   2 +-
 .../mage/sets/izzetvsgolgari/LifeDeath.java   |   2 +-
 .../sets/izzetvsgolgari/LifeFromTheLoam.java  |   2 +-
 .../sets/izzetvsgolgari/LonelySandbar.java    |   2 +-
 .../mage/sets/izzetvsgolgari/MagmaSpray.java  |   2 +-
 .../sets/izzetvsgolgari/NightmareVoid.java    |   2 +-
 .../izzetvsgolgari/NivMizzetTheFiremind.java  |   2 +-
 .../mage/sets/izzetvsgolgari/OgreSavant.java  |   2 +-
 .../izzetvsgolgari/OverwhelmingIntellect.java |   2 +-
 .../sets/izzetvsgolgari/PlaguedRusalka.java   |   2 +-
 .../sets/izzetvsgolgari/PropheticBolt.java    |   2 +-
 .../src/mage/sets/izzetvsgolgari/Putrefy.java |   2 +-
 .../mage/sets/izzetvsgolgari/PutridLeech.java |   2 +-
 .../mage/sets/izzetvsgolgari/Pyromatics.java  |   2 +-
 .../izzetvsgolgari/QuicksilverDagger.java     |   2 +-
 .../sets/izzetvsgolgari/RavenousRats.java     |   2 +-
 .../izzetvsgolgari/ReassemblingSkeleton.java  |   2 +-
 .../mage/sets/izzetvsgolgari/Reminisce.java   |   2 +-
 .../izzetvsgolgari/SadisticHypnotist.java     |   2 +-
 .../sets/izzetvsgolgari/ShamblingShell.java   |   2 +-
 .../sets/izzetvsgolgari/ShrewdHatchling.java  |   2 +-
 .../sets/izzetvsgolgari/SphinxBoneWand.java   |   2 +-
 .../izzetvsgolgari/StingerflingSpider.java    |   2 +-
 .../sets/izzetvsgolgari/StinkweedImp.java     |   2 +-
 .../mage/sets/izzetvsgolgari/StreetSpasm.java |   2 +-
 .../SvogthosTheRestlessTomb.java              |   2 +-
 .../sets/izzetvsgolgari/Thunderheads.java     |   2 +-
 .../sets/izzetvsgolgari/TrainOfThought.java   |   2 +-
 .../sets/izzetvsgolgari/TranquilThicket.java  |   2 +-
 .../sets/izzetvsgolgari/TwilightsCall.java    |   2 +-
 .../mage/sets/izzetvsgolgari/Vacuumelt.java   |   2 +-
 .../mage/sets/izzetvsgolgari/VigorMortis.java |   2 +-
 .../sets/izzetvsgolgari/WeeDragonauts.java    |   2 +-
 .../sets/izzetvsgolgari/YokeOfTheDamned.java  |   2 +-
 .../mage/sets/jacevschandra/AEthersnipe.java  |   2 +-
 .../mage/sets/jacevschandra/AirElemental.java |   2 +-
 .../sets/jacevschandra/AncestralVision.java   |   2 +-
 .../mage/sets/jacevschandra/BottleGnomes.java |   2 +-
 .../sets/jacevschandra/BrineElemental.java    |   2 +-
 .../sets/jacevschandra/ChandraNalaar.java     |   2 +-
 .../sets/jacevschandra/ChartoothCougar.java   |   2 +-
 .../mage/sets/jacevschandra/Condescend.java   |   2 +-
 .../mage/sets/jacevschandra/ConeOfFlame.java  |   2 +-
 .../mage/sets/jacevschandra/Counterspell.java |   2 +-
 .../src/mage/sets/jacevschandra/Daze.java     |   2 +-
 .../mage/sets/jacevschandra/Demonfire.java    |   2 +-
 .../sets/jacevschandra/ErrantEphemeron.java   |   2 +-
 .../sets/jacevschandra/FactOrFiction.java     |   2 +-
 .../src/mage/sets/jacevschandra/Fireball.java |   2 +-
 .../mage/sets/jacevschandra/Fireblast.java    |   2 +-
 .../src/mage/sets/jacevschandra/Firebolt.java |   2 +-
 .../mage/sets/jacevschandra/Fireslinger.java  |   2 +-
 .../mage/sets/jacevschandra/FlameJavelin.java |   2 +-
 .../sets/jacevschandra/FlamekinBrawler.java   |   2 +-
 .../sets/jacevschandra/FlametongueKavu.java   |   2 +-
 .../sets/jacevschandra/FlamewaveInvoker.java  |   2 +-
 .../mage/sets/jacevschandra/FurnaceWhelp.java |   2 +-
 .../src/mage/sets/jacevschandra/Guile.java    |   2 +-
 .../mage/sets/jacevschandra/Incinerate.java   |   2 +-
 .../mage/sets/jacevschandra/IngotChewer.java  |   2 +-
 .../sets/jacevschandra/InnerFlameAcolyte.java |   2 +-
 .../mage/sets/jacevschandra/JaceBeleren.java  |   2 +-
 .../src/mage/sets/jacevschandra/MagmaJet.java |   2 +-
 .../src/mage/sets/jacevschandra/ManOWar.java  |   2 +-
 .../sets/jacevschandra/MartyrOfFrost.java     |   2 +-
 .../mage/sets/jacevschandra/MindStone.java    |   2 +-
 .../mage/sets/jacevschandra/Mulldrifter.java  |   2 +-
 .../src/mage/sets/jacevschandra/Ophidian.java |   2 +-
 .../mage/sets/jacevschandra/PyreCharger.java  |   2 +-
 .../sets/jacevschandra/RakdosPitDragon.java   |   2 +-
 .../src/mage/sets/jacevschandra/Repulse.java  |   2 +-
 .../jacevschandra/RiftwingCloudskate.java     |   2 +-
 .../mage/sets/jacevschandra/SealOfFire.java   |   2 +-
 .../sets/jacevschandra/SlithFirewalker.java   |   2 +-
 .../jacevschandra/SoulbrightFlamekin.java     |   2 +-
 .../sets/jacevschandra/TerrainGenerator.java  |   2 +-
 .../jacevschandra/VoidmageApprentice.java     |   2 +-
 .../mage/sets/jacevschandra/WallOfDeceit.java |   2 +-
 .../mage/sets/jacevschandra/Willbender.java   |   2 +-
 .../mage/sets/jacevsvraska/AEtherAdept.java   |   2 +-
 .../mage/sets/jacevsvraska/AEtherFigment.java |   2 +-
 .../mage/sets/jacevsvraska/AcidicSlime.java   |   2 +-
 .../mage/sets/jacevsvraska/Agoraphobia.java   |   2 +-
 .../mage/sets/jacevsvraska/Archaeomancer.java |   2 +-
 .../mage/sets/jacevsvraska/Chronomaton.java   |   2 +-
 .../sets/jacevsvraska/Claustrophobia.java     |   2 +-
 .../sets/jacevsvraska/ConsumeStrength.java    |   2 +-
 .../mage/sets/jacevsvraska/ControlMagic.java  |   2 +-
 .../mage/sets/jacevsvraska/CorpseTraders.java |   2 +-
 .../sets/jacevsvraska/CrosstownCourier.java   |   2 +-
 .../sets/jacevsvraska/DeathHoodCobra.java     |   2 +-
 .../mage/sets/jacevsvraska/DreadStatuary.java |   2 +-
 .../sets/jacevsvraska/ErrantEphemeron.java    |   2 +-
 .../sets/jacevsvraska/FesterhideBoar.java     |   2 +-
 .../mage/sets/jacevsvraska/FutureSight.java   |   2 +-
 .../sets/jacevsvraska/GatecreeperVine.java    |   2 +-
 .../sets/jacevsvraska/GolgariGuildgate.java   |   2 +-
 .../src/mage/sets/jacevsvraska/Griptide.java  |   2 +-
 .../sets/jacevsvraska/GrislySpectacle.java    |   2 +-
 .../mage/sets/jacevsvraska/HalimarDepths.java |   2 +-
 .../mage/sets/jacevsvraska/HighwayRobber.java |   2 +-
 .../mage/sets/jacevsvraska/HypnoticCloud.java |   2 +-
 .../mage/sets/jacevsvraska/IntoTheRoil.java   |   2 +-
 .../jacevsvraska/JaceArchitectOfThought.java  |   2 +-
 .../sets/jacevsvraska/JacesIngenuity.java     |   2 +-
 .../sets/jacevsvraska/JacesMindseeker.java    |   2 +-
 .../mage/sets/jacevsvraska/JacesPhantasm.java |   2 +-
 .../src/mage/sets/jacevsvraska/LastKiss.java  |   2 +-
 .../sets/jacevsvraska/LeylinePhantom.java     |   2 +-
 .../sets/jacevsvraska/MarshCasualties.java    |   2 +-
 .../mage/sets/jacevsvraska/MemoryLapse.java   |   2 +-
 .../sets/jacevsvraska/MerfolkWayfinder.java   |   2 +-
 .../mage/sets/jacevsvraska/MoldShambler.java  |   2 +-
 .../src/mage/sets/jacevsvraska/Nekrataal.java |   2 +-
 .../mage/sets/jacevsvraska/NightsWhisper.java |   2 +-
 .../sets/jacevsvraska/OranRiefRecluse.java    |   2 +-
 .../sets/jacevsvraska/PhantasmalBear.java     |   2 +-
 .../sets/jacevsvraska/PhantasmalDragon.java   |   2 +-
 .../src/mage/sets/jacevsvraska/Prohibit.java  |   2 +-
 .../mage/sets/jacevsvraska/PulseTracker.java  |   2 +-
 .../mage/sets/jacevsvraska/PutridLeech.java   |   2 +-
 .../mage/sets/jacevsvraska/RayOfCommand.java  |   2 +-
 .../sets/jacevsvraska/ReaperOfTheWilds.java   |   2 +-
 .../src/mage/sets/jacevsvraska/Remand.java    |   2 +-
 .../sets/jacevsvraska/RiftwingCloudskate.java |   2 +-
 .../src/mage/sets/jacevsvraska/RiverBoa.java  |   2 +-
 .../mage/sets/jacevsvraska/RoguesPassage.java |   2 +-
 .../mage/sets/jacevsvraska/SeaGateOracle.java |   2 +-
 .../sets/jacevsvraska/ShadowAlleyDenizen.java |   2 +-
 .../sets/jacevsvraska/SlateStreetRuffian.java |   2 +-
 .../mage/sets/jacevsvraska/Spawnwrithe.java   |   2 +-
 .../mage/sets/jacevsvraska/Spelltwine.java    |   2 +-
 .../src/mage/sets/jacevsvraska/StabWound.java |   2 +-
 .../sets/jacevsvraska/StealerOfSecrets.java   |   2 +-
 .../sets/jacevsvraska/StonefareCrocodile.java |   2 +-
 .../mage/sets/jacevsvraska/SummonersBane.java |   2 +-
 .../mage/sets/jacevsvraska/TaintedWood.java   |   2 +-
 .../sets/jacevsvraska/TavernSwindler.java     |   2 +-
 .../mage/sets/jacevsvraska/ThoughtScour.java  |   2 +-
 .../mage/sets/jacevsvraska/TragicSlip.java    |   2 +-
 .../mage/sets/jacevsvraska/TreasuredFind.java |   2 +-
 .../jacevsvraska/UnderworldConnections.java   |   2 +-
 .../sets/jacevsvraska/VinelasherKudzu.java    |   2 +-
 .../sets/jacevsvraska/VraskaTheUnseen.java    |   2 +-
 .../sets/jacevsvraska/WightOfPrecinctSix.java |   2 +-
 .../sets/journeyintonyx/BladetuskBoar.java    |   2 +-
 .../mage/sets/journeyintonyx/MagmaSpray.java  |   2 +-
 .../mage/sets/journeyintonyx/Reprisal.java    |   2 +-
 .../sets/judgepromo/ArgothianEnchantress.java |   2 +-
 .../src/mage/sets/judgepromo/Armageddon.java  |   2 +-
 .../sets/judgepromo/AzusaLostButSeeking.java  |   2 +-
 .../src/mage/sets/judgepromo/Balance.java     |   2 +-
 .../mage/sets/judgepromo/BallLightning.java   |   2 +-
 .../mage/sets/judgepromo/Bitterblossom.java   |   2 +-
 .../sets/judgepromo/BloodstainedMire.java     |   2 +-
 .../src/mage/sets/judgepromo/Bribery.java     |   2 +-
 .../src/mage/sets/judgepromo/BurningWish.java |   2 +-
 .../mage/sets/judgepromo/CommandBeacon.java   |   2 +-
 .../mage/sets/judgepromo/CommandTower.java    |   2 +-
 .../mage/sets/judgepromo/Counterspell.java    |   2 +-
 .../sets/judgepromo/CrucibleOfWorlds.java     |   2 +-
 .../src/mage/sets/judgepromo/CunningWish.java |   2 +-
 .../src/mage/sets/judgepromo/Damnation.java   |   2 +-
 .../mage/sets/judgepromo/DarkConfidant.java   |   2 +-
 .../src/mage/sets/judgepromo/DarkRitual.java  |   2 +-
 .../mage/sets/judgepromo/DecreeOfJustice.java |   2 +-
 .../sets/judgepromo/DefenseOfTheHeart.java    |   2 +-
 .../mage/sets/judgepromo/DemonicTutor.java    |   2 +-
 .../mage/sets/judgepromo/DerangedHermit.java  |   2 +-
 .../mage/sets/judgepromo/DoublingSeason.java  |   2 +-
 .../mage/sets/judgepromo/DualcasterMage.java  |   2 +-
 .../judgepromo/EleshNornGrandCenobite.java    |   2 +-
 .../src/mage/sets/judgepromo/Entomb.java      |   2 +-
 .../mage/sets/judgepromo/ExaltedAngel.java    |   2 +-
 .../sets/judgepromo/FeldonOfTheThirdPath.java |   2 +-
 .../mage/sets/judgepromo/FloodedStrand.java   |   2 +-
 .../mage/sets/judgepromo/Flusterstorm.java    |   2 +-
 .../src/mage/sets/judgepromo/ForceOfWill.java |   2 +-
 .../src/mage/sets/judgepromo/GaeasCradle.java |   2 +-
 .../mage/sets/judgepromo/GemstoneMine.java    |   2 +-
 .../src/mage/sets/judgepromo/Genesis.java     |   2 +-
 .../sets/judgepromo/GoblinPiledriver.java     |   2 +-
 .../mage/sets/judgepromo/GoblinWelder.java    |   2 +-
 .../src/mage/sets/judgepromo/GreaterGood.java |   2 +-
 .../mage/sets/judgepromo/GrimLavamancer.java  |   2 +-
 .../src/mage/sets/judgepromo/Grindstone.java  |   2 +-
 .../sets/judgepromo/HammerOfBogardan.java     |   2 +-
 .../sets/judgepromo/HannaShipsNavigator.java  |   2 +-
 .../src/mage/sets/judgepromo/HermitDruid.java |   2 +-
 .../sets/judgepromo/ImperialRecruiter.java    |   2 +-
 .../src/mage/sets/judgepromo/Intuition.java   |   2 +-
 .../judgepromo/KaradorGhostChieftain.java     |   2 +-
 .../src/mage/sets/judgepromo/Karakas.java     |   2 +-
 .../src/mage/sets/judgepromo/KarmicGuide.java |   2 +-
 .../src/mage/sets/judgepromo/LandTax.java     |   2 +-
 .../mage/sets/judgepromo/LightningBolt.java   |   2 +-
 .../src/mage/sets/judgepromo/LivingDeath.java |   2 +-
 .../src/mage/sets/judgepromo/LivingWish.java  |   2 +-
 .../src/mage/sets/judgepromo/ManaCrypt.java   |   2 +-
 .../src/mage/sets/judgepromo/ManaDrain.java   |   2 +-
 .../src/mage/sets/judgepromo/MazeOfIth.java   |   2 +-
 .../mage/sets/judgepromo/MeddlingMage.java    |   2 +-
 .../src/mage/sets/judgepromo/MemoryLapse.java |   2 +-
 .../src/mage/sets/judgepromo/MindsDesire.java |   2 +-
 .../mage/sets/judgepromo/MishrasFactory.java  |   2 +-
 .../src/mage/sets/judgepromo/Morphling.java   |   2 +-
 .../mage/sets/judgepromo/NaturalOrder.java    |   2 +-
 .../sets/judgepromo/NekusarTheMindrazer.java  |   2 +-
 .../mage/sets/judgepromo/NobleHierarch.java   |   2 +-
 .../mage/sets/judgepromo/OathOfDruids.java    |   2 +-
 .../sets/judgepromo/OloroAgelessAscetic.java  |   2 +-
 .../src/mage/sets/judgepromo/OrimsChant.java  |   2 +-
 .../sets/judgepromo/OverwhelmingForces.java   |   2 +-
 .../mage/sets/judgepromo/PerniciousDeed.java  |   2 +-
 .../sets/judgepromo/PhyrexianDreadnought.java |   2 +-
 .../sets/judgepromo/PhyrexianNegator.java     |   2 +-
 .../mage/sets/judgepromo/PollutedDelta.java   |   2 +-
 .../mage/sets/judgepromo/RavagesOfWar.java    |   2 +-
 .../mage/sets/judgepromo/RavenousBaloth.java  |   2 +-
 .../src/mage/sets/judgepromo/Regrowth.java    |   2 +-
 .../sets/judgepromo/RikuOfTwoReflections.java |   2 +-
 .../mage/sets/judgepromo/RishadanPort.java    |   2 +-
 .../mage/sets/judgepromo/ShardlessAgent.java  |   2 +-
 .../src/mage/sets/judgepromo/ShowAndTell.java |   2 +-
 .../src/mage/sets/judgepromo/Sinkhole.java    |   2 +-
 .../src/mage/sets/judgepromo/SneakAttack.java |   2 +-
 .../src/mage/sets/judgepromo/SolRing.java     |   2 +-
 .../src/mage/sets/judgepromo/Stifle.java      |   2 +-
 .../mage/sets/judgepromo/StrokeOfGenius.java  |   2 +-
 .../sets/judgepromo/SurvivalOfTheFittest.java |   2 +-
 .../judgepromo/SwordOfFeastAndFamine.java     |   2 +-
 .../sets/judgepromo/SwordOfFireAndIce.java    |   2 +-
 .../judgepromo/SwordOfLightAndShadow.java     |   2 +-
 .../sets/judgepromo/SwordsToPlowshares.java   |   2 +-
 .../mage/sets/judgepromo/ThawingGlaciers.java |   2 +-
 .../src/mage/sets/judgepromo/TimeWarp.java    |   2 +-
 .../mage/sets/judgepromo/TradewindRider.java  |   2 +-
 .../mage/sets/judgepromo/VampiricTutor.java   |   2 +-
 .../mage/sets/judgepromo/VendilionClique.java |   2 +-
 .../src/mage/sets/judgepromo/Vindicate1.java  |   2 +-
 .../src/mage/sets/judgepromo/Vindicate2.java  |   2 +-
 .../src/mage/sets/judgepromo/Wasteland1.java  |   2 +-
 .../src/mage/sets/judgepromo/Wasteland2.java  |   2 +-
 .../mage/sets/judgepromo/WheelOfFortune.java  |   2 +-
 .../mage/sets/judgepromo/WindsweptHeath.java  |   2 +-
 .../mage/sets/judgepromo/WoodedFoothills.java |   2 +-
 .../sets/judgepromo/XiahouDunTheOneEyed.java  |   2 +-
 .../mage/sets/judgepromo/YawgmothsWill.java   |   2 +-
 .../mage/sets/judgment/AncestorsChosen.java   |   2 +-
 .../mage/sets/judgment/ArcaneTeachings.java   |   2 +-
 .../sets/judgment/BenevolentBodyguard.java    |   2 +-
 .../src/mage/sets/judgment/Chastise.java      |   2 +-
 Mage.Sets/src/mage/sets/judgment/Glory.java   |   2 +-
 .../src/mage/sets/judgment/GuidedStrike.java  |   2 +-
 .../src/mage/sets/judgment/KrosanVerge.java   |   2 +-
 .../mage/sets/judgment/NantukoMonastery.java  |   2 +-
 .../mage/sets/judgment/NullmageAdvocate.java  |   2 +-
 .../mage/sets/judgment/PhantomNantuko.java    |   2 +-
 .../mage/sets/judgment/RayOfRevelation.java   |   2 +-
 .../src/mage/sets/judgment/Scalpelexis.java   |   2 +-
 .../src/mage/sets/judgment/SpiritCairn.java   |   2 +-
 .../mage/sets/judgment/SpurnmageAdvocate.java |   2 +-
 .../mage/sets/judgment/StitchTogether.java    |   2 +-
 .../src/mage/sets/judgment/SuntailHawk.java   |   2 +-
 .../src/mage/sets/judgment/SuturedGhoul.java  |   2 +-
 .../mage/sets/khansoftarkir/ActOfTreason.java |   2 +-
 .../mage/sets/khansoftarkir/ArcLightning.java |   2 +-
 .../sets/khansoftarkir/BloodstainedMire.java  |   2 +-
 .../src/mage/sets/khansoftarkir/Cancel.java   |   2 +-
 .../sets/khansoftarkir/CripplingChill.java    |   2 +-
 .../src/mage/sets/khansoftarkir/Despise.java  |   2 +-
 .../src/mage/sets/khansoftarkir/Erase.java    |   2 +-
 .../sets/khansoftarkir/FloodedStrand.java     |   2 +-
 .../sets/khansoftarkir/IncrementalGrowth.java |   2 +-
 .../mage/sets/khansoftarkir/Naturalize.java   |   2 +-
 .../sets/khansoftarkir/PollutedDelta.java     |   2 +-
 .../sets/khansoftarkir/SeekTheHorizon.java    |   2 +-
 .../src/mage/sets/khansoftarkir/Shatter.java  |   2 +-
 .../sets/khansoftarkir/SmiteTheMonstrous.java |   2 +-
 .../mage/sets/khansoftarkir/TrumpetBlast.java |   2 +-
 .../mage/sets/khansoftarkir/Windstorm.java    |   2 +-
 .../sets/khansoftarkir/WindsweptHeath.java    |   2 +-
 .../sets/khansoftarkir/WoodedFoothills.java   |   2 +-
 .../knightsvsdragons/AlabornCavalier.java     |   2 +-
 .../knightsvsdragons/ArmillarySphere.java     |   2 +-
 .../sets/knightsvsdragons/BenalishLancer.java |   2 +-
 .../knightsvsdragons/BloodmarkMentor.java     |   2 +-
 .../knightsvsdragons/BogardanHellkite.java    |   2 +-
 .../sets/knightsvsdragons/BogardanRager.java  |   2 +-
 .../knightsvsdragons/BreathOfDarigaaz.java    |   2 +-
 .../sets/knightsvsdragons/CaptiveFlame.java   |   2 +-
 .../sets/knightsvsdragons/CaravanEscort.java  |   2 +-
 .../sets/knightsvsdragons/ClawsOfValakut.java |   2 +-
 .../sets/knightsvsdragons/DragonFodder.java   |   2 +-
 .../sets/knightsvsdragons/DragonWhelp.java    |   2 +-
 .../sets/knightsvsdragons/DragonsClaw.java    |   2 +-
 .../knightsvsdragons/DragonspeakerShaman.java |   2 +-
 .../mage/sets/knightsvsdragons/FieryFall.java |   2 +-
 .../sets/knightsvsdragons/GriffinGuide.java   |   2 +-
 .../mage/sets/knightsvsdragons/HarmsWay.java  |   2 +-
 .../sets/knightsvsdragons/HengeGuardian.java  |   2 +-
 .../sets/knightsvsdragons/HeroesReunion.java  |   2 +-
 .../sets/knightsvsdragons/JawsOfStone.java    |   2 +-
 .../knightsvsdragons/JuniperOrderRanger.java  |   2 +-
 .../knightsvsdragons/KabiraVindicator.java    |   2 +-
 .../knightsvsdragons/KinsbaileCavalier.java   |   2 +-
 .../sets/knightsvsdragons/KnightExemplar.java |   2 +-
 .../knightsvsdragons/KnightOfCliffhaven.java  |   2 +-
 .../knightsvsdragons/KnightOfMeadowgrain.java |   2 +-
 .../KnightOfTheReliquary.java                 |   2 +-
 .../KnightOfTheWhiteOrchid.java               |   2 +-
 .../knightsvsdragons/KnotvinePaladin.java     |   2 +-
 .../knightsvsdragons/LeoninSkyhunter.java     |   2 +-
 .../knightsvsdragons/LionheartMaverick.java   |   2 +-
 .../knightsvsdragons/LoxodonWarhammer.java    |   2 +-
 .../sets/knightsvsdragons/MightyLeap.java     |   2 +-
 .../sets/knightsvsdragons/MordantDragon.java  |   2 +-
 .../MudbuttonTorchrunner.java                 |   2 +-
 .../sets/knightsvsdragons/OblivionRing.java   |   2 +-
 .../sets/knightsvsdragons/PloverKnights.java  |   2 +-
 .../sets/knightsvsdragons/PunishingFire.java  |   2 +-
 .../sets/knightsvsdragons/Reciprocate.java    |   2 +-
 .../mage/sets/knightsvsdragons/Reprisal.java  |   2 +-
 .../sets/knightsvsdragons/SeethingSong.java   |   2 +-
 .../sets/knightsvsdragons/SeismicStrike.java  |   2 +-
 .../sets/knightsvsdragons/SejiriSteppe.java   |   2 +-
 .../knightsvsdragons/SelesnyaSanctuary.java   |   2 +-
 .../sets/knightsvsdragons/ShivanHellkite.java |   2 +-
 .../sets/knightsvsdragons/ShivsEmbrace.java   |   2 +-
 .../sets/knightsvsdragons/SigilBlessing.java  |   2 +-
 .../knightsvsdragons/SkirkProspector.java     |   2 +-
 .../knightsvsdragons/SkyhunterPatrol.java     |   2 +-
 .../sets/knightsvsdragons/SpittingEarth.java  |   2 +-
 .../knightsvsdragons/StewardOfValeron.java    |   2 +-
 .../knightsvsdragons/TemporaryInsanity.java   |   2 +-
 .../sets/knightsvsdragons/TestOfFaith.java    |   2 +-
 .../sets/knightsvsdragons/ThunderDragon.java  |   2 +-
 .../sets/knightsvsdragons/TreetopVillage.java |   2 +-
 .../knightsvsdragons/VoraciousDragon.java     |   2 +-
 .../sets/knightsvsdragons/WhiteKnight.java    |   2 +-
 .../knightsvsdragons/WiltLeafCavaliers.java   |   2 +-
 .../knightsvsdragons/ZhalfirinCommander.java  |   2 +-
 .../mage/sets/launchparty/AjaniVengeant.java  |   2 +-
 .../sets/launchparty/AncientHellkite.java     |   2 +-
 .../sets/launchparty/AngelOfDeliverance.java  |   2 +-
 .../src/mage/sets/launchparty/AntQueen.java   |   2 +-
 .../mage/sets/launchparty/BidentOfThassa.java |   2 +-
 .../mage/sets/launchparty/BlightHerder.java   |   2 +-
 .../sets/launchparty/BreakingEntering.java    |   2 +-
 .../mage/sets/launchparty/ColossalWhale.java  |   2 +-
 .../sets/launchparty/DeadbridgeGoliath.java   |   2 +-
 .../sets/launchparty/DeathbringerRegent.java  |   2 +-
 .../launchparty/DictateOfTheTwinGods.java     |   2 +-
 .../launchparty/DragonThroneOfTarkir.java     |   2 +-
 .../mage/sets/launchparty/EarwigSquad.java    |   2 +-
 .../src/mage/sets/launchparty/Endbringer.java |   2 +-
 .../sets/launchparty/FigureOfDestiny.java     |   2 +-
 .../mage/sets/launchparty/GarruksHorde.java   |   2 +-
 .../mage/sets/launchparty/IdentityThief.java  |   2 +-
 .../mage/sets/launchparty/InGarruksWake.java  |   2 +-
 .../sets/launchparty/JoragaWarcaller.java     |   2 +-
 .../sets/launchparty/KnightOfNewAlara.java    |   2 +-
 .../launchparty/LordOfShatterskullPass.java   |   2 +-
 .../sets/launchparty/LudevicsTestSubject.java |   2 +-
 .../mage/sets/launchparty/MizziumMeddler.java |   2 +-
 .../sets/launchparty/MondronenShaman.java     |   2 +-
 .../mage/sets/launchparty/ObeliskOfAlara.java |   2 +-
 .../sets/launchparty/PhyrexianMetamorph.java  |   2 +-
 .../sets/launchparty/RestorationAngel.java    |   2 +-
 .../sets/launchparty/SandsteppeMastodon.java  |   2 +-
 .../mage/sets/launchparty/SkarrgGoliath.java  |   2 +-
 .../src/mage/sets/launchparty/StaffOfNin.java |   2 +-
 .../mage/sets/launchparty/SteelHellkite.java  |   2 +-
 .../sets/launchparty/ThopterAssembly.java     |   2 +-
 .../mage/sets/launchparty/Tromokratis.java    |   2 +-
 .../launchparty/ValakutTheMoltenPinnacle.java |   2 +-
 .../mage/sets/launchparty/VexingShusher.java  |   2 +-
 .../src/mage/sets/legends/AlchorsTomb.java    |   2 +-
 .../src/mage/sets/legends/ArcadesSabboth.java |   2 +-
 .../src/mage/sets/legends/AzureDrake.java     |   2 +-
 .../mage/sets/legends/BeastsOfBogardan.java   |   2 +-
 Mage.Sets/src/mage/sets/legends/Blight.java   |   2 +-
 .../src/mage/sets/legends/BloodLust.java      |   2 +-
 .../src/mage/sets/legends/Boomerang.java      |   2 +-
 .../src/mage/sets/legends/CarrionAnts.java    |   2 +-
 .../src/mage/sets/legends/CatWarriors.java    |   2 +-
 Mage.Sets/src/mage/sets/legends/Chromium.java |   2 +-
 .../sets/legends/ConcordantCrossroads.java    |   2 +-
 .../src/mage/sets/legends/DAvenantArcher.java |   2 +-
 Mage.Sets/src/mage/sets/legends/Darkness.java |   2 +-
 .../mage/sets/legends/DivineIntervention.java |   2 +-
 .../src/mage/sets/legends/DivineOffering.java |   2 +-
 .../sets/legends/DivineTransformation.java    |   2 +-
 .../src/mage/sets/legends/DurkwoodBoars.java  |   2 +-
 .../src/mage/sets/legends/ElvenRiders.java    |   2 +-
 .../src/mage/sets/legends/EternalWarrior.java |   2 +-
 Mage.Sets/src/mage/sets/legends/Eureka.java   |   2 +-
 .../sets/legends/EvilEyeOfOrmsByGore.java     |   2 +-
 .../src/mage/sets/legends/FallenAngel.java    |   2 +-
 .../src/mage/sets/legends/FireSprites.java    |   2 +-
 .../src/mage/sets/legends/FlashCounter.java   |   2 +-
 .../src/mage/sets/legends/ForceSpike.java     |   2 +-
 .../src/mage/sets/legends/GaseousForm.java    |   2 +-
 .../mage/sets/legends/GhostsOfTheDamned.java  |   2 +-
 .../src/mage/sets/legends/GiantStrength.java  |   2 +-
 Mage.Sets/src/mage/sets/legends/Greed.java    |   2 +-
 Mage.Sets/src/mage/sets/legends/Hellfire.java |   2 +-
 .../src/mage/sets/legends/HellsCaretaker.java |   2 +-
 Mage.Sets/src/mage/sets/legends/HolyDay.java  |   2 +-
 .../src/mage/sets/legends/Immolation.java     |   2 +-
 .../src/mage/sets/legends/JasmineBoreal.java  |   2 +-
 .../src/mage/sets/legends/Juxtapose.java      |   2 +-
 .../src/mage/sets/legends/KeiTakahashi.java   |   2 +-
 .../src/mage/sets/legends/KillerBees.java     |   2 +-
 Mage.Sets/src/mage/sets/legends/Kismet.java   |   2 +-
 .../sets/legends/KoboldDrillSergeant.java     |   2 +-
 .../mage/sets/legends/KoboldTaskmaster.java   |   2 +-
 .../src/mage/sets/legends/LadyCaleria.java    |   2 +-
 .../src/mage/sets/legends/LivonyaSilone.java  |   2 +-
 Mage.Sets/src/mage/sets/legends/LostSoul.java |   2 +-
 .../src/mage/sets/legends/ManaDrain.java      |   2 +-
 .../src/mage/sets/legends/ManaMatrix.java     |   2 +-
 .../src/mage/sets/legends/MossMonster.java    |   2 +-
 .../src/mage/sets/legends/PalladiaMors.java   |   2 +-
 .../src/mage/sets/legends/Pendelhaven.java    |   2 +-
 .../src/mage/sets/legends/PitScorpion.java    |   2 +-
 .../src/mage/sets/legends/PlanarGate.java     |   2 +-
 .../src/mage/sets/legends/PradeshGypsies.java |   2 +-
 .../mage/sets/legends/PrincessLucrezia.java   |   2 +-
 .../src/mage/sets/legends/Pyrotechnics.java   |   2 +-
 .../src/mage/sets/legends/RadjanSpirit.java   |   2 +-
 .../src/mage/sets/legends/RamsesOverdark.java |   2 +-
 Mage.Sets/src/mage/sets/legends/Recall.java   |   2 +-
 .../src/mage/sets/legends/Reincarnation.java  |   2 +-
 .../src/mage/sets/legends/RemoveSoul.java     |   2 +-
 .../mage/sets/legends/RubiniaSoulsinger.java  |   2 +-
 .../mage/sets/legends/SegovianLeviathan.java  |   2 +-
 .../mage/sets/legends/SerpentGenerator.java   |   2 +-
 .../sets/legends/SolkanarTheSwampKing.java    |   2 +-
 .../src/mage/sets/legends/SpiritLink.java     |   2 +-
 .../src/mage/sets/legends/StormSeeker.java    |   2 +-
 .../src/mage/sets/legends/SylvanLibrary.java  |   2 +-
 .../src/mage/sets/legends/SyphonSoul.java     |   2 +-
 .../src/mage/sets/legends/TheWretched.java    |   2 +-
 .../mage/sets/legends/TuknirDeathlock.java    |   2 +-
 .../src/mage/sets/legends/TundraWolves.java   |   2 +-
 .../mage/sets/legends/UnderworldDreams.java   |   2 +-
 .../src/mage/sets/legends/UntamedWilds.java   |   2 +-
 .../mage/sets/legends/VaevictisAsmadi.java    |   2 +-
 .../src/mage/sets/legends/VampireBats.java    |   2 +-
 .../src/mage/sets/legends/WallOfLight.java    |   2 +-
 .../src/mage/sets/legends/WallOfWonder.java   |   2 +-
 .../mage/sets/legends/WhirlingDervish.java    |   2 +-
 .../src/mage/sets/legends/WindsOfChange.java  |   2 +-
 .../src/mage/sets/legends/ZephyrFalcon.java   |   2 +-
 .../mage/sets/legions/AkromaAngelOfWrath.java |   2 +-
 .../mage/sets/legions/ChromeshellCrab.java    |   2 +-
 .../src/mage/sets/legions/Clickslither.java   |   2 +-
 .../mage/sets/legions/CorpseHarvester.java    |   2 +-
 .../src/mage/sets/legions/DeftbladeElite.java |   2 +-
 .../src/mage/sets/legions/EchoTracer.java     |   2 +-
 .../src/mage/sets/legions/EnormousBaloth.java |   2 +-
 .../src/mage/sets/legions/EssenceSliver.java  |   2 +-
 .../src/mage/sets/legions/FeralThrowback.java |   2 +-
 .../mage/sets/legions/FlamewaveInvoker.java   |   2 +-
 .../src/mage/sets/legions/FugitiveWizard.java |   2 +-
 .../src/mage/sets/legions/GempalmStrider.java |   2 +-
 .../src/mage/sets/legions/GravebornMuse.java  |   2 +-
 .../mage/sets/legions/ImperialHellkite.java   |   2 +-
 .../mage/sets/legions/KilnmouthDragon.java    |   2 +-
 .../mage/sets/legions/KrosanCloudscraper.java |   2 +-
 .../src/mage/sets/legions/KrosanVorine.java   |   2 +-
 .../src/mage/sets/legions/LavabornMuse.java   |   2 +-
 .../src/mage/sets/legions/NoxiousGhoul.java   |   2 +-
 .../sets/legions/PhageTheUntouchable.java     |   2 +-
 .../src/mage/sets/legions/SeedbornMuse.java   |   2 +-
 .../mage/sets/legions/SkirkDrillSergeant.java |   2 +-
 .../mage/sets/legions/StarlightInvoker.java   |   2 +-
 .../src/mage/sets/legions/StoicChampion.java  |   2 +-
 .../mage/sets/legions/StonewoodInvoker.java   |   2 +-
 .../src/mage/sets/legions/TimberwatchElf.java |   2 +-
 .../mage/sets/legions/VoidmageApprentice.java |   2 +-
 .../src/mage/sets/legions/WallOfDeceit.java   |   2 +-
 .../src/mage/sets/legions/WhiteKnight.java    |   2 +-
 .../src/mage/sets/legions/Willbender.java     |   2 +-
 .../src/mage/sets/legions/WindbornMuse.java   |   2 +-
 .../src/mage/sets/legions/WitheredWretch.java |   2 +-
 .../mage/sets/limitedalpha/AirElemental.java  |   2 +-
 .../mage/sets/limitedalpha/Armageddon.java    |   2 +-
 .../src/mage/sets/limitedalpha/BadMoon.java   |   2 +-
 .../src/mage/sets/limitedalpha/Balance.java   |   2 +-
 .../sets/limitedalpha/BirdsOfParadise.java    |   2 +-
 .../mage/sets/limitedalpha/BlackKnight.java   |   2 +-
 .../src/mage/sets/limitedalpha/BlackWard.java |   2 +-
 .../src/mage/sets/limitedalpha/Blessing.java  |   2 +-
 .../src/mage/sets/limitedalpha/BlueWard.java  |   2 +-
 .../src/mage/sets/limitedalpha/BogWraith.java |   2 +-
 .../src/mage/sets/limitedalpha/Channel.java   |   2 +-
 .../src/mage/sets/limitedalpha/Chaoslace.java |   2 +-
 .../limitedalpha/CircleOfProtectionBlue.java  |   2 +-
 .../limitedalpha/CircleOfProtectionGreen.java |   2 +-
 .../limitedalpha/CircleOfProtectionRed.java   |   2 +-
 .../limitedalpha/CircleOfProtectionWhite.java |   2 +-
 .../src/mage/sets/limitedalpha/Clone.java     |   2 +-
 .../mage/sets/limitedalpha/Counterspell.java  |   2 +-
 .../src/mage/sets/limitedalpha/CrawWurm.java  |   2 +-
 .../src/mage/sets/limitedalpha/Crusade.java   |   2 +-
 .../mage/sets/limitedalpha/CursedLand.java    |   2 +-
 .../mage/sets/limitedalpha/DarkRitual.java    |   2 +-
 .../src/mage/sets/limitedalpha/Deathgrip.java |   2 +-
 .../src/mage/sets/limitedalpha/Deathlace.java |   2 +-
 .../mage/sets/limitedalpha/Disenchant.java    |   2 +-
 .../sets/limitedalpha/DisruptingScepter.java  |   2 +-
 .../mage/sets/limitedalpha/DragonWhelp.java   |   2 +-
 .../sets/limitedalpha/DrudgeSkeletons.java    |   2 +-
 .../limitedalpha/DwarvenDemolitionTeam.java   |   2 +-
 .../sets/limitedalpha/DwarvenWarriors.java    |   2 +-
 .../sets/limitedalpha/EarthElemental.java     |   2 +-
 .../src/mage/sets/limitedalpha/Earthbind.java |   2 +-
 .../mage/sets/limitedalpha/Earthquake.java    |   2 +-
 .../mage/sets/limitedalpha/ElvishArchers.java |   2 +-
 .../mage/sets/limitedalpha/EvilPresence.java  |   2 +-
 .../src/mage/sets/limitedalpha/Farmstead.java |   2 +-
 .../src/mage/sets/limitedalpha/Fear.java      |   2 +-
 .../mage/sets/limitedalpha/FireElemental.java |   2 +-
 .../src/mage/sets/limitedalpha/Fireball.java  |   2 +-
 .../mage/sets/limitedalpha/Firebreathing.java |   2 +-
 .../mage/sets/limitedalpha/Flashfires.java    |   2 +-
 .../src/mage/sets/limitedalpha/Flight.java    |   2 +-
 Mage.Sets/src/mage/sets/limitedalpha/Fog.java |   2 +-
 .../mage/sets/limitedalpha/ForceOfNature.java |   2 +-
 .../mage/sets/limitedalpha/Forcefield.java    |   2 +-
 .../src/mage/sets/limitedalpha/Fork.java      |   2 +-
 .../mage/sets/limitedalpha/GiantGrowth.java   |   2 +-
 .../mage/sets/limitedalpha/GiantSpider.java   |   2 +-
 .../limitedalpha/GoblinBalloonBrigade.java    |   2 +-
 .../mage/sets/limitedalpha/GoblinKing.java    |   2 +-
 .../sets/limitedalpha/GraniteGargoyle.java    |   2 +-
 .../src/mage/sets/limitedalpha/GrayOgre.java  |   2 +-
 .../src/mage/sets/limitedalpha/GreenWard.java |   2 +-
 .../mage/sets/limitedalpha/GrizzlyBears.java  |   2 +-
 .../mage/sets/limitedalpha/HealingSalve.java  |   2 +-
 .../src/mage/sets/limitedalpha/HillGiant.java |   2 +-
 .../src/mage/sets/limitedalpha/HolyArmor.java |   2 +-
 .../mage/sets/limitedalpha/HolyStrength.java  |   2 +-
 .../mage/sets/limitedalpha/HowlingMine.java   |   2 +-
 .../sets/limitedalpha/HurloonMinotaur.java    |   2 +-
 .../sets/limitedalpha/HypnoticSpecter.java    |   2 +-
 .../sets/limitedalpha/IcyManipulator.java     |   2 +-
 .../mage/sets/limitedalpha/InstillEnergy.java |   2 +-
 .../sets/limitedalpha/IronrootTreefolk.java   |   2 +-
 .../mage/sets/limitedalpha/JayemdaeTome.java  |   2 +-
 .../mage/sets/limitedalpha/Juggernaut.java    |   2 +-
 .../src/mage/sets/limitedalpha/Jump.java      |   2 +-
 .../src/mage/sets/limitedalpha/Karma.java     |   2 +-
 .../mage/sets/limitedalpha/KeldonWarlord.java |   2 +-
 .../mage/sets/limitedalpha/LibraryOfLeng.java |   2 +-
 .../src/mage/sets/limitedalpha/Lich.java      |   2 +-
 .../src/mage/sets/limitedalpha/Lifeforce.java |   2 +-
 .../src/mage/sets/limitedalpha/Lifetap.java   |   2 +-
 .../mage/sets/limitedalpha/LightningBolt.java |   2 +-
 .../sets/limitedalpha/LivingArtifact.java     |   2 +-
 .../mage/sets/limitedalpha/LivingWall.java    |   2 +-
 .../mage/sets/limitedalpha/LlanowarElves.java |   2 +-
 .../sets/limitedalpha/LordOfAtlantis.java     |   2 +-
 .../mage/sets/limitedalpha/LordOfThePit.java  |   2 +-
 .../src/mage/sets/limitedalpha/Lure.java      |   2 +-
 .../mage/sets/limitedalpha/MahamotiDjinn.java |   2 +-
 .../src/mage/sets/limitedalpha/ManaFlare.java |   2 +-
 .../src/mage/sets/limitedalpha/Manabarbs.java |   2 +-
 .../MerfolkOfThePearlTrident.java             |   2 +-
 .../sets/limitedalpha/MonssGoblinRaiders.java |   2 +-
 .../sets/limitedalpha/NevinyrralsDisk.java    |   2 +-
 .../src/mage/sets/limitedalpha/Nightmare.java |   2 +-
 .../mage/sets/limitedalpha/ObsianusGolem.java |   2 +-
 .../sets/limitedalpha/OrcishArtillery.java    |   2 +-
 .../sets/limitedalpha/PearledUnicorn.java     |   2 +-
 .../mage/sets/limitedalpha/Pestilence.java    |   2 +-
 .../sets/limitedalpha/PhantasmalForces.java   |   2 +-
 .../sets/limitedalpha/PhantomMonster.java     |   2 +-
 .../mage/sets/limitedalpha/PlagueRats.java    |   2 +-
 .../sets/limitedalpha/ProdigalSorcerer.java   |   2 +-
 .../mage/sets/limitedalpha/PsionicBlast.java  |   2 +-
 .../src/mage/sets/limitedalpha/Purelace.java  |   2 +-
 .../src/mage/sets/limitedalpha/RaiseDead.java |   2 +-
 .../src/mage/sets/limitedalpha/RedWard.java   |   2 +-
 .../mage/sets/limitedalpha/Regeneration.java  |   2 +-
 .../mage/sets/limitedalpha/Righteousness.java |   2 +-
 .../src/mage/sets/limitedalpha/RodOfRuin.java |   2 +-
 .../mage/sets/limitedalpha/RoyalAssassin.java |   2 +-
 .../src/mage/sets/limitedalpha/Sacrifice.java |   2 +-
 .../mage/sets/limitedalpha/SamiteHealer.java  |   2 +-
 .../mage/sets/limitedalpha/SavannahLions.java |   2 +-
 .../mage/sets/limitedalpha/ScatheZombies.java |   2 +-
 .../mage/sets/limitedalpha/ScrybSprites.java  |   2 +-
 .../mage/sets/limitedalpha/SedgeTroll.java    |   2 +-
 .../mage/sets/limitedalpha/SengirVampire.java |   2 +-
 .../mage/sets/limitedalpha/SerraAngel.java    |   2 +-
 .../sets/limitedalpha/ShanodinDryads.java     |   2 +-
 .../src/mage/sets/limitedalpha/Shatter.java   |   2 +-
 .../mage/sets/limitedalpha/ShivanDragon.java  |   2 +-
 .../mage/sets/limitedalpha/SirensCall.java    |   2 +-
 .../src/mage/sets/limitedalpha/SolRing.java   |   2 +-
 .../src/mage/sets/limitedalpha/Stasis.java    |   2 +-
 .../mage/sets/limitedalpha/StealArtifact.java |   2 +-
 .../mage/sets/limitedalpha/StoneGiant.java    |   2 +-
 .../src/mage/sets/limitedalpha/StoneRain.java |   2 +-
 .../mage/sets/limitedalpha/StreamOfLife.java  |   2 +-
 .../sets/limitedalpha/SwordsToPlowshares.java |   2 +-
 .../src/mage/sets/limitedalpha/Terror.java    |   2 +-
 .../src/mage/sets/limitedalpha/TheHive.java   |   2 +-
 .../mage/sets/limitedalpha/Thoughtlace.java   |   2 +-
 .../src/mage/sets/limitedalpha/TimeVault.java |   2 +-
 .../mage/sets/limitedalpha/Tranquility.java   |   2 +-
 .../src/mage/sets/limitedalpha/Tsunami.java   |   2 +-
 .../src/mage/sets/limitedalpha/Tunnel.java    |   2 +-
 .../src/mage/sets/limitedalpha/Twiddle.java   |   2 +-
 .../limitedalpha/TwoHeadedGiantOfForiys.java  |   2 +-
 .../sets/limitedalpha/UnholyStrength.java     |   2 +-
 .../src/mage/sets/limitedalpha/Unsummon.java  |   2 +-
 .../limitedalpha/VerduranEnchantress.java     |   2 +-
 .../limitedalpha/VesuvanDoppelganger.java     |   2 +-
 .../sets/limitedalpha/VolcanicEruption.java   |   2 +-
 .../src/mage/sets/limitedalpha/WallOfAir.java |   2 +-
 .../mage/sets/limitedalpha/WallOfBone.java    |   2 +-
 .../mage/sets/limitedalpha/WallOfFire.java    |   2 +-
 .../src/mage/sets/limitedalpha/WallOfIce.java |   2 +-
 .../mage/sets/limitedalpha/WallOfStone.java   |   2 +-
 .../mage/sets/limitedalpha/WallOfSwords.java  |   2 +-
 .../mage/sets/limitedalpha/WallOfWood.java    |   2 +-
 .../mage/sets/limitedalpha/Wanderlust.java    |   2 +-
 .../mage/sets/limitedalpha/WarMammoth.java    |   2 +-
 .../mage/sets/limitedalpha/WarpArtifact.java  |   2 +-
 .../sets/limitedalpha/WaterElemental.java     |   2 +-
 .../src/mage/sets/limitedalpha/Weakness.java  |   2 +-
 .../mage/sets/limitedalpha/WhiteKnight.java   |   2 +-
 .../src/mage/sets/limitedalpha/WhiteWard.java |   2 +-
 .../mage/sets/limitedalpha/WildGrowth.java    |   2 +-
 .../mage/sets/limitedalpha/WrathOfGod.java    |   2 +-
 .../mage/sets/limitedbeta/AirElemental.java   |   2 +-
 .../sets/limitedbeta/AncestralRecall.java     |   2 +-
 .../mage/sets/limitedbeta/AnimateDead.java    |   2 +-
 .../mage/sets/limitedbeta/AnimateWall.java    |   2 +-
 .../mage/sets/limitedbeta/AnkhOfMishra.java   |   2 +-
 .../src/mage/sets/limitedbeta/Armageddon.java |   2 +-
 .../mage/sets/limitedbeta/AspectOfWolf.java   |   2 +-
 .../src/mage/sets/limitedbeta/BadMoon.java    |   2 +-
 .../src/mage/sets/limitedbeta/Badlands.java   |   2 +-
 .../mage/sets/limitedbeta/BasaltMonolith.java |   2 +-
 .../src/mage/sets/limitedbeta/Bayou.java      |   2 +-
 .../src/mage/sets/limitedbeta/Berserk.java    |   2 +-
 .../sets/limitedbeta/BirdsOfParadise.java     |   2 +-
 .../mage/sets/limitedbeta/BlackKnight.java    |   2 +-
 .../src/mage/sets/limitedbeta/BlackLotus.java |   2 +-
 .../src/mage/sets/limitedbeta/BlackVise.java  |   2 +-
 .../src/mage/sets/limitedbeta/BlackWard.java  |   2 +-
 .../src/mage/sets/limitedbeta/Blessing.java   |   2 +-
 .../sets/limitedbeta/BlueElementalBlast.java  |   2 +-
 .../src/mage/sets/limitedbeta/BlueWard.java   |   2 +-
 .../src/mage/sets/limitedbeta/BogWraith.java  |   2 +-
 .../mage/sets/limitedbeta/Braingeyser.java    |   2 +-
 .../src/mage/sets/limitedbeta/Burrowing.java  |   2 +-
 .../src/mage/sets/limitedbeta/Castle.java     |   2 +-
 .../mage/sets/limitedbeta/CelestialPrism.java |   2 +-
 .../src/mage/sets/limitedbeta/Channel.java    |   2 +-
 .../src/mage/sets/limitedbeta/Chaoslace.java  |   2 +-
 .../limitedbeta/CircleOfProtectionBlack.java  |   2 +-
 .../limitedbeta/CircleOfProtectionBlue.java   |   2 +-
 .../limitedbeta/CircleOfProtectionGreen.java  |   2 +-
 .../limitedbeta/CircleOfProtectionRed.java    |   2 +-
 .../limitedbeta/CircleOfProtectionWhite.java  |   2 +-
 .../mage/sets/limitedbeta/ClockworkBeast.java |   2 +-
 .../src/mage/sets/limitedbeta/Clone.java      |   2 +-
 .../src/mage/sets/limitedbeta/Cockatrice.java |   2 +-
 .../mage/sets/limitedbeta/Conservator.java    |   2 +-
 .../mage/sets/limitedbeta/ControlMagic.java   |   2 +-
 .../src/mage/sets/limitedbeta/Conversion.java |   2 +-
 .../mage/sets/limitedbeta/CopperTablet.java   |   2 +-
 .../mage/sets/limitedbeta/CopyArtifact.java   |   2 +-
 .../mage/sets/limitedbeta/Counterspell.java   |   2 +-
 .../src/mage/sets/limitedbeta/CrawWurm.java   |   2 +-
 .../src/mage/sets/limitedbeta/Crusade.java    |   2 +-
 .../src/mage/sets/limitedbeta/CrystalRod.java |   2 +-
 .../src/mage/sets/limitedbeta/CursedLand.java |   2 +-
 .../src/mage/sets/limitedbeta/DarkRitual.java |   2 +-
 .../src/mage/sets/limitedbeta/DeathWard.java  |   2 +-
 .../mage/sets/limitedbeta/DemonicHordes.java  |   2 +-
 .../mage/sets/limitedbeta/DemonicTutor.java   |   2 +-
 .../src/mage/sets/limitedbeta/DingusEgg.java  |   2 +-
 .../src/mage/sets/limitedbeta/Disenchant.java |   2 +-
 .../mage/sets/limitedbeta/Disintegrate.java   |   2 +-
 .../sets/limitedbeta/DisruptingScepter.java   |   2 +-
 .../mage/sets/limitedbeta/DragonWhelp.java    |   2 +-
 .../src/mage/sets/limitedbeta/DrainLife.java  |   2 +-
 .../sets/limitedbeta/DrudgeSkeletons.java     |   2 +-
 .../limitedbeta/DwarvenDemolitionTeam.java    |   2 +-
 .../sets/limitedbeta/DwarvenWarriors.java     |   2 +-
 .../mage/sets/limitedbeta/EarthElemental.java |   2 +-
 .../src/mage/sets/limitedbeta/Earthquake.java |   2 +-
 .../mage/sets/limitedbeta/ElvishArchers.java  |   2 +-
 .../mage/sets/limitedbeta/EvilPresence.java   |   2 +-
 .../src/mage/sets/limitedbeta/Farmstead.java  |   2 +-
 .../src/mage/sets/limitedbeta/Fastbond.java   |   2 +-
 Mage.Sets/src/mage/sets/limitedbeta/Fear.java |   2 +-
 .../src/mage/sets/limitedbeta/Feedback.java   |   2 +-
 .../mage/sets/limitedbeta/FireElemental.java  |   2 +-
 .../src/mage/sets/limitedbeta/Fireball.java   |   2 +-
 .../mage/sets/limitedbeta/Firebreathing.java  |   2 +-
 .../src/mage/sets/limitedbeta/Flashfires.java |   2 +-
 .../src/mage/sets/limitedbeta/Flight.java     |   2 +-
 Mage.Sets/src/mage/sets/limitedbeta/Fog.java  |   2 +-
 .../mage/sets/limitedbeta/ForceOfNature.java  |   2 +-
 .../src/mage/sets/limitedbeta/Forcefield.java |   2 +-
 .../mage/sets/limitedbeta/FrozenShade.java    |   2 +-
 .../src/mage/sets/limitedbeta/Fungusaur.java  |   2 +-
 .../sets/limitedbeta/GauntletOfMight.java     |   2 +-
 .../mage/sets/limitedbeta/GiantGrowth.java    |   2 +-
 .../mage/sets/limitedbeta/GiantSpider.java    |   2 +-
 .../mage/sets/limitedbeta/GlassesOfUrza.java  |   2 +-
 .../src/mage/sets/limitedbeta/Gloom.java      |   2 +-
 .../limitedbeta/GoblinBalloonBrigade.java     |   2 +-
 .../src/mage/sets/limitedbeta/GoblinKing.java |   2 +-
 .../sets/limitedbeta/GraniteGargoyle.java     |   2 +-
 .../src/mage/sets/limitedbeta/GrayOgre.java   |   2 +-
 .../src/mage/sets/limitedbeta/GreenWard.java  |   2 +-
 .../mage/sets/limitedbeta/GrizzlyBears.java   |   2 +-
 .../mage/sets/limitedbeta/HealingSalve.java   |   2 +-
 .../src/mage/sets/limitedbeta/HillGiant.java  |   2 +-
 .../src/mage/sets/limitedbeta/HolyArmor.java  |   2 +-
 .../mage/sets/limitedbeta/HolyStrength.java   |   2 +-
 .../mage/sets/limitedbeta/HowlFromBeyond.java |   2 +-
 .../mage/sets/limitedbeta/HowlingMine.java    |   2 +-
 .../sets/limitedbeta/HurloonMinotaur.java     |   2 +-
 .../src/mage/sets/limitedbeta/Hurricane.java  |   2 +-
 .../sets/limitedbeta/HypnoticSpecter.java     |   2 +-
 .../src/mage/sets/limitedbeta/IceStorm.java   |   2 +-
 .../mage/sets/limitedbeta/IcyManipulator.java |   2 +-
 .../mage/sets/limitedbeta/InstillEnergy.java  |   2 +-
 .../mage/sets/limitedbeta/Invisibility.java   |   2 +-
 .../src/mage/sets/limitedbeta/IronStar.java   |   2 +-
 .../mage/sets/limitedbeta/IronclawOrcs.java   |   2 +-
 .../sets/limitedbeta/IronrootTreefolk.java    |   2 +-
 .../sets/limitedbeta/IslandSanctuary.java     |   2 +-
 .../src/mage/sets/limitedbeta/IvoryCup.java   |   2 +-
 .../mage/sets/limitedbeta/JadeMonolith.java   |   2 +-
 .../mage/sets/limitedbeta/JayemdaeTome.java   |   2 +-
 .../src/mage/sets/limitedbeta/Juggernaut.java |   2 +-
 Mage.Sets/src/mage/sets/limitedbeta/Jump.java |   2 +-
 .../src/mage/sets/limitedbeta/Karma.java      |   2 +-
 .../mage/sets/limitedbeta/KeldonWarlord.java  |   2 +-
 .../src/mage/sets/limitedbeta/KormusBell.java |   2 +-
 .../src/mage/sets/limitedbeta/Lance.java      |   2 +-
 .../src/mage/sets/limitedbeta/LeyDruid.java   |   2 +-
 Mage.Sets/src/mage/sets/limitedbeta/Lich.java |   2 +-
 .../src/mage/sets/limitedbeta/Lifeforce.java  |   2 +-
 .../src/mage/sets/limitedbeta/Lifelace.java   |   2 +-
 .../src/mage/sets/limitedbeta/Lifetap.java    |   2 +-
 .../mage/sets/limitedbeta/LightningBolt.java  |   2 +-
 .../mage/sets/limitedbeta/LivingArtifact.java |   2 +-
 .../mage/sets/limitedbeta/LivingLands.java    |   2 +-
 .../src/mage/sets/limitedbeta/LivingWall.java |   2 +-
 .../mage/sets/limitedbeta/LlanowarElves.java  |   2 +-
 .../mage/sets/limitedbeta/LordOfAtlantis.java |   2 +-
 .../mage/sets/limitedbeta/LordOfThePit.java   |   2 +-
 Mage.Sets/src/mage/sets/limitedbeta/Lure.java |   2 +-
 .../mage/sets/limitedbeta/MahamotiDjinn.java  |   2 +-
 .../src/mage/sets/limitedbeta/ManaFlare.java  |   2 +-
 .../src/mage/sets/limitedbeta/ManaShort.java  |   2 +-
 .../src/mage/sets/limitedbeta/ManaVault.java  |   2 +-
 .../src/mage/sets/limitedbeta/Manabarbs.java  |   2 +-
 .../src/mage/sets/limitedbeta/Meekstone.java  |   2 +-
 .../limitedbeta/MerfolkOfThePearlTrident.java |   2 +-
 .../src/mage/sets/limitedbeta/MindTwist.java  |   2 +-
 .../sets/limitedbeta/MonssGoblinRaiders.java  |   2 +-
 .../src/mage/sets/limitedbeta/MoxEmerald.java |   2 +-
 .../src/mage/sets/limitedbeta/MoxJet.java     |   2 +-
 .../src/mage/sets/limitedbeta/MoxPearl.java   |   2 +-
 .../src/mage/sets/limitedbeta/MoxRuby.java    |   2 +-
 .../mage/sets/limitedbeta/MoxSapphire.java    |   2 +-
 .../sets/limitedbeta/NaturalSelection.java    |   2 +-
 .../mage/sets/limitedbeta/NetherShadow.java   |   2 +-
 .../sets/limitedbeta/NevinyrralsDisk.java     |   2 +-
 .../src/mage/sets/limitedbeta/Nightmare.java  |   2 +-
 .../sets/limitedbeta/NorthernPaladin.java     |   2 +-
 .../mage/sets/limitedbeta/ObsianusGolem.java  |   2 +-
 .../sets/limitedbeta/OrcishArtillery.java     |   2 +-
 .../sets/limitedbeta/OrcishOriflamme.java     |   2 +-
 .../src/mage/sets/limitedbeta/Paralyze.java   |   2 +-
 .../mage/sets/limitedbeta/PearledUnicorn.java |   2 +-
 .../src/mage/sets/limitedbeta/Pestilence.java |   2 +-
 .../sets/limitedbeta/PhantasmalForces.java    |   2 +-
 .../sets/limitedbeta/PhantasmalTerrain.java   |   2 +-
 .../mage/sets/limitedbeta/PhantomMonster.java |   2 +-
 .../src/mage/sets/limitedbeta/PirateShip.java |   2 +-
 .../src/mage/sets/limitedbeta/PlagueRats.java |   2 +-
 .../src/mage/sets/limitedbeta/Plateau.java    |   2 +-
 .../src/mage/sets/limitedbeta/PowerSink.java  |   2 +-
 .../sets/limitedbeta/ProdigalSorcerer.java    |   2 +-
 .../mage/sets/limitedbeta/PsionicBlast.java   |   2 +-
 .../mage/sets/limitedbeta/PsychicVenom.java   |   2 +-
 .../src/mage/sets/limitedbeta/Purelace.java   |   2 +-
 .../src/mage/sets/limitedbeta/RaiseDead.java  |   2 +-
 .../sets/limitedbeta/RedElementalBlast.java   |   2 +-
 .../src/mage/sets/limitedbeta/RedWard.java    |   2 +-
 .../mage/sets/limitedbeta/Regeneration.java   |   2 +-
 .../src/mage/sets/limitedbeta/Regrowth.java   |   2 +-
 .../mage/sets/limitedbeta/Resurrection.java   |   2 +-
 .../mage/sets/limitedbeta/ReverseDamage.java  |   2 +-
 .../mage/sets/limitedbeta/Righteousness.java  |   2 +-
 .../sets/limitedbeta/RocOfKherRidges.java     |   2 +-
 .../src/mage/sets/limitedbeta/RodOfRuin.java  |   2 +-
 .../mage/sets/limitedbeta/RoyalAssassin.java  |   2 +-
 .../src/mage/sets/limitedbeta/Sacrifice.java  |   2 +-
 .../mage/sets/limitedbeta/SamiteHealer.java   |   2 +-
 .../src/mage/sets/limitedbeta/Savannah.java   |   2 +-
 .../mage/sets/limitedbeta/SavannahLions.java  |   2 +-
 .../mage/sets/limitedbeta/ScatheZombies.java  |   2 +-
 .../sets/limitedbeta/ScavengingGhoul.java     |   2 +-
 .../src/mage/sets/limitedbeta/Scrubland.java  |   2 +-
 .../mage/sets/limitedbeta/ScrybSprites.java   |   2 +-
 .../src/mage/sets/limitedbeta/SeaSerpent.java |   2 +-
 .../src/mage/sets/limitedbeta/SedgeTroll.java |   2 +-
 .../mage/sets/limitedbeta/SengirVampire.java  |   2 +-
 .../src/mage/sets/limitedbeta/SerraAngel.java |   2 +-
 .../mage/sets/limitedbeta/ShanodinDryads.java |   2 +-
 .../src/mage/sets/limitedbeta/Shatter.java    |   2 +-
 .../mage/sets/limitedbeta/ShivanDragon.java   |   2 +-
 .../src/mage/sets/limitedbeta/Sinkhole.java   |   2 +-
 .../src/mage/sets/limitedbeta/SirensCall.java |   2 +-
 .../src/mage/sets/limitedbeta/Smoke.java      |   2 +-
 .../src/mage/sets/limitedbeta/SolRing.java    |   2 +-
 .../src/mage/sets/limitedbeta/SoulNet.java    |   2 +-
 .../src/mage/sets/limitedbeta/SpellBlast.java |   2 +-
 .../src/mage/sets/limitedbeta/Stasis.java     |   2 +-
 .../mage/sets/limitedbeta/StealArtifact.java  |   2 +-
 .../src/mage/sets/limitedbeta/StoneGiant.java |   2 +-
 .../src/mage/sets/limitedbeta/StoneRain.java  |   2 +-
 .../mage/sets/limitedbeta/StreamOfLife.java   |   2 +-
 .../sets/limitedbeta/SunglassesOfUrza.java    |   2 +-
 .../sets/limitedbeta/SwordsToPlowshares.java  |   2 +-
 .../src/mage/sets/limitedbeta/Taiga.java      |   2 +-
 .../src/mage/sets/limitedbeta/Terror.java     |   2 +-
 .../src/mage/sets/limitedbeta/TheHive.java    |   2 +-
 .../sets/limitedbeta/ThicketBasilisk.java     |   2 +-
 .../mage/sets/limitedbeta/ThroneOfBone.java   |   2 +-
 .../src/mage/sets/limitedbeta/TimeVault.java  |   2 +-
 .../src/mage/sets/limitedbeta/TimeWalk.java   |   2 +-
 .../mage/sets/limitedbeta/Timetwister.java    |   2 +-
 .../mage/sets/limitedbeta/Tranquility.java    |   2 +-
 .../mage/sets/limitedbeta/TropicalIsland.java |   2 +-
 .../src/mage/sets/limitedbeta/Tsunami.java    |   2 +-
 .../src/mage/sets/limitedbeta/Tundra.java     |   2 +-
 .../src/mage/sets/limitedbeta/Tunnel.java     |   2 +-
 .../src/mage/sets/limitedbeta/Twiddle.java    |   2 +-
 .../limitedbeta/TwoHeadedGiantOfForiys.java   |   2 +-
 .../mage/sets/limitedbeta/UndergroundSea.java |   2 +-
 .../mage/sets/limitedbeta/UnholyStrength.java |   2 +-
 .../src/mage/sets/limitedbeta/Unsummon.java   |   2 +-
 .../mage/sets/limitedbeta/UthdenTroll.java    |   2 +-
 .../sets/limitedbeta/VerduranEnchantress.java |   2 +-
 .../sets/limitedbeta/VesuvanDoppelganger.java |   2 +-
 .../sets/limitedbeta/VolcanicEruption.java    |   2 +-
 .../mage/sets/limitedbeta/VolcanicIsland.java |   2 +-
 .../src/mage/sets/limitedbeta/WallOfAir.java  |   2 +-
 .../src/mage/sets/limitedbeta/WallOfBone.java |   2 +-
 .../mage/sets/limitedbeta/WallOfBrambles.java |   2 +-
 .../src/mage/sets/limitedbeta/WallOfFire.java |   2 +-
 .../src/mage/sets/limitedbeta/WallOfIce.java  |   2 +-
 .../mage/sets/limitedbeta/WallOfStone.java    |   2 +-
 .../mage/sets/limitedbeta/WallOfSwords.java   |   2 +-
 .../mage/sets/limitedbeta/WallOfWater.java    |   2 +-
 .../src/mage/sets/limitedbeta/WallOfWood.java |   2 +-
 .../src/mage/sets/limitedbeta/Wanderlust.java |   2 +-
 .../src/mage/sets/limitedbeta/WarMammoth.java |   2 +-
 .../mage/sets/limitedbeta/WarpArtifact.java   |   2 +-
 .../mage/sets/limitedbeta/WaterElemental.java |   2 +-
 .../src/mage/sets/limitedbeta/Weakness.java   |   2 +-
 Mage.Sets/src/mage/sets/limitedbeta/Web.java  |   2 +-
 .../mage/sets/limitedbeta/WheelOfFortune.java |   2 +-
 .../mage/sets/limitedbeta/WhiteKnight.java    |   2 +-
 .../src/mage/sets/limitedbeta/WildGrowth.java |   2 +-
 .../mage/sets/limitedbeta/WillOTheWisp.java   |   2 +-
 .../src/mage/sets/limitedbeta/WinterOrb.java  |   2 +-
 .../mage/sets/limitedbeta/WoodenSphere.java   |   2 +-
 .../src/mage/sets/limitedbeta/WrathOfGod.java |   2 +-
 .../mage/sets/limitedbeta/ZombieMaster.java   |   2 +-
 .../src/mage/sets/lorwyn/AEthersnipe.java     |   2 +-
 .../src/mage/sets/lorwyn/AjaniGoldmane.java   |   2 +-
 .../src/mage/sets/lorwyn/AustereCommand.java  |   2 +-
 .../src/mage/sets/lorwyn/BlindSpotGiant.java  |   2 +-
 .../mage/sets/lorwyn/BoggartShenanigans.java  |   2 +-
 Mage.Sets/src/mage/sets/lorwyn/Briarhorn.java |   2 +-
 .../src/mage/sets/lorwyn/BrionStoutarm.java   |   2 +-
 .../src/mage/sets/lorwyn/ChandraNalaar.java   |   2 +-
 .../src/mage/sets/lorwyn/CrushUnderfoot.java  |   2 +-
 .../mage/sets/lorwyn/DreamspoilerWitches.java |   2 +-
 .../src/mage/sets/lorwyn/Faultgrinder.java    |   2 +-
 .../src/mage/sets/lorwyn/FertileGround.java   |   2 +-
 .../mage/sets/lorwyn/FireBellyChangeling.java |   2 +-
 .../mage/sets/lorwyn/FlamekinHarbinger.java   |   2 +-
 .../src/mage/sets/lorwyn/FootbottomFeast.java |   2 +-
 .../src/mage/sets/lorwyn/GalepowderMage.java  |   2 +-
 .../mage/sets/lorwyn/GarrukWildspeaker.java   |   2 +-
 .../mage/sets/lorwyn/GoldmeadowHarrier.java   |   2 +-
 .../mage/sets/lorwyn/HamletbackGoliath.java   |   2 +-
 Mage.Sets/src/mage/sets/lorwyn/Hostility.java |   2 +-
 .../mage/sets/lorwyn/IncendiaryCommand.java   |   2 +-
 .../mage/sets/lorwyn/IncrementalGrowth.java   |   2 +-
 .../src/mage/sets/lorwyn/JaceBeleren.java     |   2 +-
 .../mage/sets/lorwyn/KithkinGreatheart.java   |   2 +-
 Mage.Sets/src/mage/sets/lorwyn/LashOut.java   |   2 +-
 .../src/mage/sets/lorwyn/LilianaVess.java     |   2 +-
 .../mage/sets/lorwyn/MakeshiftMannequin.java  |   2 +-
 .../src/mage/sets/lorwyn/MarshFlitter.java    |   2 +-
 .../src/mage/sets/lorwyn/MaskedAdmirers.java  |   2 +-
 .../mage/sets/lorwyn/MoongloveExtract.java    |   2 +-
 .../src/mage/sets/lorwyn/MosswortBridge.java  |   2 +-
 .../src/mage/sets/lorwyn/Mulldrifter.java     |   2 +-
 .../src/mage/sets/lorwyn/OblivionRing.java    |   2 +-
 .../src/mage/sets/lorwyn/Peppersmoke.java     |   2 +-
 .../src/mage/sets/lorwyn/PollenLullaby.java   |   2 +-
 Mage.Sets/src/mage/sets/lorwyn/Ponder.java    |   2 +-
 .../src/mage/sets/lorwyn/ProfaneCommand.java  |   2 +-
 .../src/mage/sets/lorwyn/RunedStalactite.java |   2 +-
 .../mage/sets/lorwyn/ScatteringStroke.java    |   2 +-
 Mage.Sets/src/mage/sets/lorwyn/Shriekmaw.java |   2 +-
 .../src/mage/sets/lorwyn/Smokebraider.java    |   2 +-
 .../src/mage/sets/lorwyn/ThievingSprite.java  |   2 +-
 .../mage/sets/lorwyn/ThousandYearElixir.java  |   2 +-
 .../mage/sets/lorwyn/ThundercloudShaman.java  |   2 +-
 .../src/mage/sets/lorwyn/WarrenPilferers.java |   2 +-
 .../src/mage/sets/lorwyn/WhirlpoolWhelm.java  |   2 +-
 .../src/mage/sets/lorwyn/WildRicochet.java    |   2 +-
 .../mage/sets/magic2010/AngelsFeather.java    |   2 +-
 .../src/mage/sets/magic2010/Assassinate.java  |   2 +-
 .../mage/sets/magic2010/BirdsOfParadise.java  |   2 +-
 .../mage/sets/magic2010/BountifulHarvest.java |   2 +-
 Mage.Sets/src/mage/sets/magic2010/Cancel.java |   2 +-
 .../mage/sets/magic2010/CanyonMinotaur.java   |   2 +-
 .../mage/sets/magic2010/CelestialPurge.java   |   2 +-
 .../mage/sets/magic2010/CemeteryReaper.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2010/Clone.java  |   2 +-
 .../src/mage/sets/magic2010/CrawWurm.java     |   2 +-
 .../sets/magic2010/DarksteelColossus.java     |   2 +-
 .../src/mage/sets/magic2010/Deathmark.java    |   2 +-
 .../src/mage/sets/magic2010/DemonsHorn.java   |   2 +-
 .../mage/sets/magic2010/DiabolicTutor.java    |   2 +-
 .../src/mage/sets/magic2010/Divination.java   |   2 +-
 .../src/mage/sets/magic2010/DragonsClaw.java  |   2 +-
 .../mage/sets/magic2010/ElvishVisionary.java  |   2 +-
 .../mage/sets/magic2010/Excommunicate.java    |   2 +-
 .../mage/sets/magic2010/Firebreathing.java    |   2 +-
 .../src/mage/sets/magic2010/Flashfreeze.java  |   2 +-
 .../src/mage/sets/magic2010/GiantGrowth.java  |   2 +-
 .../src/mage/sets/magic2010/GiantSpider.java  |   2 +-
 .../src/mage/sets/magic2010/GoblinPiker.java  |   2 +-
 .../src/mage/sets/magic2010/Gravedigger.java  |   2 +-
 .../src/mage/sets/magic2010/HolyStrength.java |   2 +-
 .../src/mage/sets/magic2010/KrakensEye.java   |   2 +-
 .../src/mage/sets/magic2010/LavaAxe.java      |   2 +-
 .../src/mage/sets/magic2010/Levitation.java   |   2 +-
 .../src/mage/sets/magic2010/Lifelink.java     |   2 +-
 .../sets/magic2010/LightningElemental.java    |   2 +-
 .../mage/sets/magic2010/LlanowarElves.java    |   2 +-
 .../src/mage/sets/magic2010/Manabarbs.java    |   2 +-
 Mage.Sets/src/mage/sets/magic2010/Megrim.java |   2 +-
 .../mage/sets/magic2010/MerfolkLooter.java    |   2 +-
 .../src/mage/sets/magic2010/MindRot.java      |   2 +-
 .../src/mage/sets/magic2010/Naturalize.java   |   2 +-
 .../src/mage/sets/magic2010/Nightmare.java    |   2 +-
 .../src/mage/sets/magic2010/Ornithopter.java  |   2 +-
 .../src/mage/sets/magic2010/Pacifism.java     |   2 +-
 .../mage/sets/magic2010/PithingNeedle.java    |   2 +-
 .../mage/sets/magic2010/PlatinumAngel.java    |   2 +-
 .../sets/magic2010/ProdigalPyromancer.java    |   2 +-
 .../src/mage/sets/magic2010/Pyroclasm.java    |   2 +-
 .../src/mage/sets/magic2010/RagingGoblin.java |   2 +-
 .../mage/sets/magic2010/RelentlessRats.java   |   2 +-
 .../mage/sets/magic2010/Righteousness.java    |   2 +-
 .../src/mage/sets/magic2010/RodOfRuin.java    |   2 +-
 .../mage/sets/magic2010/RoyalAssassin.java    |   2 +-
 .../src/mage/sets/magic2010/SerraAngel.java   |   2 +-
 .../src/mage/sets/magic2010/Shatter.java      |   2 +-
 .../src/mage/sets/magic2010/ShivanDragon.java |   2 +-
 .../mage/sets/magic2010/StampedingRhino.java  |   2 +-
 .../src/mage/sets/magic2010/Telepathy.java    |   2 +-
 .../sets/magic2010/TerramorphicExpanse.java   |   2 +-
 .../src/mage/sets/magic2010/Traumatize.java   |   2 +-
 .../mage/sets/magic2010/UnholyStrength.java   |   2 +-
 .../src/mage/sets/magic2010/Unsummon.java     |   2 +-
 .../src/mage/sets/magic2010/WallOfFire.java   |   2 +-
 .../mage/sets/magic2010/WhispersilkCloak.java |   2 +-
 .../src/mage/sets/magic2010/WurmsTooth.java   |   2 +-
 .../mage/sets/magic2010/ZombieGoliath.java    |   2 +-
 .../src/mage/sets/magic2011/AcidicSlime.java  |   2 +-
 .../src/mage/sets/magic2011/ActOfTreason.java |   2 +-
 .../mage/sets/magic2011/AjaniGoldmane.java    |   2 +-
 .../mage/sets/magic2011/AlluringSiren.java    |   2 +-
 .../mage/sets/magic2011/AngelsFeather.java    |   2 +-
 .../mage/sets/magic2011/ArmoredAscension.java |   2 +-
 .../src/mage/sets/magic2011/Assassinate.java  |   2 +-
 .../mage/sets/magic2011/AwakenerDruid.java    |   2 +-
 .../mage/sets/magic2011/BaneslayerAngel.java  |   2 +-
 .../magic2011/BerserkersOfBloodRidge.java     |   2 +-
 .../mage/sets/magic2011/BirdsOfParadise.java  |   2 +-
 .../src/mage/sets/magic2011/BlackKnight.java  |   2 +-
 .../src/mage/sets/magic2011/BlindingMage.java |   2 +-
 .../sets/magic2011/BloodthroneVampire.java    |   2 +-
 Mage.Sets/src/mage/sets/magic2011/Cancel.java |   2 +-
 .../mage/sets/magic2011/CanyonMinotaur.java   |   2 +-
 .../mage/sets/magic2011/CelestialPurge.java   |   2 +-
 .../mage/sets/magic2011/ChandraNalaar.java    |   2 +-
 .../src/mage/sets/magic2011/ChildOfNight.java |   2 +-
 Mage.Sets/src/mage/sets/magic2011/Clone.java  |   2 +-
 .../mage/sets/magic2011/CloudElemental.java   |   2 +-
 .../src/mage/sets/magic2011/Condemn.java      |   2 +-
 .../src/mage/sets/magic2011/CudgelTroll.java  |   2 +-
 .../mage/sets/magic2011/DayOfJudgment.java    |   2 +-
 .../src/mage/sets/magic2011/Deathmark.java    |   2 +-
 .../src/mage/sets/magic2011/Demolish.java     |   2 +-
 .../src/mage/sets/magic2011/DemonsHorn.java   |   2 +-
 .../mage/sets/magic2011/DiabolicTutor.java    |   2 +-
 .../src/mage/sets/magic2011/Disentomb.java    |   2 +-
 .../src/mage/sets/magic2011/DoomBlade.java    |   2 +-
 .../src/mage/sets/magic2011/DragonsClaw.java  |   2 +-
 .../sets/magic2011/DragonskullSummit.java     |   2 +-
 .../mage/sets/magic2011/DrownedCatacomb.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2011/Duress.java |   2 +-
 .../mage/sets/magic2011/EliteVanguard.java    |   2 +-
 .../mage/sets/magic2011/ElvishArchdruid.java  |   2 +-
 .../mage/sets/magic2011/Excommunicate.java    |   2 +-
 .../mage/sets/magic2011/FieryHellhound.java   |   2 +-
 .../src/mage/sets/magic2011/Fireball.java     |   2 +-
 .../src/mage/sets/magic2011/Flashfreeze.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2011/Fog.java    |   2 +-
 .../sets/magic2011/GarrukWildspeaker.java     |   2 +-
 .../src/mage/sets/magic2011/GiantGrowth.java  |   2 +-
 .../src/mage/sets/magic2011/GiantSpider.java  |   2 +-
 .../mage/sets/magic2011/GlacialFortress.java  |   2 +-
 .../mage/sets/magic2011/GoblinChieftain.java  |   2 +-
 .../src/mage/sets/magic2011/GoblinPiker.java  |   2 +-
 .../mage/sets/magic2011/GoblinTunneler.java   |   2 +-
 .../src/mage/sets/magic2011/Gravedigger.java  |   2 +-
 .../mage/sets/magic2011/HauntingEchoes.java   |   2 +-
 .../src/mage/sets/magic2011/HolyStrength.java |   2 +-
 .../mage/sets/magic2011/HonorOfThePure.java   |   2 +-
 .../mage/sets/magic2011/HowlingBanshee.java   |   2 +-
 .../src/mage/sets/magic2011/IceCage.java      |   2 +-
 .../src/mage/sets/magic2011/JaceBeleren.java  |   2 +-
 .../src/mage/sets/magic2011/Juggernaut.java   |   2 +-
 .../src/mage/sets/magic2011/KrakensEye.java   |   2 +-
 .../src/mage/sets/magic2011/LavaAxe.java      |   2 +-
 .../mage/sets/magic2011/LightningBolt.java    |   2 +-
 .../src/mage/sets/magic2011/LilianaVess.java  |   2 +-
 .../mage/sets/magic2011/LlanowarElves.java    |   2 +-
 .../src/mage/sets/magic2011/MagmaPhoenix.java |   2 +-
 .../mage/sets/magic2011/MerfolkSovereign.java |   2 +-
 .../src/mage/sets/magic2011/MindControl.java  |   2 +-
 .../src/mage/sets/magic2011/MindRot.java      |   2 +-
 .../src/mage/sets/magic2011/Naturalize.java   |   2 +-
 .../mage/sets/magic2011/NaturesSpiral.java    |   2 +-
 Mage.Sets/src/mage/sets/magic2011/Negate.java |   2 +-
 .../src/mage/sets/magic2011/Ornithopter.java  |   2 +-
 .../src/mage/sets/magic2011/Pacifism.java     |   2 +-
 .../src/mage/sets/magic2011/PalaceGuard.java  |   2 +-
 .../mage/sets/magic2011/PlatinumAngel.java    |   2 +-
 .../mage/sets/magic2011/PrizedUnicorn.java    |   2 +-
 .../sets/magic2011/ProdigalPyromancer.java    |   2 +-
 .../src/mage/sets/magic2011/ProteanHydra.java |   2 +-
 .../src/mage/sets/magic2011/Pyroclasm.java    |   2 +-
 .../mage/sets/magic2011/RelentlessRats.java   |   2 +-
 .../mage/sets/magic2011/RiseFromTheGrave.java |   2 +-
 .../mage/sets/magic2011/RootboundCrag.java    |   2 +-
 .../mage/sets/magic2011/RoyalAssassin.java    |   2 +-
 .../src/mage/sets/magic2011/RuneclawBear.java |   2 +-
 .../src/mage/sets/magic2011/SafePassage.java  |   2 +-
 .../src/mage/sets/magic2011/SerraAngel.java   |   2 +-
 .../mage/sets/magic2011/SiegeMastodon.java    |   2 +-
 .../src/mage/sets/magic2011/SignInBlood.java  |   2 +-
 .../src/mage/sets/magic2011/Silence.java      |   2 +-
 .../mage/sets/magic2011/SilvercoatLion.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2011/Sleep.java  |   2 +-
 .../mage/sets/magic2011/SolemnOffering.java   |   2 +-
 .../src/mage/sets/magic2011/SpinedWurm.java   |   2 +-
 .../sets/magic2011/StormfrontPegasus.java     |   2 +-
 .../mage/sets/magic2011/SunpetalGrove.java    |   2 +-
 .../sets/magic2011/TerramorphicExpanse.java   |   2 +-
 .../src/mage/sets/magic2011/TomeScour.java    |   2 +-
 .../src/mage/sets/magic2011/Traumatize.java   |   2 +-
 .../mage/sets/magic2011/UnholyStrength.java   |   2 +-
 .../src/mage/sets/magic2011/Unsummon.java     |   2 +-
 .../src/mage/sets/magic2011/WallOfFrost.java  |   2 +-
 .../mage/sets/magic2011/WhispersilkCloak.java |   2 +-
 .../src/mage/sets/magic2011/WhiteKnight.java  |   2 +-
 .../src/mage/sets/magic2011/WildGriffin.java  |   2 +-
 .../src/mage/sets/magic2011/WurmsTooth.java   |   2 +-
 .../src/mage/sets/magic2012/AEtherAdept.java  |   2 +-
 .../src/mage/sets/magic2012/AcidicSlime.java  |   2 +-
 .../src/mage/sets/magic2012/ActOfTreason.java |   2 +-
 .../mage/sets/magic2012/AlluringSiren.java    |   2 +-
 .../mage/sets/magic2012/AngelsFeather.java    |   2 +-
 .../src/mage/sets/magic2012/AngelsMercy.java  |   2 +-
 .../mage/sets/magic2012/ArchonOfJustice.java  |   2 +-
 .../mage/sets/magic2012/AssaultGriffin.java   |   2 +-
 .../src/mage/sets/magic2012/AutumnsVeil.java  |   2 +-
 .../mage/sets/magic2012/BelltowerSphinx.java  |   2 +-
 .../mage/sets/magic2012/BirdsOfParadise.java  |   2 +-
 .../src/mage/sets/magic2012/BloodSeeker.java  |   2 +-
 .../src/mage/sets/magic2012/BrindleBoar.java  |   2 +-
 .../mage/sets/magic2012/BrinkOfDisaster.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Cancel.java |   2 +-
 .../mage/sets/magic2012/CelestialPurge.java   |   2 +-
 .../mage/sets/magic2012/ChandrasOutrage.java  |   2 +-
 .../src/mage/sets/magic2012/ChildOfNight.java |   2 +-
 .../src/mage/sets/magic2012/Combust.java      |   2 +-
 .../mage/sets/magic2012/ConsumeSpirit.java    |   2 +-
 .../src/mage/sets/magic2012/CoralMerfolk.java |   2 +-
 .../src/mage/sets/magic2012/CudgelTroll.java  |   2 +-
 .../mage/sets/magic2012/DayOfJudgment.java    |   2 +-
 .../src/mage/sets/magic2012/Deathmark.java    |   2 +-
 .../src/mage/sets/magic2012/DemonsHorn.java   |   2 +-
 .../src/mage/sets/magic2012/Demystify.java    |   2 +-
 .../mage/sets/magic2012/DiabolicTutor.java    |   2 +-
 .../src/mage/sets/magic2012/Disentomb.java    |   2 +-
 .../src/mage/sets/magic2012/Distress.java     |   2 +-
 .../mage/sets/magic2012/DjinnOfWishes.java    |   2 +-
 .../src/mage/sets/magic2012/DoomBlade.java    |   2 +-
 .../src/mage/sets/magic2012/DragonsClaw.java  |   2 +-
 .../sets/magic2012/DragonskullSummit.java     |   2 +-
 .../mage/sets/magic2012/DrownedCatacomb.java  |   2 +-
 .../mage/sets/magic2012/EliteVanguard.java    |   2 +-
 .../sets/magic2012/ElixirOfImmortality.java   |   2 +-
 .../mage/sets/magic2012/ElvishArchdruid.java  |   2 +-
 .../mage/sets/magic2012/FieryHellhound.java   |   2 +-
 .../src/mage/sets/magic2012/Fireball.java     |   2 +-
 .../mage/sets/magic2012/FlameblastDragon.java |   2 +-
 .../src/mage/sets/magic2012/Flashfreeze.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Fling.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Fog.java    |   2 +-
 .../src/mage/sets/magic2012/FrostTitan.java   |   2 +-
 .../mage/sets/magic2012/GarruksCompanion.java |   2 +-
 .../src/mage/sets/magic2012/GiantSpider.java  |   2 +-
 .../src/mage/sets/magic2012/GideonJura.java   |   2 +-
 .../mage/sets/magic2012/GlacialFortress.java  |   2 +-
 .../mage/sets/magic2012/GoblinArsonist.java   |   2 +-
 .../mage/sets/magic2012/GoblinChieftain.java  |   2 +-
 .../src/mage/sets/magic2012/GoblinPiker.java  |   2 +-
 .../mage/sets/magic2012/GoblinTunneler.java   |   2 +-
 .../mage/sets/magic2012/GoblinWarPaint.java   |   2 +-
 .../src/mage/sets/magic2012/GraveTitan.java   |   2 +-
 .../src/mage/sets/magic2012/Gravedigger.java  |   2 +-
 .../mage/sets/magic2012/GreaterBasilisk.java  |   2 +-
 .../mage/sets/magic2012/GriffinSentinel.java  |   2 +-
 .../mage/sets/magic2012/HarborSerpent.java    |   2 +-
 .../mage/sets/magic2012/HonorOfThePure.java   |   2 +-
 .../src/mage/sets/magic2012/IceCage.java      |   2 +-
 .../src/mage/sets/magic2012/Incinerate.java   |   2 +-
 .../src/mage/sets/magic2012/InfernoTitan.java |   2 +-
 .../src/mage/sets/magic2012/JacesErasure.java |   2 +-
 .../src/mage/sets/magic2012/KrakensEye.java   |   2 +-
 .../src/mage/sets/magic2012/LavaAxe.java      |   2 +-
 .../sets/magic2012/LightningElemental.java    |   2 +-
 .../mage/sets/magic2012/LlanowarElves.java    |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Lure.java   |   2 +-
 .../src/mage/sets/magic2012/ManaLeak.java     |   2 +-
 .../src/mage/sets/magic2012/Manabarbs.java    |   2 +-
 .../src/mage/sets/magic2012/ManicVandal.java  |   2 +-
 .../mage/sets/magic2012/MesaEnchantress.java  |   2 +-
 .../src/mage/sets/magic2012/MightyLeap.java   |   2 +-
 .../src/mage/sets/magic2012/MindControl.java  |   2 +-
 .../src/mage/sets/magic2012/MindRot.java      |   2 +-
 .../src/mage/sets/magic2012/Naturalize.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Negate.java |   2 +-
 .../src/mage/sets/magic2012/OblivionRing.java |   2 +-
 .../src/mage/sets/magic2012/Overrun.java      |   2 +-
 .../src/mage/sets/magic2012/Pacifism.java     |   2 +-
 .../src/mage/sets/magic2012/Pentavus.java     |   2 +-
 .../src/mage/sets/magic2012/Plummet.java      |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Ponder.java |   2 +-
 .../mage/sets/magic2012/PrimevalTitan.java    |   2 +-
 .../mage/sets/magic2012/RampantGrowth.java    |   2 +-
 .../sets/magic2012/ReassemblingSkeleton.java  |   2 +-
 .../src/mage/sets/magic2012/Redirect.java     |   2 +-
 .../src/mage/sets/magic2012/Reverberate.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2012/RocEgg.java |   2 +-
 .../mage/sets/magic2012/RootboundCrag.java    |   2 +-
 .../mage/sets/magic2012/RoyalAssassin.java    |   2 +-
 .../src/mage/sets/magic2012/RuneclawBear.java |   2 +-
 .../src/mage/sets/magic2012/SacredWolf.java   |   2 +-
 .../mage/sets/magic2012/SengirVampire.java    |   2 +-
 .../src/mage/sets/magic2012/SerraAngel.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2012/Shock.java  |   2 +-
 .../mage/sets/magic2012/SiegeMastodon.java    |   2 +-
 .../src/mage/sets/magic2012/SlaughterCry.java |   2 +-
 .../src/mage/sets/magic2012/SorinMarkov.java  |   2 +-
 .../sets/magic2012/StormfrontPegasus.java     |   2 +-
 .../src/mage/sets/magic2012/SunTitan.java     |   2 +-
 .../mage/sets/magic2012/SunpetalGrove.java    |   2 +-
 .../src/mage/sets/magic2012/TimeReversal.java |   2 +-
 .../src/mage/sets/magic2012/Unsummon.java     |   2 +-
 .../mage/sets/magic2012/VastwoodGorger.java   |   2 +-
 .../src/mage/sets/magic2012/WarpathGhoul.java |   2 +-
 .../src/mage/sets/magic2012/WurmsTooth.java   |   2 +-
 .../src/mage/sets/magic2013/AcidicSlime.java  |   2 +-
 .../sets/magic2013/AngelicBenediction.java    |   2 +-
 .../src/mage/sets/magic2013/AngelsMercy.java  |   2 +-
 .../src/mage/sets/magic2013/ArborElf.java     |   2 +-
 .../src/mage/sets/magic2013/AvenSquire.java   |   2 +-
 .../src/mage/sets/magic2013/BattleOfWits.java |   2 +-
 .../mage/sets/magic2013/BladetuskBoar.java    |   2 +-
 .../sets/magic2013/BloodthroneVampire.java    |   2 +-
 .../mage/sets/magic2013/BountifulHarvest.java |   2 +-
 .../mage/sets/magic2013/CanyonMinotaur.java   |   2 +-
 .../sets/magic2013/CaptainOfTheWatch.java     |   2 +-
 .../mage/sets/magic2013/CentaurCourser.java   |   2 +-
 .../sets/magic2013/ChandraTheFirebrand.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Clone.java  |   2 +-
 .../src/mage/sets/magic2013/DarkFavor.java    |   2 +-
 .../mage/sets/magic2013/DeadlyRecluse.java    |   2 +-
 .../src/mage/sets/magic2013/Disentomb.java    |   2 +-
 .../src/mage/sets/magic2013/Divination.java   |   2 +-
 .../src/mage/sets/magic2013/DivineFavor.java  |   2 +-
 .../mage/sets/magic2013/DivineVerdict.java    |   2 +-
 .../sets/magic2013/DoorToNothingness.java     |   2 +-
 .../sets/magic2013/DragonskullSummit.java     |   2 +-
 .../mage/sets/magic2013/DrownedCatacomb.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Duress.java |   2 +-
 .../src/mage/sets/magic2013/DuskdaleWurm.java |   2 +-
 .../sets/magic2013/ElixirOfImmortality.java   |   2 +-
 .../mage/sets/magic2013/ElvishArchdruid.java  |   2 +-
 .../mage/sets/magic2013/ElvishVisionary.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Erase.java  |   2 +-
 .../src/mage/sets/magic2013/EssenceDrain.java |   2 +-
 .../mage/sets/magic2013/EssenceScatter.java   |   2 +-
 .../mage/sets/magic2013/EvolvingWilds.java    |   2 +-
 .../src/mage/sets/magic2013/Farseek.java      |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Fog.java    |   2 +-
 .../src/mage/sets/magic2013/FogBank.java      |   2 +-
 .../src/mage/sets/magic2013/FurnaceWhelp.java |   2 +-
 .../sets/magic2013/GarrukPrimalHunter.java    |   2 +-
 .../sets/magic2013/GarruksPackleader.java     |   2 +-
 .../mage/sets/magic2013/GiantScorpion.java    |   2 +-
 .../mage/sets/magic2013/GlacialFortress.java  |   2 +-
 .../mage/sets/magic2013/GloriousCharge.java   |   2 +-
 .../mage/sets/magic2013/GoblinArsonist.java   |   2 +-
 .../sets/magic2013/GuardiansOfAkrasa.java     |   2 +-
 .../mage/sets/magic2013/HarborSerpent.java    |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Index.java  |   2 +-
 .../src/mage/sets/magic2013/IntrepidHero.java |   2 +-
 .../mage/sets/magic2013/JaceMemoryAdept.java  |   2 +-
 .../src/mage/sets/magic2013/JayemdaeTome.java |   2 +-
 .../src/mage/sets/magic2013/KindledFury.java  |   2 +-
 .../src/mage/sets/magic2013/Kitesail.java     |   2 +-
 .../mage/sets/magic2013/KrakenHatchling.java  |   2 +-
 .../src/mage/sets/magic2013/MarkOfMutiny.java |   2 +-
 .../magic2013/MerfolkOfThePearlTrident.java   |   2 +-
 .../src/mage/sets/magic2013/MindRot.java      |   2 +-
 .../src/mage/sets/magic2013/Naturalize.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Negate.java |   2 +-
 .../magic2013/NicolBolasPlaneswalker.java     |   2 +-
 .../src/mage/sets/magic2013/OblivionRing.java |   2 +-
 .../src/mage/sets/magic2013/Pacifism.java     |   2 +-
 .../mage/sets/magic2013/PhylacteryLich.java   |   2 +-
 .../mage/sets/magic2013/PhyrexianHulk.java    |   2 +-
 .../mage/sets/magic2013/PillarfieldOx.java    |   2 +-
 .../mage/sets/magic2013/PlanarCleansing.java  |   2 +-
 .../src/mage/sets/magic2013/Plummet.java      |   2 +-
 .../src/mage/sets/magic2013/PreyUpon.java     |   2 +-
 .../src/mage/sets/magic2013/PrimalClay.java   |   2 +-
 .../mage/sets/magic2013/PrimordialHydra.java  |   2 +-
 .../src/mage/sets/magic2013/QuirionDryad.java |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Rancor.java |   2 +-
 .../src/mage/sets/magic2013/RavenousRats.java |   2 +-
 .../src/mage/sets/magic2013/Redirect.java     |   2 +-
 .../mage/sets/magic2013/ReliquaryTower.java   |   2 +-
 .../src/mage/sets/magic2013/Reverberate.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Rewind.java |   2 +-
 .../mage/sets/magic2013/RiseFromTheGrave.java |   2 +-
 .../mage/sets/magic2013/RootboundCrag.java    |   2 +-
 .../src/mage/sets/magic2013/SafePassage.java  |   2 +-
 .../src/mage/sets/magic2013/ScrollThief.java  |   2 +-
 .../src/mage/sets/magic2013/SerraAngel.java   |   2 +-
 .../src/mage/sets/magic2013/SerraAvatar.java  |   2 +-
 .../src/mage/sets/magic2013/SerraAvenger.java |   2 +-
 .../src/mage/sets/magic2013/SignInBlood.java  |   2 +-
 .../mage/sets/magic2013/SilklashSpider.java   |   2 +-
 .../mage/sets/magic2013/SilvercoatLion.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2013/Sleep.java  |   2 +-
 .../mage/sets/magic2013/SphinxOfUthuun.java   |   2 +-
 .../sets/magic2013/StormtideLeviathan.java    |   2 +-
 .../src/mage/sets/magic2013/StuffyDoll.java   |   2 +-
 .../mage/sets/magic2013/SunpetalGrove.java    |   2 +-
 .../mage/sets/magic2013/TitanicGrowth.java    |   2 +-
 .../src/mage/sets/magic2013/TorchFiend.java   |   2 +-
 .../mage/sets/magic2013/TormentedSoul.java    |   2 +-
 .../src/mage/sets/magic2013/TormodsCrypt.java |   2 +-
 .../src/mage/sets/magic2013/TrumpetBlast.java |   2 +-
 .../src/mage/sets/magic2013/TurnToSlag.java   |   2 +-
 .../src/mage/sets/magic2013/Unsummon.java     |   2 +-
 .../mage/sets/magic2013/VampireNighthawk.java |   2 +-
 .../mage/sets/magic2013/VampireNocturnus.java |   2 +-
 .../mage/sets/magic2013/VastwoodGorger.java   |   2 +-
 .../sets/magic2013/VedalkenEntrancer.java     |   2 +-
 .../mage/sets/magic2013/VolcanicStrength.java |   2 +-
 .../mage/sets/magic2013/WalkingCorpse.java    |   2 +-
 .../src/mage/sets/magic2013/WallOfFire.java   |   2 +-
 .../mage/sets/magic2013/WarPriestOfThune.java |   2 +-
 .../src/mage/sets/magic2013/WelkinTern.java   |   2 +-
 .../src/mage/sets/magic2013/WindDrake.java    |   2 +-
 .../mage/sets/magic2013/ZombieGoliath.java    |   2 +-
 .../mage/sets/magic2014/AccordersShield.java  |   2 +-
 .../src/mage/sets/magic2014/ActOfTreason.java |   2 +-
 .../src/mage/sets/magic2014/AirServant.java   |   2 +-
 .../sets/magic2014/AjaniCallerOfThePride.java |   2 +-
 .../src/mage/sets/magic2014/AltarsReap.java   |   2 +-
 .../src/mage/sets/magic2014/AngelicWall.java  |   2 +-
 .../mage/sets/magic2014/Archaeomancer.java    |   2 +-
 .../mage/sets/magic2014/ArmoredCancrix.java   |   2 +-
 .../src/mage/sets/magic2014/Auramancer.java   |   2 +-
 .../src/mage/sets/magic2014/Blessing.java     |   2 +-
 .../src/mage/sets/magic2014/Bramblecrush.java |   2 +-
 .../mage/sets/magic2014/BraveTheElements.java |   2 +-
 .../mage/sets/magic2014/BriarpackAlpha.java   |   2 +-
 .../src/mage/sets/magic2014/BrindleBoar.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Cancel.java |   2 +-
 .../mage/sets/magic2014/CanyonMinotaur.java   |   2 +-
 .../mage/sets/magic2014/CapashenKnight.java   |   2 +-
 .../mage/sets/magic2014/ChandrasOutrage.java  |   2 +-
 .../mage/sets/magic2014/ChandrasPhoenix.java  |   2 +-
 .../src/mage/sets/magic2014/ChildOfNight.java |   2 +-
 .../mage/sets/magic2014/Claustrophobia.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Clone.java  |   2 +-
 .../src/mage/sets/magic2014/Congregate.java   |   2 +-
 .../src/mage/sets/magic2014/CoralMerfolk.java |   2 +-
 .../src/mage/sets/magic2014/Corrupt.java      |   2 +-
 .../src/mage/sets/magic2014/DarkFavor.java    |   2 +-
 .../mage/sets/magic2014/DarksteelForge.java   |   2 +-
 .../mage/sets/magic2014/DarksteelIngot.java   |   2 +-
 .../mage/sets/magic2014/DeadlyRecluse.java    |   2 +-
 .../src/mage/sets/magic2014/Demolish.java     |   2 +-
 .../mage/sets/magic2014/DiabolicTutor.java    |   2 +-
 .../src/mage/sets/magic2014/Disperse.java     |   2 +-
 .../src/mage/sets/magic2014/Divination.java   |   2 +-
 .../src/mage/sets/magic2014/DivineFavor.java  |   2 +-
 .../mage/sets/magic2014/Domestication.java    |   2 +-
 .../src/mage/sets/magic2014/DoomBlade.java    |   2 +-
 .../mage/sets/magic2014/DragonHatchling.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Duress.java |   2 +-
 .../sets/magic2014/ElixirOfImmortality.java   |   2 +-
 .../mage/sets/magic2014/EssenceScatter.java   |   2 +-
 .../sets/magic2014/FlamesOfTheFirebrand.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Fog.java    |   2 +-
 .../src/mage/sets/magic2014/Fortify.java      |   2 +-
 .../src/mage/sets/magic2014/FrostBreath.java  |   2 +-
 .../src/mage/sets/magic2014/GarruksHorde.java |   2 +-
 .../src/mage/sets/magic2014/GiantGrowth.java  |   2 +-
 .../src/mage/sets/magic2014/GiantSpider.java  |   2 +-
 .../mage/sets/magic2014/GladecoverScout.java  |   2 +-
 .../sets/magic2014/GoblinShortcutter.java     |   2 +-
 .../mage/sets/magic2014/GriffinSentinel.java  |   2 +-
 .../sets/magic2014/HowlOfTheNightPack.java    |   2 +-
 .../sets/magic2014/Indestructibility.java     |   2 +-
 .../mage/sets/magic2014/JaceMemoryAdept.java  |   2 +-
 .../src/mage/sets/magic2014/LavaAxe.java      |   2 +-
 .../src/mage/sets/magic2014/LayOfTheLand.java |   2 +-
 .../mage/sets/magic2014/LightningTalons.java  |   2 +-
 .../magic2014/LilianaOfTheDarkRealms.java     |   2 +-
 .../mage/sets/magic2014/MarkOfTheVampire.java |   2 +-
 .../src/mage/sets/magic2014/MerfolkSpy.java   |   2 +-
 .../src/mage/sets/magic2014/Millstone.java    |   2 +-
 .../src/mage/sets/magic2014/MindRot.java      |   2 +-
 .../src/mage/sets/magic2014/Mutavault.java    |   2 +-
 .../src/mage/sets/magic2014/Naturalize.java   |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Negate.java |   2 +-
 .../mage/sets/magic2014/NephaliaSeakite.java  |   2 +-
 .../src/mage/sets/magic2014/Nightmare.java    |   2 +-
 .../mage/sets/magic2014/NightwingShade.java   |   2 +-
 .../src/mage/sets/magic2014/Opportunity.java  |   2 +-
 .../src/mage/sets/magic2014/Pacifism.java     |   2 +-
 .../mage/sets/magic2014/PhantomWarrior.java   |   2 +-
 .../mage/sets/magic2014/PillarfieldOx.java    |   2 +-
 .../mage/sets/magic2014/PitchburnDevils.java  |   2 +-
 .../mage/sets/magic2014/PlanarCleansing.java  |   2 +-
 .../src/mage/sets/magic2014/Plummet.java      |   2 +-
 .../src/mage/sets/magic2014/QuagSickness.java |   2 +-
 .../src/mage/sets/magic2014/Quicken.java      |   2 +-
 .../src/mage/sets/magic2014/RangersGuile.java |   2 +-
 .../src/mage/sets/magic2014/RatchetBomb.java  |   2 +-
 .../src/mage/sets/magic2014/RodOfRuin.java    |   2 +-
 .../src/mage/sets/magic2014/Rootwalla.java    |   2 +-
 .../src/mage/sets/magic2014/SanguineBond.java |   2 +-
 .../mage/sets/magic2014/ScavengingOoze.java   |   2 +-
 .../src/mage/sets/magic2014/ScrollThief.java  |   2 +-
 .../mage/sets/magic2014/SengirVampire.java    |   2 +-
 .../sets/magic2014/SensoryDeprivation.java    |   2 +-
 .../src/mage/sets/magic2014/SerraAngel.java   |   2 +-
 .../mage/sets/magic2014/ShimmeringGrotto.java |   2 +-
 .../src/mage/sets/magic2014/ShivanDragon.java |   2 +-
 .../src/mage/sets/magic2014/ShivsEmbrace.java |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Shock.java  |   2 +-
 .../src/mage/sets/magic2014/ShowOfValor.java  |   2 +-
 .../src/mage/sets/magic2014/Shrivel.java      |   2 +-
 .../mage/sets/magic2014/SiegeMastodon.java    |   2 +-
 .../src/mage/sets/magic2014/Silence.java      |   2 +-
 Mage.Sets/src/mage/sets/magic2014/Smelt.java  |   2 +-
 .../mage/sets/magic2014/SolemnOffering.java   |   2 +-
 .../src/mage/sets/magic2014/SpellBlast.java   |   2 +-
 .../src/mage/sets/magic2014/SuntailHawk.java  |   2 +-
 .../mage/sets/magic2014/ThunderStrike.java    |   2 +-
 .../src/mage/sets/magic2014/TimeEbb.java      |   2 +-
 .../src/mage/sets/magic2014/TomeScour.java    |   2 +-
 .../src/mage/sets/magic2014/TradingPost.java  |   2 +-
 .../src/mage/sets/magic2014/Traumatize.java   |   2 +-
 .../src/mage/sets/magic2014/Trollhide.java    |   2 +-
 .../src/mage/sets/magic2014/VerdantHaven.java |   2 +-
 .../src/mage/sets/magic2014/VileRebirth.java  |   2 +-
 .../mage/sets/magic2014/VolcanicGeyser.java   |   2 +-
 .../src/mage/sets/magic2014/WallOfFrost.java  |   2 +-
 .../src/mage/sets/magic2014/WallOfSwords.java |   2 +-
 .../src/mage/sets/magic2014/WaterServant.java |   2 +-
 .../src/mage/sets/magic2014/WildGuess.java    |   2 +-
 .../src/mage/sets/magic2014/WildRicochet.java |   2 +-
 .../src/mage/sets/magic2014/Windstorm.java    |   2 +-
 .../src/mage/sets/magic2014/WringFlesh.java   |   2 +-
 .../mage/sets/magic2015/AccursedSpirit.java   |   2 +-
 .../src/mage/sets/magic2015/AegisAngel.java   |   2 +-
 .../mage/sets/magic2015/AjanisPridemate.java  |   2 +-
 .../sets/magic2015/AncientSilverback.java     |   2 +-
 .../src/mage/sets/magic2015/BackToNature.java |   2 +-
 .../mage/sets/magic2015/BattleMastery.java    |   2 +-
 .../mage/sets/magic2015/BattlefieldForge.java |   2 +-
 .../src/mage/sets/magic2015/BlackCat.java     |   2 +-
 .../src/mage/sets/magic2015/BronzeSable.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2015/Cancel.java |   2 +-
 .../src/mage/sets/magic2015/CausticTar.java   |   2 +-
 .../mage/sets/magic2015/CavesOfKoilos.java    |   2 +-
 .../mage/sets/magic2015/CentaurCourser.java   |   2 +-
 .../sets/magic2015/ChandraPyromaster.java     |   2 +-
 .../mage/sets/magic2015/ChargingRhino.java    |   2 +-
 .../src/mage/sets/magic2015/ChildOfNight.java |   2 +-
 .../mage/sets/magic2015/ChordOfCalling.java   |   2 +-
 .../mage/sets/magic2015/CircleOfFlame.java    |   2 +-
 .../src/mage/sets/magic2015/ClearAPath.java   |   2 +-
 .../src/mage/sets/magic2015/ConeOfFlame.java  |   2 +-
 .../src/mage/sets/magic2015/Congregate.java   |   2 +-
 .../mage/sets/magic2015/CripplingBlight.java  |   2 +-
 .../mage/sets/magic2015/CrucibleOfFire.java   |   2 +-
 .../mage/sets/magic2015/DarksteelCitadel.java |   2 +-
 .../mage/sets/magic2015/DevouringLight.java   |   2 +-
 .../src/mage/sets/magic2015/Dissipate.java    |   2 +-
 .../src/mage/sets/magic2015/Divination.java   |   2 +-
 .../src/mage/sets/magic2015/DivineFavor.java  |   2 +-
 .../mage/sets/magic2015/DivineVerdict.java    |   2 +-
 .../src/mage/sets/magic2015/ElvishMystic.java |   2 +-
 .../src/mage/sets/magic2015/Encrust.java      |   2 +-
 .../mage/sets/magic2015/EvolvingWilds.java    |   2 +-
 .../src/mage/sets/magic2015/ForgeDevil.java   |   2 +-
 .../sets/magic2015/FoundryStreetDenizen.java  |   2 +-
 .../mage/sets/magic2015/FrenziedGoblin.java   |   2 +-
 .../mage/sets/magic2015/FugitiveWizard.java   |   2 +-
 .../src/mage/sets/magic2015/FurnaceWhelp.java |   2 +-
 .../mage/sets/magic2015/GargoyleSentinel.java |   2 +-
 .../sets/magic2015/GarruksPackleader.java     |   2 +-
 .../mage/sets/magic2015/GatherCourage.java    |   2 +-
 .../mage/sets/magic2015/GoblinRoughrider.java |   2 +-
 .../src/mage/sets/magic2015/Gravedigger.java  |   2 +-
 .../src/mage/sets/magic2015/Grindclock.java   |   2 +-
 .../mage/sets/magic2015/HauntedPlateMail.java |   2 +-
 .../src/mage/sets/magic2015/HeatRay.java      |   2 +-
 .../mage/sets/magic2015/HoardingDragon.java   |   2 +-
 .../src/mage/sets/magic2015/HornetQueen.java  |   2 +-
 .../src/mage/sets/magic2015/HuntTheWeak.java  |   2 +-
 .../src/mage/sets/magic2015/Hydrosurge.java   |   2 +-
 .../mage/sets/magic2015/IllusoryAngel.java    |   2 +-
 .../mage/sets/magic2015/InspiredCharge.java   |   2 +-
 .../src/mage/sets/magic2015/IntoTheVoid.java  |   2 +-
 .../src/mage/sets/magic2015/Invisibility.java |   2 +-
 .../mage/sets/magic2015/JacesIngenuity.java   |   2 +-
 .../src/mage/sets/magic2015/Juggernaut.java   |   2 +-
 .../sets/magic2015/KinsbaileSkirmisher.java   |   2 +-
 .../src/mage/sets/magic2015/LavaAxe.java      |   2 +-
 .../mage/sets/magic2015/LightningStrike.java  |   2 +-
 .../src/mage/sets/magic2015/LilianaVess.java  |   2 +-
 .../mage/sets/magic2015/LlanowarWastes.java   |   2 +-
 .../mage/sets/magic2015/MahamotiDjinn.java    |   2 +-
 .../src/mage/sets/magic2015/MassCalcify.java  |   2 +-
 .../mage/sets/magic2015/MidnightGuard.java    |   2 +-
 .../src/mage/sets/magic2015/MindRot.java      |   2 +-
 .../src/mage/sets/magic2015/MindSculpt.java   |   2 +-
 .../src/mage/sets/magic2015/Naturalize.java   |   2 +-
 .../src/mage/sets/magic2015/Necrobite.java    |   2 +-
 .../mage/sets/magic2015/NecrogenScudder.java  |   2 +-
 Mage.Sets/src/mage/sets/magic2015/Negate.java |   2 +-
 .../src/mage/sets/magic2015/Nightmare.java    |   2 +-
 .../mage/sets/magic2015/OppressiveRays.java   |   2 +-
 .../mage/sets/magic2015/OreskosSwiftclaw.java |   2 +-
 .../src/mage/sets/magic2015/Ornithopter.java  |   2 +-
 .../src/mage/sets/magic2015/Overwhelm.java    |   2 +-
 .../mage/sets/magic2015/PeelFromReality.java  |   2 +-
 .../mage/sets/magic2015/PhyrexianRevoker.java |   2 +-
 .../src/mage/sets/magic2015/Plummet.java      |   2 +-
 .../sets/magic2015/PreeminentCaptain.java     |   2 +-
 .../mage/sets/magic2015/RaiseTheAlarm.java    |   2 +-
 .../src/mage/sets/magic2015/RangersGuile.java |   2 +-
 .../mage/sets/magic2015/RazorfootGriffin.java |   2 +-
 .../src/mage/sets/magic2015/Restock.java      |   2 +-
 .../mage/sets/magic2015/RoaringPrimadox.java  |   2 +-
 .../mage/sets/magic2015/RummagingGoblin.java  |   2 +-
 .../src/mage/sets/magic2015/RuneclawBear.java |   2 +-
 .../mage/sets/magic2015/SatyrWayfinder.java   |   2 +-
 .../mage/sets/magic2015/SeismicStrike.java    |   2 +-
 .../mage/sets/magic2015/SelflessCathar.java   |   2 +-
 .../mage/sets/magic2015/SengirVampire.java    |   2 +-
 .../src/mage/sets/magic2015/SerraAngel.java   |   2 +-
 .../src/mage/sets/magic2015/ShivanDragon.java |   2 +-
 .../src/mage/sets/magic2015/ShivanReef.java   |   2 +-
 .../mage/sets/magic2015/ShrapnelBlast.java    |   2 +-
 .../src/mage/sets/magic2015/SiegeWurm.java    |   2 +-
 .../src/mage/sets/magic2015/SignInBlood.java  |   2 +-
 .../mage/sets/magic2015/SolemnOffering.java   |   2 +-
 .../src/mage/sets/magic2015/Soulmender.java   |   2 +-
 .../src/mage/sets/magic2015/StabWound.java    |   2 +-
 .../sets/magic2015/StaffOfTheDeathMagus.java  |   2 +-
 .../sets/magic2015/StaffOfTheFlameMagus.java  |   2 +-
 .../sets/magic2015/StaffOfTheMindMagus.java   |   2 +-
 .../sets/magic2015/StaffOfTheSunMagus.java    |   2 +-
 .../sets/magic2015/StaffOfTheWildMagus.java   |   2 +-
 .../sets/magic2015/StormtideLeviathan.java    |   2 +-
 .../src/mage/sets/magic2015/TerraStomper.java |   2 +-
 .../mage/sets/magic2015/ThunderingGiant.java  |   2 +-
 .../sets/magic2015/TirelessMissionaries.java  |   2 +-
 .../mage/sets/magic2015/TitanicGrowth.java    |   2 +-
 .../src/mage/sets/magic2015/TorchFiend.java   |   2 +-
 .../src/mage/sets/magic2015/TormodsCrypt.java |   2 +-
 .../src/mage/sets/magic2015/TurnToFrog.java   |   2 +-
 .../src/mage/sets/magic2015/TyphoidRats.java  |   2 +-
 .../sets/magic2015/UrborgTombOfYawgmoth.java  |   2 +-
 .../src/mage/sets/magic2015/VerdantHaven.java |   2 +-
 .../mage/sets/magic2015/WalkingCorpse.java    |   2 +-
 .../mage/sets/magic2015/WallOfEssence.java    |   2 +-
 .../src/mage/sets/magic2015/WallOfFire.java   |   2 +-
 .../src/mage/sets/magic2015/WallOfFrost.java  |   2 +-
 .../src/mage/sets/magic2015/WallOfMulch.java  |   2 +-
 .../src/mage/sets/magic2015/WelkinTern.java   |   2 +-
 .../mage/sets/magic2015/YavimayaCoast.java    |   2 +-
 .../src/mage/sets/magic2015/ZofShade.java     |   2 +-
 .../mage/sets/magicorigins/ActOfTreason.java  |   2 +-
 .../mage/sets/magicorigins/AegisAngel.java    |   2 +-
 .../mage/sets/magicorigins/AngelsTomb.java    |   2 +-
 .../mage/sets/magicorigins/Auramancer.java    |   2 +-
 .../sets/magicorigins/BattlefieldForge.java   |   2 +-
 .../mage/sets/magicorigins/BellowsLizard.java |   2 +-
 .../mage/sets/magicorigins/Blightcaster.java  |   2 +-
 .../src/mage/sets/magicorigins/BoneToAsh.java |   2 +-
 .../mage/sets/magicorigins/BrawlersPlate.java |   2 +-
 .../mage/sets/magicorigins/CatacombSlug.java  |   2 +-
 .../mage/sets/magicorigins/CavesOfKoilos.java |   2 +-
 .../sets/magicorigins/CelestialFlare.java     |   2 +-
 .../mage/sets/magicorigins/ChandrasFury.java  |   2 +-
 .../sets/magicorigins/ChargingGriffin.java    |   2 +-
 .../sets/magicorigins/Claustrophobia.java     |   2 +-
 .../mage/sets/magicorigins/Cobblebrute.java   |   2 +-
 .../mage/sets/magicorigins/CruelRevival.java  |   2 +-
 .../src/mage/sets/magicorigins/Demolish.java  |   2 +-
 .../src/mage/sets/magicorigins/Disperse.java  |   2 +-
 .../mage/sets/magicorigins/DivineVerdict.java |   2 +-
 .../mage/sets/magicorigins/DragonFodder.java  |   2 +-
 .../mage/sets/magicorigins/Dreadwaters.java   |   2 +-
 .../sets/magicorigins/ElvishVisionary.java    |   2 +-
 .../mage/sets/magicorigins/EvolvingWilds.java |   2 +-
 .../sets/magicorigins/FieryConclusion.java    |   2 +-
 .../sets/magicorigins/FieryHellhound.java     |   2 +-
 .../mage/sets/magicorigins/FleshToDust.java   |   2 +-
 .../sets/magicorigins/FleshbagMarauder.java   |   2 +-
 .../mage/sets/magicorigins/GaeasRevenge.java  |   2 +-
 .../sets/magicorigins/GoblinPiledriver.java   |   2 +-
 .../sets/magicorigins/GoldForgedSentinel.java |   2 +-
 .../sets/magicorigins/GuardiansOfMeletis.java |   2 +-
 .../mage/sets/magicorigins/IntoTheVoid.java   |   2 +-
 .../mage/sets/magicorigins/JayemdaeTome.java  |   2 +-
 .../magicorigins/KnightOfTheWhiteOrchid.java  |   2 +-
 .../mage/sets/magicorigins/KnightlyValor.java |   2 +-
 .../mage/sets/magicorigins/LeafGilder.java    |   2 +-
 .../sets/magicorigins/LlanowarEmpath.java     |   2 +-
 .../sets/magicorigins/LlanowarWastes.java     |   2 +-
 .../mage/sets/magicorigins/MahamotiDjinn.java |   2 +-
 .../mage/sets/magicorigins/MaritimeGuard.java |   2 +-
 .../src/mage/sets/magicorigins/Meteorite.java |   2 +-
 .../sets/magicorigins/MightOfTheMasses.java   |   2 +-
 .../mage/sets/magicorigins/MightyLeap.java    |   2 +-
 .../src/mage/sets/magicorigins/MindRot.java   |   2 +-
 .../magicorigins/MurderInvestigation.java     |   2 +-
 .../mage/sets/magicorigins/NantukoHusk.java   |   2 +-
 .../src/mage/sets/magicorigins/Negate.java    |   2 +-
 .../src/mage/sets/magicorigins/Nightmare.java |   2 +-
 .../mage/sets/magicorigins/OrchardSpirit.java |   2 +-
 .../src/mage/sets/magicorigins/Plummet.java   |   2 +-
 .../mage/sets/magicorigins/PrizedUnicorn.java |   2 +-
 .../mage/sets/magicorigins/ReadTheBones.java  |   2 +-
 .../src/mage/sets/magicorigins/Reclaim.java   |   2 +-
 .../sets/magicorigins/ReturnedCentaur.java    |   2 +-
 .../src/mage/sets/magicorigins/Revenant.java  |   2 +-
 .../mage/sets/magicorigins/RoguesPassage.java |   2 +-
 .../mage/sets/magicorigins/RunedServitor.java |   2 +-
 .../sets/magicorigins/ScrapskinDrake.java     |   2 +-
 .../sets/magicorigins/ScreechingSkaab.java    |   2 +-
 .../mage/sets/magicorigins/SengirVampire.java |   2 +-
 .../mage/sets/magicorigins/SerraAngel.java    |   2 +-
 .../mage/sets/magicorigins/ShivanDragon.java  |   2 +-
 .../mage/sets/magicorigins/ShivanReef.java    |   2 +-
 .../magicorigins/SigilOfTheEmptyThrone.java   |   2 +-
 .../sets/magicorigins/SigiledStarfish.java    |   2 +-
 .../mage/sets/magicorigins/SkaabGoliath.java  |   2 +-
 .../sets/magicorigins/SmashToSmithereens.java |   2 +-
 .../mage/sets/magicorigins/StratusWalk.java   |   2 +-
 .../sets/magicorigins/SylvanMessenger.java    |   2 +-
 .../mage/sets/magicorigins/TerraStomper.java  |   2 +-
 .../sets/magicorigins/TimberpackWolf.java     |   2 +-
 .../mage/sets/magicorigins/TitanicGrowth.java |   2 +-
 .../sets/magicorigins/TitansStrength.java     |   2 +-
 .../sets/magicorigins/TormentedThoughts.java  |   2 +-
 .../magicorigins/TotemGuideHartebeest.java    |   2 +-
 .../mage/sets/magicorigins/TowerGeist.java    |   2 +-
 .../mage/sets/magicorigins/TurnToFrog.java    |   2 +-
 .../sets/magicorigins/VastwoodGorger.java     |   2 +-
 .../mage/sets/magicorigins/Watercourser.java  |   2 +-
 .../src/mage/sets/magicorigins/WeaveFate.java |   2 +-
 .../magicorigins/WeightOfTheUnderworld.java   |   2 +-
 .../mage/sets/magicorigins/YavimayaCoast.java |   2 +-
 .../sets/magicorigins/YevasForcemage.java     |   2 +-
 .../src/mage/sets/magicorigins/YokedOx.java   |   2 +-
 .../magicplayerrewards/BituminousBlast.java   |   2 +-
 .../sets/magicplayerrewards/Blightning.java   |   2 +-
 .../magicplayerrewards/BraveTheElements.java  |   2 +-
 .../magicplayerrewards/BurstLightning.java    |   2 +-
 .../mage/sets/magicplayerrewards/Cancel.java  |   2 +-
 .../magicplayerrewards/CelestialPurge.java    |   2 +-
 .../mage/sets/magicplayerrewards/Condemn.java |   2 +-
 .../mage/sets/magicplayerrewards/Corrupt.java |   2 +-
 .../sets/magicplayerrewards/CruelEdict.java   |   2 +-
 .../magicplayerrewards/CrypticCommand.java    |   2 +-
 .../sets/magicplayerrewards/Damnation.java    |   2 +-
 .../magicplayerrewards/DayOfJudgment.java     |   2 +-
 .../sets/magicplayerrewards/Disenchant.java   |   2 +-
 .../sets/magicplayerrewards/DoomBlade.java    |   2 +-
 .../sets/magicplayerrewards/Fireball.java     |   2 +-
 .../sets/magicplayerrewards/FlameJavelin.java |   2 +-
 .../sets/magicplayerrewards/GiantGrowth.java  |   2 +-
 .../sets/magicplayerrewards/Harmonize.java    |   2 +-
 .../mage/sets/magicplayerrewards/Harrow.java  |   2 +-
 .../mage/sets/magicplayerrewards/Hinder.java  |   2 +-
 .../magicplayerrewards/HypnoticSpecter.java   |   2 +-
 .../sets/magicplayerrewards/Incinerate.java   |   2 +-
 .../mage/sets/magicplayerrewards/Infest.java  |   2 +-
 .../magicplayerrewards/LightningBolt.java     |   2 +-
 .../magicplayerrewards/LightningHelix.java    |   2 +-
 .../sets/magicplayerrewards/ManaLeak.java     |   2 +-
 .../sets/magicplayerrewards/ManaTithe.java    |   2 +-
 .../mage/sets/magicplayerrewards/Mortify.java |   2 +-
 .../magicplayerrewards/NamelessInversion.java |   2 +-
 .../mage/sets/magicplayerrewards/Negate.java  |   2 +-
 .../mage/sets/magicplayerrewards/Oxidize.java |   2 +-
 .../mage/sets/magicplayerrewards/Ponder.java  |   2 +-
 .../sets/magicplayerrewards/PsionicBlast.java |   2 +-
 .../sets/magicplayerrewards/Psychatog.java    |   2 +-
 .../mage/sets/magicplayerrewards/Putrefy.java |   2 +-
 .../sets/magicplayerrewards/Pyroclasm.java    |   2 +-
 .../magicplayerrewards/RampantGrowth.java     |   2 +-
 .../sets/magicplayerrewards/Reciprocate.java  |   2 +-
 .../sets/magicplayerrewards/Recollect.java    |   2 +-
 .../sets/magicplayerrewards/RemoveSoul.java   |   2 +-
 .../sets/magicplayerrewards/SearingBlaze.java |   2 +-
 .../sets/magicplayerrewards/SignInBlood.java  |   2 +-
 .../sets/magicplayerrewards/Terminate.java    |   2 +-
 .../mage/sets/magicplayerrewards/Terror.java  |   2 +-
 .../mage/sets/magicplayerrewards/Tidings.java |   2 +-
 .../sets/magicplayerrewards/TreasureHunt.java |   2 +-
 .../mage/sets/magicplayerrewards/Unmake.java  |   2 +-
 .../magicplayerrewards/VoidmageProdigy.java   |   2 +-
 .../magicplayerrewards/VolcanicFallout.java   |   2 +-
 .../sets/magicplayerrewards/Wasteland.java    |   2 +-
 .../sets/magicplayerrewards/WrathOfGod.java   |   2 +-
 .../mage/sets/magicplayerrewards/Zombify.java |   2 +-
 .../sets/mastersedition/AdunOakenshield.java  |   2 +-
 .../src/mage/sets/mastersedition/Amnesia.java |   2 +-
 .../mage/sets/mastersedition/AnimateDead.java |   2 +-
 .../mage/sets/mastersedition/AnimateWall.java |   2 +-
 .../sets/mastersedition/AnkhOfMishra.java     |   2 +-
 .../sets/mastersedition/ArcaneDenial.java     |   2 +-
 .../mastersedition/ArgivianArchaeologist.java |   2 +-
 .../mage/sets/mastersedition/Armageddon.java  |   2 +-
 .../sets/mastersedition/ArtifactBlast.java    |   2 +-
 .../mastersedition/AshnodsTransmogrant.java   |   2 +-
 .../sets/mastersedition/BalduvianHorde.java   |   2 +-
 .../sets/mastersedition/BallLightning.java    |   2 +-
 .../mage/sets/mastersedition/BasalThrull.java |   2 +-
 .../src/mage/sets/mastersedition/Berserk.java |   2 +-
 .../mage/sets/mastersedition/BlackKnight.java |   2 +-
 .../src/mage/sets/mastersedition/Blight.java  |   2 +-
 .../mage/sets/mastersedition/BreedingPit.java |   2 +-
 .../sets/mastersedition/BrothersOfFire.java   |   2 +-
 .../sets/mastersedition/CarnivorousPlant.java |   2 +-
 .../sets/mastersedition/CentaurArcher.java    |   2 +-
 .../ChainsOfMephistopheles.java               |   2 +-
 .../mage/sets/mastersedition/ChubToad.java    |   2 +-
 .../sets/mastersedition/ClockworkBeast.java   |   2 +-
 .../mage/sets/mastersedition/Contagion.java   |   2 +-
 .../sets/mastersedition/CopperTablet.java     |   2 +-
 .../mastersedition/CrookshankKobolds.java     |   2 +-
 .../src/mage/sets/mastersedition/Crusade.java |   2 +-
 .../mage/sets/mastersedition/CursedRack.java  |   2 +-
 .../sets/mastersedition/DakkonBlackblade.java |   2 +-
 .../sets/mastersedition/DeathSpeakers.java    |   2 +-
 .../mage/sets/mastersedition/DeathWard.java   |   2 +-
 .../src/mage/sets/mastersedition/Derelor.java |   2 +-
 .../sets/mastersedition/DiamondValley.java    |   2 +-
 .../mastersedition/DiminishingReturns.java    |   2 +-
 .../mastersedition/DivineTransformation.java  |   2 +-
 .../sets/mastersedition/DragonEngine.java     |   2 +-
 .../mage/sets/mastersedition/DustToDust.java  |   2 +-
 .../sets/mastersedition/DwarvenCatapult.java  |   2 +-
 .../sets/mastersedition/DwarvenSoldier.java   |   2 +-
 .../mage/sets/mastersedition/ErgRaiders.java  |   2 +-
 .../src/mage/sets/mastersedition/Eureka.java  |   2 +-
 .../src/mage/sets/mastersedition/Exile.java   |   2 +-
 .../sets/mastersedition/FeastOrFamine.java    |   2 +-
 .../sets/mastersedition/FireCovenant.java     |   2 +-
 .../src/mage/sets/mastersedition/Fissure.java |   2 +-
 .../mage/sets/mastersedition/ForceOfWill.java |   2 +-
 .../sets/mastersedition/FyndhornElves.java    |   2 +-
 .../mage/sets/mastersedition/GhazbanOgre.java |   2 +-
 .../sets/mastersedition/GiantTortoise.java    |   2 +-
 .../sets/mastersedition/GoblinChirurgeon.java |   2 +-
 .../sets/mastersedition/GoblinGrenade.java    |   2 +-
 .../sets/mastersedition/GoblinMutant.java     |   2 +-
 .../sets/mastersedition/GoblinWizard.java     |   2 +-
 .../mastersedition/GoblinsOfTheFlarg.java     |   2 +-
 .../sets/mastersedition/GraniteGargoyle.java  |   2 +-
 .../mage/sets/mastersedition/Hecatomb.java    |   2 +-
 .../mage/sets/mastersedition/HighTide.java    |   2 +-
 .../mage/sets/mastersedition/HolyLight.java   |   2 +-
 .../mastersedition/HomaridSpawningBed.java    |   2 +-
 .../mage/sets/mastersedition/HungryMist.java  |   2 +-
 .../mastersedition/HyalopterousLemure.java    |   2 +-
 .../mage/sets/mastersedition/Hydroblast.java  |   2 +-
 .../sets/mastersedition/HymnToTourach.java    |   2 +-
 .../mastersedition/IcatianLieutenant.java     |   2 +-
 .../mage/sets/mastersedition/IcatianTown.java |   2 +-
 .../mage/sets/mastersedition/IceStorm.java    |   2 +-
 .../mastersedition/IllusionsOfGrandeur.java   |   2 +-
 .../sets/mastersedition/IslandOfWakWak.java   |   2 +-
 .../mage/sets/mastersedition/IvoryTower.java  |   2 +-
 .../sets/mastersedition/JacquesLeVert.java    |   2 +-
 .../mage/sets/mastersedition/Jokulhaups.java  |   2 +-
 .../mage/sets/mastersedition/Juxtapose.java   |   2 +-
 .../mage/sets/mastersedition/JuzamDjinn.java  |   2 +-
 .../sets/mastersedition/KeldonWarlord.java    |   2 +-
 .../sets/mastersedition/LakeOfTheDead.java    |   2 +-
 .../sets/mastersedition/LightningBolt.java    |   2 +-
 .../sets/mastersedition/LimDulsVault.java     |   2 +-
 .../mastersedition/LordOfTresserhorn.java     |   2 +-
 .../mage/sets/mastersedition/ManaFlare.java   |   2 +-
 .../sets/mastersedition/MishrasFactory.java   |   2 +-
 .../src/mage/sets/mastersedition/Moat.java    |   2 +-
 .../sets/mastersedition/MountainYeti.java     |   2 +-
 .../sets/mastersedition/MysticRemora.java     |   2 +-
 .../mage/sets/mastersedition/NaturesLore.java |   2 +-
 .../sets/mastersedition/NetherShadow.java     |   2 +-
 .../sets/mastersedition/NevinyrralsDisk.java  |   2 +-
 .../sets/mastersedition/OrcishMechanics.java  |   2 +-
 .../mage/sets/mastersedition/Oubliette.java   |   2 +-
 .../mage/sets/mastersedition/Paralyze.java    |   2 +-
 .../sets/mastersedition/PhantomMonster.java   |   2 +-
 .../mage/sets/mastersedition/Phelddagrif.java |   2 +-
 .../mastersedition/PhyrexianWarBeast.java     |   2 +-
 .../mage/sets/mastersedition/PolarKraken.java |   2 +-
 .../src/mage/sets/mastersedition/Pox.java     |   2 +-
 .../mage/sets/mastersedition/PrimalOrder.java |   2 +-
 .../sets/mastersedition/PsychicVenom.java     |   2 +-
 .../mage/sets/mastersedition/Pyroblast.java   |   2 +-
 .../mastersedition/RighteousAvengers.java     |   2 +-
 .../src/mage/sets/mastersedition/Roots.java   |   2 +-
 .../sets/mastersedition/ScrybSprites.java     |   2 +-
 .../mage/sets/mastersedition/SeaSprite.java   |   2 +-
 .../mage/sets/mastersedition/Seasinger.java   |   2 +-
 .../sets/mastersedition/SerendibEfreet.java   |   2 +-
 .../sets/mastersedition/SerpentGenerator.java |   2 +-
 .../sets/mastersedition/ShieldSphere.java     |   2 +-
 .../mage/sets/mastersedition/SingingTree.java |   2 +-
 .../sets/mastersedition/SpinalVillain.java    |   2 +-
 .../mage/sets/mastersedition/StoneGiant.java  |   2 +-
 .../src/mage/sets/mastersedition/SuChi.java   |   2 +-
 .../sets/mastersedition/SylvanLibrary.java    |   2 +-
 .../sets/mastersedition/TawnossCoffin.java    |   2 +-
 .../sets/mastersedition/ThawingGlaciers.java  |   2 +-
 .../sets/mastersedition/ThicketBasilisk.java  |   2 +-
 .../sets/mastersedition/ThornThallid.java     |   2 +-
 .../sets/mastersedition/ThrullRetainer.java   |   2 +-
 .../sets/mastersedition/ThunderSpirit.java    |   2 +-
 .../sets/mastersedition/TivadarsCrusade.java  |   2 +-
 .../src/mage/sets/mastersedition/Tornado.java |   2 +-
 .../sets/mastersedition/UrzasChalice.java     |   2 +-
 .../mastersedition/VesuvanDoppelganger.java   |   2 +-
 .../sets/mastersedition/VodalianKnights.java  |   2 +-
 .../mage/sets/mastersedition/Wanderlust.java  |   2 +-
 .../sets/mastersedition/WindsOfChange.java    |   2 +-
 .../mage/sets/mastersedition/WinterOrb.java   |   2 +-
 .../mage/sets/mastersedition/WyluliWolf.java  |   2 +-
 .../sets/mastersedition/YavimayaAnts.java     |   2 +-
 .../mage/sets/mastersedition/ZuranOrb.java    |   2 +-
 .../sets/masterseditionii/AbbeyGargoyles.java |   2 +-
 .../masterseditionii/AdarkarSentinel.java     |   2 +-
 .../sets/masterseditionii/AmbushParty.java    |   2 +-
 .../mage/sets/masterseditionii/Anarchy.java   |   2 +-
 .../sets/masterseditionii/AngelOfFury.java    |   2 +-
 .../sets/masterseditionii/AngelOfLight.java   |   2 +-
 .../sets/masterseditionii/ArmoredGriffin.java |   2 +-
 .../mage/sets/masterseditionii/Aurochs.java   |   2 +-
 .../mage/sets/masterseditionii/Badlands.java  |   2 +-
 .../BalduvianTradingPost.java                 |   2 +-
 .../sets/masterseditionii/BarbedSextant.java  |   2 +-
 .../sets/masterseditionii/Brainstorm.java     |   2 +-
 .../sets/masterseditionii/BrassclawOrcs.java  |   2 +-
 .../masterseditionii/BrimstoneDragon.java     |   2 +-
 .../mage/sets/masterseditionii/Browse.java    |   2 +-
 .../mage/sets/masterseditionii/Burnout.java   |   2 +-
 .../sets/masterseditionii/CaribouRange.java   |   2 +-
 .../mage/sets/masterseditionii/Conquer.java   |   2 +-
 .../sets/masterseditionii/Counterspell.java   |   2 +-
 .../sets/masterseditionii/DanceOfTheDead.java |   2 +-
 .../sets/masterseditionii/DarkBanishing.java  |   2 +-
 .../mage/sets/masterseditionii/DeepSpawn.java |   2 +-
 .../masterseditionii/DemonicConsultation.java |   2 +-
 .../sets/masterseditionii/Disenchant.java     |   2 +-
 .../sets/masterseditionii/DwarvenRuins.java   |   2 +-
 .../mage/sets/masterseditionii/Dystopia.java  |   2 +-
 .../sets/masterseditionii/EbonStronghold.java |   2 +-
 .../sets/masterseditionii/ElvishRanger.java   |   2 +-
 .../masterseditionii/ElvishSpiritGuide.java   |   2 +-
 .../sets/masterseditionii/FarrelsMantle.java  |   2 +-
 .../sets/masterseditionii/FarrelsZealot.java  |   2 +-
 .../sets/masterseditionii/FeralThallid.java   |   2 +-
 .../sets/masterseditionii/FireDragon.java     |   2 +-
 .../sets/masterseditionii/FlameSpirit.java    |   2 +-
 .../sets/masterseditionii/ForbiddenLore.java  |   2 +-
 .../sets/masterseditionii/FungalBloom.java    |   2 +-
 .../sets/masterseditionii/GiantGrowth.java    |   2 +-
 .../sets/masterseditionii/GlacialChasm.java   |   2 +-
 .../masterseditionii/GlacialCrevasses.java    |   2 +-
 .../sets/masterseditionii/GorillaShaman.java  |   2 +-
 .../HavenwoodBattleground.java                |   2 +-
 .../masterseditionii/HeartOfYavimaya.java     |   2 +-
 .../masterseditionii/HelmOfObedience.java     |   2 +-
 .../masterseditionii/IcatianJavelineers.java  |   2 +-
 .../mage/sets/masterseditionii/Icequake.java  |   2 +-
 .../mage/sets/masterseditionii/IcyPrison.java |   2 +-
 .../sets/masterseditionii/IhsansShade.java    |   2 +-
 .../masterseditionii/ImperialRecruiter.java   |   2 +-
 .../sets/masterseditionii/ImperialSeal.java   |   2 +-
 .../sets/masterseditionii/Incinerate.java     |   2 +-
 .../sets/masterseditionii/Inheritance.java    |   2 +-
 .../sets/masterseditionii/IronclawOrcs.java   |   2 +-
 .../sets/masterseditionii/JohtullWurm.java    |   2 +-
 .../JuniperOrderAdvocate.java                 |   2 +-
 .../src/mage/sets/masterseditionii/Kaysa.java |   2 +-
 .../sets/masterseditionii/KjeldoranDead.java  |   2 +-
 .../masterseditionii/KjeldoranOutpost.java    |   2 +-
 .../masterseditionii/KnightOfStromgald.java   |   2 +-
 .../sets/masterseditionii/KrovikanFetish.java |   2 +-
 .../masterseditionii/KrovikanSorcerer.java    |   2 +-
 .../sets/masterseditionii/LeapingLizard.java  |   2 +-
 .../masterseditionii/LimDulsHighGuard.java    |   2 +-
 .../masterseditionii/MagusOfTheUnseen.java    |   2 +-
 .../mage/sets/masterseditionii/ManaCrypt.java |   2 +-
 .../mage/sets/masterseditionii/Narwhal.java   |   2 +-
 .../mage/sets/masterseditionii/Necrite.java   |   2 +-
 .../sets/masterseditionii/Necropotence.java   |   2 +-
 .../mage/sets/masterseditionii/NightSoil.java |   2 +-
 .../sets/masterseditionii/OrcGeneral.java     |   2 +-
 .../masterseditionii/OrcishCannoneers.java    |   2 +-
 .../masterseditionii/OrcishLumberjack.java    |   2 +-
 .../OrderOfTheSacredTorch.java                |   2 +-
 .../OrderOfTheWhiteShield.java                |   2 +-
 .../sets/masterseditionii/PersonalTutor.java  |   2 +-
 .../masterseditionii/PhyrexianDevourer.java   |   2 +-
 .../mage/sets/masterseditionii/Pillage.java   |   2 +-
 .../mage/sets/masterseditionii/Portent.java   |   2 +-
 .../sets/masterseditionii/Pyrokinesis.java    |   2 +-
 .../sets/masterseditionii/RavagesOfWar.java   |   2 +-
 .../sets/masterseditionii/RayOfCommand.java   |   2 +-
 .../mage/sets/masterseditionii/Reprisal.java  |   2 +-
 .../sets/masterseditionii/RighteousFury.java  |   2 +-
 .../sets/masterseditionii/Roterothopter.java  |   2 +-
 .../sets/masterseditionii/RoyalTrooper.java   |   2 +-
 .../sets/masterseditionii/RuinsOfTrokair.java |   2 +-
 .../mage/sets/masterseditionii/Savannah.java  |   2 +-
 .../sets/masterseditionii/SibilantSpirit.java |   2 +-
 .../sets/masterseditionii/SkeletonShip.java   |   2 +-
 .../sets/masterseditionii/SkullCatapult.java  |   2 +-
 .../masterseditionii/SnowCoveredForest.java   |   2 +-
 .../masterseditionii/SnowCoveredIsland.java   |   2 +-
 .../masterseditionii/SnowCoveredMountain.java |   2 +-
 .../masterseditionii/SnowCoveredPlains.java   |   2 +-
 .../masterseditionii/SnowCoveredSwamp.java    |   2 +-
 .../sets/masterseditionii/SoldeviDigger.java  |   2 +-
 .../masterseditionii/SoldeviExcavations.java  |   2 +-
 .../masterseditionii/SongsOfTheDamned.java    |   2 +-
 .../sets/masterseditionii/SporeFlower.java    |   2 +-
 .../mage/sets/masterseditionii/Stampede.java  |   2 +-
 .../sets/masterseditionii/StoneSpirit.java    |   2 +-
 .../sets/masterseditionii/Stonehands.java     |   2 +-
 .../sets/masterseditionii/StromgaldCabal.java |   2 +-
 .../sets/masterseditionii/StuntedGrowth.java  |   2 +-
 .../masterseditionii/SustainingSpirit.java    |   2 +-
 .../masterseditionii/SvyeluniteTemple.java    |   2 +-
 .../masterseditionii/SwordsToPlowshares.java  |   2 +-
 .../src/mage/sets/masterseditionii/Taiga.java |   2 +-
 .../TemporalManipulation.java                 |   2 +-
 .../mage/sets/masterseditionii/Thallid.java   |   2 +-
 .../masterseditionii/ThallidDevourer.java     |   2 +-
 .../sets/masterseditionii/ThunderWall.java    |   2 +-
 .../sets/masterseditionii/TinderWall.java     |   2 +-
 .../mage/sets/masterseditionii/Tundra.java    |   2 +-
 .../sets/masterseditionii/UndergroundSea.java |   2 +-
 .../sets/masterseditionii/WallOfKelp.java     |   2 +-
 .../mage/sets/masterseditionii/Whiteout.java  |   2 +-
 .../sets/masterseditionii/WindSpirit.java     |   2 +-
 .../masterseditionii/ZuranSpellcaster.java    |   2 +-
 .../sets/masterseditioniii/ActiveVolcano.java |   2 +-
 .../masterseditioniii/AkronLegionnaire.java   |   2 +-
 .../sets/masterseditioniii/AmrouKithkin.java  |   2 +-
 .../sets/masterseditioniii/AnabaAncestor.java |   2 +-
 .../masterseditioniii/AnabaSpiritCrafter.java |   2 +-
 .../masterseditioniii/AngusMackenzie.java     |   2 +-
 .../masterseditioniii/ArenaOfTheAncients.java |   2 +-
 .../sets/masterseditioniii/AshesToAshes.java  |   2 +-
 .../masterseditioniii/BarktoothWarbeard.java  |   2 +-
 .../sets/masterseditioniii/BarlsCage.java     |   2 +-
 .../sets/masterseditioniii/BartelRuneaxe.java |   2 +-
 .../mage/sets/masterseditioniii/Bayou.java    |   2 +-
 .../masterseditioniii/BazaarOfBaghdad.java    |   2 +-
 .../sets/masterseditioniii/BlackVise.java     |   2 +-
 .../sets/masterseditioniii/BloodLust.java     |   2 +-
 .../sets/masterseditioniii/Boomerang.java     |   2 +-
 .../masterseditioniii/BorisDevilboon.java     |   2 +-
 .../Borrowing100000Arrows.java                |   2 +-
 .../sets/masterseditioniii/BrilliantPlan.java |   2 +-
 .../masterseditioniii/BurningOfXinye.java     |   2 +-
 .../masterseditioniii/CaptureOfJingzhou.java  |   2 +-
 .../sets/masterseditioniii/CarrionAnts.java   |   2 +-
 .../masterseditioniii/ChainLightning.java     |   2 +-
 .../sets/masterseditioniii/CinderStorm.java   |   2 +-
 .../sets/masterseditioniii/CityOfShadows.java |   2 +-
 .../mage/sets/masterseditioniii/Cleanse.java  |   2 +-
 .../sets/masterseditioniii/CosmicHorror.java  |   2 +-
 .../masterseditioniii/CrimsonKobolds.java     |   2 +-
 .../masterseditioniii/CrimsonManticore.java   |   2 +-
 .../masterseditioniii/DAvenantArcher.java     |   2 +-
 .../sets/masterseditioniii/DanceOfMany.java   |   2 +-
 .../masterseditioniii/DemonicTorment.java     |   2 +-
 .../sets/masterseditioniii/DesertTwister.java |   2 +-
 .../masterseditioniii/DesperateCharge.java    |   2 +-
 .../sets/masterseditioniii/Didgeridoo.java    |   2 +-
 .../sets/masterseditioniii/Disenchant.java    |   2 +-
 .../masterseditioniii/DongZhouTheTyrant.java  |   2 +-
 .../masterseditioniii/ElvesOfDeepShadow.java  |   2 +-
 .../sets/masterseditioniii/EvilPresence.java  |   2 +-
 .../mage/sets/masterseditioniii/Famine.java   |   2 +-
 .../sets/masterseditioniii/FellwarStone.java  |   2 +-
 .../masterseditioniii/FeveredStrength.java    |   2 +-
 .../sets/masterseditioniii/FireAmbush.java    |   2 +-
 .../sets/masterseditioniii/FireDrake.java     |   2 +-
 .../sets/masterseditioniii/FlashFlood.java    |   2 +-
 .../sets/masterseditioniii/ForceSpike.java    |   2 +-
 .../sets/masterseditioniii/FrostGiant.java    |   2 +-
 .../sets/masterseditioniii/GaeasTouch.java    |   2 +-
 .../sets/masterseditioniii/GhostlyVisit.java  |   2 +-
 .../sets/masterseditioniii/GiantGrowth.java   |   2 +-
 .../sets/masterseditioniii/GrimTutor.java     |   2 +-
 .../masterseditioniii/GwendlynDiCorci.java    |   2 +-
 .../sets/masterseditioniii/HazezonTamar.java  |   2 +-
 .../src/mage/sets/masterseditioniii/Heal.java |   2 +-
 .../HuaTuoHonoredPhysician.java               |   2 +-
 .../masterseditioniii/HundingGjornersen.java  |   2 +-
 .../masterseditioniii/HuntingCheetah.java     |   2 +-
 .../masterseditioniii/HurloonMinotaur.java    |   2 +-
 .../sets/masterseditioniii/Immolation.java    |   2 +-
 .../mage/sets/masterseditioniii/Infuse.java   |   2 +-
 .../masterseditioniii/IvoryGuardians.java     |   2 +-
 .../sets/masterseditioniii/JeditOjanen.java   |   2 +-
 .../JerrardOfTheClosedFist.java               |   2 +-
 .../sets/masterseditioniii/JungleLion.java    |   2 +-
 .../mage/sets/masterseditioniii/Karakas.java  |   2 +-
 .../sets/masterseditioniii/KillerBees.java    |   2 +-
 .../masterseditioniii/KoboldOverlord.java     |   2 +-
 .../masterseditioniii/KoboldTaskmaster.java   |   2 +-
 .../masterseditioniii/KoboldsOfKherKeep.java  |   2 +-
 .../KongmingSleepingDragon.java               |   2 +-
 .../sets/masterseditioniii/LadyEvangela.java  |   2 +-
 .../mage/sets/masterseditioniii/LadyOrca.java |   2 +-
 .../mage/sets/masterseditioniii/LandTax.java  |   2 +-
 .../sets/masterseditioniii/LightningBlow.java |   2 +-
 .../masterseditioniii/LiuBeiLordOfShu.java    |   2 +-
 .../sets/masterseditioniii/LivingPlane.java   |   2 +-
 .../masterseditioniii/LoyalRetainers.java     |   2 +-
 .../masterseditioniii/LuMengWuGeneral.java    |   2 +-
 .../LuXunScholarGeneral.java                  |   2 +-
 .../sets/masterseditioniii/ManaDrain.java     |   2 +-
 .../masterseditioniii/MarhaultElsdragon.java  |   2 +-
 .../MengHuoBarbarianKing.java                 |   2 +-
 .../sets/masterseditioniii/MengHuosHorde.java |   2 +-
 .../sets/masterseditioniii/MindTwist.java     |   2 +-
 .../sets/masterseditioniii/NetherVoid.java    |   2 +-
 .../sets/masterseditioniii/NicolBolas.java    |   2 +-
 .../masterseditioniii/OldManOfTheSea.java     |   2 +-
 .../sets/masterseditioniii/PavelMaliki.java   |   2 +-
 .../masterseditioniii/PeachGardenOath.java    |   2 +-
 .../mage/sets/masterseditioniii/Plateau.java  |   2 +-
 .../masterseditioniii/RagingMinotaur.java     |   2 +-
 .../mage/sets/masterseditioniii/Ragnar.java   |   2 +-
 .../masterseditioniii/RamirezDePietro.java    |   2 +-
 .../mage/sets/masterseditioniii/Recall.java   |   2 +-
 .../sets/masterseditioniii/Reincarnation.java |   2 +-
 .../sets/masterseditioniii/RemoveSoul.java    |   2 +-
 .../mage/sets/masterseditioniii/Reset.java    |   2 +-
 .../sets/masterseditioniii/RivenTurnbull.java |   2 +-
 .../masterseditioniii/RollingEarthquake.java  |   2 +-
 .../masterseditioniii/RubiniaSoulsinger.java  |   2 +-
 .../sets/masterseditioniii/Scrubland.java     |   2 +-
 .../sets/masterseditioniii/ScrybSprites.java  |   2 +-
 .../sets/masterseditioniii/ShuGeneral.java    |   2 +-
 .../masterseditioniii/ShuSoldierFarmers.java  |   2 +-
 .../SirShandlarOfEberyn.java                  |   2 +-
 .../masterseditioniii/SivitriScarzam.java     |   2 +-
 .../sets/masterseditioniii/SlashingTiger.java |   2 +-
 .../mage/sets/masterseditioniii/SolGrail.java |   2 +-
 .../masterseditioniii/SpoilsOfVictory.java    |   2 +-
 .../masterseditioniii/StrategicPlanning.java  |   2 +-
 .../masterseditioniii/SunQuanLordOfWu.java    |   2 +-
 .../masterseditioniii/SunastianFalconer.java  |   2 +-
 .../sets/masterseditioniii/TetsuoUmezawa.java |   2 +-
 .../mage/sets/masterseditioniii/TheAbyss.java |   2 +-
 .../TheLadyOfTheMountain.java                 |   2 +-
 .../TheTabernacleAtPendrellVale.java          |   2 +-
 .../sets/masterseditioniii/TheWretched.java   |   2 +-
 .../sets/masterseditioniii/ThreeVisits.java   |   2 +-
 .../sets/masterseditioniii/TobiasAndrion.java |   2 +-
 .../mage/sets/masterseditioniii/TorWauki.java |   2 +-
 .../masterseditioniii/TorstenVonUrsus.java    |   2 +-
 .../masterseditioniii/TropicalIsland.java     |   2 +-
 .../mage/sets/masterseditioniii/Urborg.java   |   2 +-
 .../masterseditioniii/VolcanicIsland.java     |   2 +-
 .../sets/masterseditioniii/WeiInfantry.java   |   2 +-
 .../masterseditioniii/WeiNightRaiders.java    |   2 +-
 .../masterseditioniii/WeiStrikeForce.java     |   2 +-
 .../masterseditioniii/WillowPriestess.java    |   2 +-
 .../sets/masterseditioniii/WillowSatyr.java   |   2 +-
 .../masterseditioniii/WormwoodTreefolk.java   |   2 +-
 .../masterseditioniii/WuEliteCavalry.java     |   2 +-
 .../sets/masterseditioniii/WuLongbowman.java  |   2 +-
 .../XiahouDunTheOneEyed.java                  |   2 +-
 .../sets/masterseditioniii/XiraArien.java     |   2 +-
 .../sets/masterseditioniii/ZodiacDragon.java  |   2 +-
 .../mage/sets/masterseditioniv/AcidRain.java  |   2 +-
 .../sets/masterseditioniv/AesthirGlider.java  |   2 +-
 .../sets/masterseditioniv/AirElemental.java   |   2 +-
 .../masterseditioniv/AlabornMusketeer.java    |   2 +-
 .../sets/masterseditioniv/AlabornTrooper.java |   2 +-
 .../sets/masterseditioniv/AliFromCairo.java   |   2 +-
 .../sets/masterseditioniv/AlluringScent.java  |   2 +-
 .../sets/masterseditioniv/AmuletOfKroog.java  |   2 +-
 .../masterseditioniv/ArgivianBlacksmith.java  |   2 +-
 .../masterseditioniv/ArgothianPixies.java     |   2 +-
 .../masterseditioniv/ArgothianTreefolk.java   |   2 +-
 .../sets/masterseditioniv/Armageddon.java     |   2 +-
 .../sets/masterseditioniv/ArtifactBlast.java  |   2 +-
 .../sets/masterseditioniv/AshnodsAltar.java   |   2 +-
 .../src/mage/sets/masterseditioniv/Atog.java  |   2 +-
 .../mage/sets/masterseditioniv/Badlands.java  |   2 +-
 .../mage/sets/masterseditioniv/Balance.java   |   2 +-
 .../sets/masterseditioniv/BasaltMonolith.java |   2 +-
 .../src/mage/sets/masterseditioniv/Bayou.java |   2 +-
 .../mage/sets/masterseditioniv/BeeSting.java  |   2 +-
 .../sets/masterseditioniv/BirdMaiden.java     |   2 +-
 .../sets/masterseditioniv/BlackKnight.java    |   2 +-
 .../masterseditioniv/BlueElementalBlast.java  |   2 +-
 .../sets/masterseditioniv/BookOfRass.java     |   2 +-
 .../masterseditioniv/BottleOfSuleiman.java    |   2 +-
 .../sets/masterseditioniv/Braingeyser.java    |   2 +-
 .../mage/sets/masterseditioniv/BrassMan.java  |   2 +-
 .../masterseditioniv/CandelabraOfTawnos.java  |   2 +-
 .../mage/sets/masterseditioniv/Channel.java   |   2 +-
 .../sets/masterseditioniv/CitanulDruid.java   |   2 +-
 .../sets/masterseditioniv/CityOfBrass.java    |   2 +-
 .../sets/masterseditioniv/ClayStatue.java     |   2 +-
 .../sets/masterseditioniv/ClockworkAvian.java |   2 +-
 .../sets/masterseditioniv/CloudSpirit.java    |   2 +-
 .../masterseditioniv/ColossusOfSardia.java    |   2 +-
 .../sets/masterseditioniv/ControlMagic.java   |   2 +-
 .../sets/masterseditioniv/Conversion.java     |   2 +-
 .../sets/masterseditioniv/CopyArtifact.java   |   2 +-
 .../sets/masterseditioniv/Counterspell.java   |   2 +-
 .../sets/masterseditioniv/DakmorPlague.java   |   2 +-
 .../sets/masterseditioniv/DarkRitual.java     |   2 +-
 .../sets/masterseditioniv/DeathcoilWurm.java  |   2 +-
 .../mage/sets/masterseditioniv/Deathgrip.java |   2 +-
 .../sets/masterseditioniv/DemonicHordes.java  |   2 +-
 .../sets/masterseditioniv/DemonicTutor.java   |   2 +-
 .../mage/sets/masterseditioniv/Detonate.java  |   2 +-
 .../sets/masterseditioniv/Devastation.java    |   2 +-
 .../masterseditioniv/DiabolicMachine.java     |   2 +-
 .../sets/masterseditioniv/DivineOffering.java |   2 +-
 .../sets/masterseditioniv/DragonEngine.java   |   2 +-
 .../sets/masterseditioniv/DreadReaper.java    |   2 +-
 .../sets/masterseditioniv/DropOfHoney.java    |   2 +-
 .../mage/sets/masterseditioniv/Drowned.java   |   2 +-
 .../sets/masterseditioniv/DustToDust.java     |   2 +-
 .../sets/masterseditioniv/EbonDragon.java     |   2 +-
 .../sets/masterseditioniv/EbonyHorse.java     |   2 +-
 .../sets/masterseditioniv/EbonyRhino.java     |   2 +-
 .../masterseditioniv/EliteCatWarrior.java     |   2 +-
 .../sets/masterseditioniv/EnergyFlux.java     |   2 +-
 .../sets/masterseditioniv/EyeForAnEye.java    |   2 +-
 .../sets/masterseditioniv/FalseSummoning.java |   2 +-
 .../mage/sets/masterseditioniv/Fastbond.java  |   2 +-
 .../mage/sets/masterseditioniv/FireImp.java   |   2 +-
 .../sets/masterseditioniv/FireTempest.java    |   2 +-
 .../mage/sets/masterseditioniv/Fireball.java  |   2 +-
 .../sets/masterseditioniv/FlyingCarpet.java   |   2 +-
 .../src/mage/sets/masterseditioniv/Fog.java   |   2 +-
 .../sets/masterseditioniv/ForceOfNature.java  |   2 +-
 .../src/mage/sets/masterseditioniv/Fork.java  |   2 +-
 .../sets/masterseditioniv/GateToPhyrexia.java |   2 +-
 .../masterseditioniv/GauntletOfMight.java     |   2 +-
 .../sets/masterseditioniv/GiantGrowth.java    |   2 +-
 .../sets/masterseditioniv/GiantTortoise.java  |   2 +-
 .../sets/masterseditioniv/GlassesOfUrza.java  |   2 +-
 .../src/mage/sets/masterseditioniv/Gloom.java |   2 +-
 .../sets/masterseditioniv/GoblinBully.java    |   2 +-
 .../masterseditioniv/GoblinCavaliers.java     |   2 +-
 .../sets/masterseditioniv/GoblinCaves.java    |   2 +-
 .../masterseditioniv/GoblinFirestarter.java   |   2 +-
 .../sets/masterseditioniv/GoblinGeneral.java  |   2 +-
 .../sets/masterseditioniv/GoblinWarrens.java  |   2 +-
 .../masterseditioniv/GrapeshotCatapult.java   |   2 +-
 .../sets/masterseditioniv/HealingSalve.java   |   2 +-
 .../masterseditioniv/HornOfDeafening.java     |   2 +-
 .../sets/masterseditioniv/HowlFromBeyond.java |   2 +-
 .../sets/masterseditioniv/IcyManipulator.java |   2 +-
 .../masterseditioniv/InTheEyeOfChaos.java     |   2 +-
 .../sets/masterseditioniv/InstillEnergy.java  |   2 +-
 .../sets/masterseditioniv/IronhoofOx.java     |   2 +-
 .../masterseditioniv/IslandSanctuary.java     |   2 +-
 .../sets/masterseditioniv/JadeMonolith.java   |   2 +-
 .../sets/masterseditioniv/Juggernaut.java     |   2 +-
 .../sets/masterseditioniv/JununEfreet.java    |   2 +-
 .../mage/sets/masterseditioniv/Kismet.java    |   2 +-
 .../sets/masterseditioniv/KormusBell.java     |   2 +-
 .../mage/sets/masterseditioniv/LavaFlow.java  |   2 +-
 .../mage/sets/masterseditioniv/Leeches.java   |   2 +-
 .../masterseditioniv/LibraryOfAlexandria.java |   2 +-
 .../sets/masterseditioniv/LibraryOfLeng.java  |   2 +-
 .../sets/masterseditioniv/LivingLands.java    |   2 +-
 .../sets/masterseditioniv/LivingWall.java     |   2 +-
 .../sets/masterseditioniv/MahamotiDjinn.java  |   2 +-
 .../mage/sets/masterseditioniv/ManaVault.java |   2 +-
 .../mage/sets/masterseditioniv/MazeOfIth.java |   2 +-
 .../sets/masterseditioniv/Mightstone.java     |   2 +-
 .../masterseditioniv/MishrasWorkshop.java     |   2 +-
 .../sets/masterseditioniv/MysticDecree.java   |   2 +-
 .../masterseditioniv/NakedSingularity.java    |   2 +-
 .../src/mage/sets/masterseditioniv/Oasis.java |   2 +-
 .../masterseditioniv/ObeliskOfUndoing.java    |   2 +-
 .../sets/masterseditioniv/ObsianusGolem.java  |   2 +-
 .../sets/masterseditioniv/OgreTaskmaster.java |   2 +-
 .../mage/sets/masterseditioniv/Onulet.java    |   2 +-
 .../masterseditioniv/OrcishMechanics.java     |   2 +-
 .../sets/masterseditioniv/OsaiVultures.java   |   2 +-
 .../masterseditioniv/OverwhelmingForces.java  |   2 +-
 .../sets/masterseditioniv/OwlFamiliar.java    |   2 +-
 .../masterseditioniv/PentagramOfTheAges.java  |   2 +-
 .../masterseditioniv/PhantasmalForces.java    |   2 +-
 .../masterseditioniv/PhantasmalTerrain.java   |   2 +-
 .../mage/sets/masterseditioniv/Plateau.java   |   2 +-
 .../sets/masterseditioniv/PowerArtifact.java  |   2 +-
 .../sets/masterseditioniv/PrimalClay.java     |   2 +-
 .../masterseditioniv/ProdigalSorcerer.java    |   2 +-
 .../sets/masterseditioniv/RadjanSpirit.java   |   2 +-
 .../sets/masterseditioniv/RainOfDaggers.java  |   2 +-
 .../sets/masterseditioniv/Reconstruction.java |   2 +-
 .../masterseditioniv/RedElementalBlast.java   |   2 +-
 .../mage/sets/masterseditioniv/Regrowth.java  |   2 +-
 .../masterseditioniv/RighteousCharge.java     |   2 +-
 .../masterseditioniv/RocOfKherRidges.java     |   2 +-
 .../masterseditioniv/RockslideAmbush.java     |   2 +-
 .../mage/sets/masterseditioniv/Sandstorm.java |   2 +-
 .../mage/sets/masterseditioniv/Savannah.java  |   2 +-
 .../sets/masterseditioniv/SavannahLions.java  |   2 +-
 .../sets/masterseditioniv/ScavengerFolk.java  |   2 +-
 .../masterseditioniv/ScavengingGhoul.java     |   2 +-
 .../mage/sets/masterseditioniv/Scrubland.java |   2 +-
 .../sets/masterseditioniv/SeaSerpent.java     |   2 +-
 .../sets/masterseditioniv/SengirVampire.java  |   2 +-
 .../sets/masterseditioniv/SerraAngel.java     |   2 +-
 .../sets/masterseditioniv/SerraAviary.java    |   2 +-
 .../sets/masterseditioniv/Shapeshifter.java   |   2 +-
 .../sets/masterseditioniv/ShivanDragon.java   |   2 +-
 .../mage/sets/masterseditioniv/Sinkhole.java  |   2 +-
 .../sets/masterseditioniv/SleightOfHand.java  |   2 +-
 .../src/mage/sets/masterseditioniv/Smoke.java |   2 +-
 .../mage/sets/masterseditioniv/SolRing.java   |   2 +-
 .../masterseditioniv/SouthernElephant.java    |   2 +-
 .../sets/masterseditioniv/SpottedGriffin.java |   2 +-
 .../mage/sets/masterseditioniv/Squall.java    |   2 +-
 .../mage/sets/masterseditioniv/Stasis.java    |   2 +-
 .../sets/masterseditioniv/SteamCatapult.java  |   2 +-
 .../mage/sets/masterseditioniv/StripMine.java |   2 +-
 .../masterseditioniv/SwordsToPlowshares.java  |   2 +-
 .../sets/masterseditioniv/SylvanTutor.java    |   2 +-
 .../masterseditioniv/SymbolOfUnsummoning.java |   2 +-
 .../sets/masterseditioniv/TabletOfEpityr.java |   2 +-
 .../src/mage/sets/masterseditioniv/Taiga.java |   2 +-
 .../masterseditioniv/TalasResearcher.java     |   2 +-
 .../sets/masterseditioniv/TawnossWand.java    |   2 +-
 .../masterseditioniv/TawnossWeaponry.java     |   2 +-
 .../sets/masterseditioniv/TempleAcolyte.java  |   2 +-
 .../mage/sets/masterseditioniv/Terror.java    |   2 +-
 .../mage/sets/masterseditioniv/Tetravus.java  |   2 +-
 .../sets/masterseditioniv/TheftOfDreams.java  |   2 +-
 .../sets/masterseditioniv/ThunderDragon.java  |   2 +-
 .../mage/sets/masterseditioniv/TimeVault.java |   2 +-
 .../sets/masterseditioniv/TitaniasSong.java   |   2 +-
 .../masterseditioniv/TransmuteArtifact.java   |   2 +-
 .../sets/masterseditioniv/TriassicEgg.java    |   2 +-
 .../sets/masterseditioniv/TropicalIsland.java |   2 +-
 .../mage/sets/masterseditioniv/Tsunami.java   |   2 +-
 .../mage/sets/masterseditioniv/Tundra.java    |   2 +-
 .../sets/masterseditioniv/UndergroundSea.java |   2 +-
 .../sets/masterseditioniv/UrzasChalice.java   |   2 +-
 .../mage/sets/masterseditioniv/UrzasMine.java |   2 +-
 .../masterseditioniv/UrzasPowerPlant.java     |   2 +-
 .../sets/masterseditioniv/UrzasTower.java     |   2 +-
 .../sets/masterseditioniv/VolcanicIsland.java |   2 +-
 .../sets/masterseditioniv/WarMammoth.java     |   2 +-
 .../sets/masterseditioniv/WarpArtifact.java   |   2 +-
 .../sets/masterseditioniv/WaterElemental.java |   2 +-
 .../mage/sets/masterseditioniv/Weakness.java  |   2 +-
 .../mage/sets/masterseditioniv/Weakstone.java |   2 +-
 .../sets/masterseditioniv/WheelOfFortune.java |   2 +-
 .../sets/masterseditioniv/WhiptailWurm.java   |   2 +-
 .../sets/masterseditioniv/WhiteKnight.java    |   2 +-
 .../sets/masterseditioniv/WickedPact.java     |   2 +-
 .../sets/masterseditioniv/WildGriffin.java    |   2 +-
 .../mage/sets/masterseditioniv/WildOx.java    |   2 +-
 .../sets/masterseditioniv/YotianSoldier.java  |   2 +-
 .../sets/masterseditioniv/ZombieMaster.java   |   2 +-
 .../src/mage/sets/mediainserts/Acquire.java   |   2 +-
 .../sets/mediainserts/AeronautTinkerer.java   |   2 +-
 .../mediainserts/AjaniCallerOfThePride.java   |   2 +-
 .../sets/mediainserts/AjaniSteadfast.java     |   2 +-
 .../mediainserts/AlhammarretHighArbiter.java  |   2 +-
 .../sets/mediainserts/AngelOfGlorysRise.java  |   2 +-
 .../sets/mediainserts/AngelicSkirmisher.java  |   2 +-
 .../mage/sets/mediainserts/AnkleShanker.java  |   2 +-
 .../sets/mediainserts/ArashinSovereign.java   |   2 +-
 .../mediainserts/ArchfiendOfDepravity.java    |   2 +-
 .../src/mage/sets/mediainserts/Arena.java     |   2 +-
 .../src/mage/sets/mediainserts/Arrest.java    |   2 +-
 .../sets/mediainserts/AssembledAlphas.java    |   2 +-
 .../sets/mediainserts/AvalancheTusker.java    |   2 +-
 .../mage/sets/mediainserts/BarrageTyrant.java |   2 +-
 .../sets/mediainserts/BirdsOfParadise.java    |   2 +-
 .../sets/mediainserts/BloodthroneVampire.java |   2 +-
 .../sets/mediainserts/BlueElementalBlast.java |   2 +-
 .../sets/mediainserts/BoltwingMarauder.java   |   2 +-
 .../sets/mediainserts/BonescytheSliver.java   |   2 +-
 .../sets/mediainserts/BreathOfMalfegor.java   |   2 +-
 .../mage/sets/mediainserts/BrionStoutarm.java |   2 +-
 .../sets/mediainserts/BroodmateDragon.java    |   2 +-
 .../sets/mediainserts/CathedralOfWar.java     |   2 +-
 .../sets/mediainserts/CelestialColonnade.java |   2 +-
 .../mediainserts/ChandraFireOfKaladesh.java   |   2 +-
 .../sets/mediainserts/ChandraPyromaster.java  |   2 +-
 .../sets/mediainserts/ChandraPyromaster2.java |   2 +-
 .../mediainserts/ChandraRoaringFlame.java     |   2 +-
 .../mage/sets/mediainserts/ChandrasFury.java  |   2 +-
 .../sets/mediainserts/ChandrasPhoenix.java    |   2 +-
 .../mage/sets/mediainserts/ConsumeSpirit.java |   2 +-
 .../src/mage/sets/mediainserts/Corrupt.java   |   2 +-
 .../mage/sets/mediainserts/DayOfJudgment.java |   2 +-
 .../sets/mediainserts/DeepfathomSkulker.java  |   2 +-
 .../sets/mediainserts/DefiantBloodlord.java   |   2 +-
 .../mage/sets/mediainserts/DevilsPlay.java    |   2 +-
 .../mage/sets/mediainserts/DragonFodder.java  |   2 +-
 .../sets/mediainserts/DragonlordsServant.java |   2 +-
 .../sets/mediainserts/DragonscaleGeneral.java |   2 +-
 .../mage/sets/mediainserts/DreadDefiler.java  |   2 +-
 .../mage/sets/mediainserts/DregMangler.java   |   2 +-
 .../sets/mediainserts/DrogskolCavalry.java    |   2 +-
 .../sets/mediainserts/DromokaTheEternal.java  |   2 +-
 .../mage/sets/mediainserts/DrownerOfHope.java |   2 +-
 .../src/mage/sets/mediainserts/Duress.java    |   2 +-
 .../sets/mediainserts/DwynenGiltLeafDaen.java |   2 +-
 .../sets/mediainserts/EidolonOfBlossoms.java  |   2 +-
 .../mage/sets/mediainserts/Electrolyze.java   |   2 +-
 .../sets/mediainserts/ElusiveTormentor.java   |   2 +-
 .../mage/sets/mediainserts/EvolvingWilds.java |   2 +-
 .../sets/mediainserts/FaithlessLooting.java   |   2 +-
 .../sets/mediainserts/FatedConflagration.java |   2 +-
 .../mage/sets/mediainserts/FeastOfBlood.java  |   2 +-
 .../src/mage/sets/mediainserts/Fireball.java  |   2 +-
 .../sets/mediainserts/FlamebladeAngel.java    |   2 +-
 .../sets/mediainserts/FlamerushRider.java     |   2 +-
 .../sets/mediainserts/FoeRazerRegent.java     |   2 +-
 .../mage/sets/mediainserts/FrostTitan.java    |   2 +-
 .../sets/mediainserts/GarrukApexPredator.java |   2 +-
 .../mediainserts/GarrukCallerOfBeasts.java    |   2 +-
 .../sets/mediainserts/GarrukWildspeaker.java  |   2 +-
 .../mage/sets/mediainserts/GazeOfGranite.java |   2 +-
 .../mage/sets/mediainserts/GenesisHydra.java  |   2 +-
 .../mage/sets/mediainserts/GiantBadger.java   |   2 +-
 .../sets/mediainserts/GideonBattleForged.java |   2 +-
 .../sets/mediainserts/GladehartCavalry.java   |   2 +-
 .../sets/mediainserts/GoblinDarkDwellers.java |   2 +-
 .../sets/mediainserts/GoblinRabblemaster.java |   2 +-
 .../mage/sets/mediainserts/GraveTitan.java    |   2 +-
 .../mage/sets/mediainserts/Gravecrawler.java  |   2 +-
 .../sets/mediainserts/GuulDrazAssassin.java   |   2 +-
 .../sets/mediainserts/HamletbackGoliath.java  |   2 +-
 .../sets/mediainserts/HarbingerOfTheHunt.java |   2 +-
 .../sets/mediainserts/HeroOfGomaFada.java     |   2 +-
 .../src/mage/sets/mediainserts/HighTide.java  |   2 +-
 .../sets/mediainserts/HixusPrisonWarden.java  |   2 +-
 .../sets/mediainserts/HonorOfThePure.java     |   2 +-
 .../sets/mediainserts/HonoredHierarch.java    |   2 +-
 .../mage/sets/mediainserts/InfernoTitan.java  |   2 +-
 .../mage/sets/mediainserts/InsidiousMist.java |   2 +-
 .../sets/mediainserts/IvorytuskFortress.java  |   2 +-
 .../mage/sets/mediainserts/JaceBeleren.java   |   2 +-
 .../sets/mediainserts/JaceMemoryAdept.java    |   2 +-
 .../mediainserts/JaceTelepathUnbound.java     |   2 +-
 .../mediainserts/JaceTheLivingGuildpact.java  |   2 +-
 .../sets/mediainserts/JaceVrynsProdigy.java   |   2 +-
 .../mediainserts/JayaBallardTaskMage.java     |   2 +-
 .../sets/mediainserts/KarametrasAcolyte.java  |   2 +-
 .../sets/mediainserts/KnightExemplar.java     |   2 +-
 .../mage/sets/mediainserts/KorSkyfisher.java  |   2 +-
 .../mediainserts/KothophedSoulHoarder.java    |   2 +-
 .../sets/mediainserts/KytheonHeroOfAkros.java |   2 +-
 .../sets/mediainserts/LightningHounds.java    |   2 +-
 .../LilianaDefiantNecromancer.java            |   2 +-
 .../mediainserts/LilianaHereticalHealer.java  |   2 +-
 .../mediainserts/LilianaOfTheDarkRealms.java  |   2 +-
 .../mage/sets/mediainserts/LilianaVess.java   |   2 +-
 .../mage/sets/mediainserts/LilianaVess2.java  |   2 +-
 .../src/mage/sets/mediainserts/ManaCrypt.java |   2 +-
 .../sets/mediainserts/MarkovDreadknight.java  |   2 +-
 .../mage/sets/mediainserts/Memoricide.java    |   2 +-
 .../sets/mediainserts/MerfolkMesmerist.java   |   2 +-
 .../sets/mediainserts/MirranCrusader.java     |   2 +-
 .../sets/mediainserts/MundasVanguard.java     |   2 +-
 .../sets/mediainserts/NecromasterDragon.java  |   2 +-
 .../sets/mediainserts/NephaliaMoondrakes.java |   2 +-
 .../mage/sets/mediainserts/NiblisOfFrost.java |   2 +-
 .../sets/mediainserts/NightveilSpecter.java   |   2 +-
 .../mage/sets/mediainserts/NissaRevane.java   |   2 +-
 .../sets/mediainserts/NissaSageAnimist.java   |   2 +-
 .../sets/mediainserts/NissaVastwoodSeer.java  |   2 +-
 .../sets/mediainserts/NissaWorldwaker.java    |   2 +-
 .../mage/sets/mediainserts/NoosegrafMob.java  |   2 +-
 .../mage/sets/mediainserts/OgreArsonist.java  |   2 +-
 .../sets/mediainserts/OgreBattledriver.java   |   2 +-
 .../sets/mediainserts/OjutaisCommand.java     |   2 +-
 .../mage/sets/mediainserts/OranRiefHydra.java |   2 +-
 .../sets/mediainserts/PhyrexianRager.java     |   2 +-
 .../sets/mediainserts/PiaAndKiranNalaar.java  |   2 +-
 .../sets/mediainserts/PrimordialHydra.java    |   2 +-
 .../sets/mediainserts/PristineSkywise.java    |   2 +-
 .../sets/mediainserts/RakshasaVizier.java     |   2 +-
 .../mage/sets/mediainserts/RatchetBomb.java   |   2 +-
 .../sets/mediainserts/RattleclawMystic.java   |   2 +-
 .../mediainserts/RavenousBloodseeker.java     |   2 +-
 .../mage/sets/mediainserts/RelicSeeker.java   |   2 +-
 .../mage/sets/mediainserts/RenderSilent.java  |   2 +-
 .../sets/mediainserts/RetaliatorGriffin.java  |   2 +-
 .../mage/sets/mediainserts/RuinousPath.java   |   2 +-
 .../sets/mediainserts/SageEyeAvengers.java    |   2 +-
 .../sets/mediainserts/SageOfTheInwardEye.java |   2 +-
 .../sets/mediainserts/SanctifierOfSouls.java  |   2 +-
 .../sets/mediainserts/SandsteppeCitadel.java  |   2 +-
 .../sets/mediainserts/ScavengingOoze.java     |   2 +-
 .../mage/sets/mediainserts/ScytheLeopard.java |   2 +-
 .../sets/mediainserts/SeekerOfTheWay.java     |   2 +-
 .../mage/sets/mediainserts/SerraAvatar.java   |   2 +-
 .../sets/mediainserts/ShamanicRevelation.java |   2 +-
 .../mage/sets/mediainserts/SiegeRhino.java    |   2 +-
 .../sets/mediainserts/SilverbladePaladin.java |   2 +-
 .../mage/sets/mediainserts/SoulOfRavnica.java |   2 +-
 .../sets/mediainserts/SoulOfZendikar.java     |   2 +-
 .../mage/sets/mediainserts/SoulSwallower.java |   2 +-
 .../mage/sets/mediainserts/SpinedWurm.java    |   2 +-
 .../mage/sets/mediainserts/Standstill.java    |   2 +-
 .../sets/mediainserts/StealerOfSecrets.java   |   2 +-
 .../sets/mediainserts/StewardOfValeron.java   |   2 +-
 .../mage/sets/mediainserts/SultaiCharm.java   |   2 +-
 .../mage/sets/mediainserts/SunblastAngel.java |   2 +-
 .../sets/mediainserts/SupremeVerdict.java     |   2 +-
 .../sets/mediainserts/SurgicalExtraction.java |   2 +-
 .../sets/mediainserts/SylvanCaryatid.java     |   2 +-
 .../sets/mediainserts/TemurWarShaman.java     |   2 +-
 .../mage/sets/mediainserts/Terastodon.java    |   2 +-
 .../mage/sets/mediainserts/TreasureHunt.java  |   2 +-
 .../src/mage/sets/mediainserts/Turnabout.java |   2 +-
 .../sets/mediainserts/TyrantOfValakut.java    |   2 +-
 .../sets/mediainserts/UlvenwaldObserver.java  |   2 +-
 .../sets/mediainserts/ValorousStance.java     |   2 +-
 .../sets/mediainserts/VampireNocturnus.java   |   2 +-
 .../src/mage/sets/mediainserts/WashOut.java   |   2 +-
 .../sets/mediainserts/XathridNecromancer.java |   2 +-
 .../mage/sets/mercadianmasques/Afterlife.java |   2 +-
 .../mage/sets/mercadianmasques/Armistice.java |   2 +-
 .../sets/mercadianmasques/ArmsDealer.java     |   2 +-
 .../mage/sets/mercadianmasques/Arrest.java    |   2 +-
 .../sets/mercadianmasques/BattleRampart.java  |   2 +-
 .../sets/mercadianmasques/Brainstorm.java     |   2 +-
 .../ChoMannoRevolutionary.java                |   2 +-
 .../mercadianmasques/CinderElemental.java     |   2 +-
 .../sets/mercadianmasques/CloudSprite.java    |   2 +-
 .../sets/mercadianmasques/Counterspell.java   |   2 +-
 .../mage/sets/mercadianmasques/Cowardice.java |   2 +-
 .../mercadianmasques/CrossbowInfantry.java    |   2 +-
 .../sets/mercadianmasques/DarkRitual.java     |   2 +-
 .../sets/mercadianmasques/Deathgazer.java     |   2 +-
 .../sets/mercadianmasques/Dehydration.java    |   2 +-
 .../sets/mercadianmasques/DesertTwister.java  |   2 +-
 .../sets/mercadianmasques/DevoutWitness.java  |   2 +-
 .../sets/mercadianmasques/Disenchant.java     |   2 +-
 .../sets/mercadianmasques/DistortingLens.java |   2 +-
 .../sets/mercadianmasques/EnergyFlux.java     |   2 +-
 .../mage/sets/mercadianmasques/Foster.java    |   2 +-
 .../sets/mercadianmasques/GhoulsFeast.java    |   2 +-
 .../sets/mercadianmasques/Groundskeeper.java  |   2 +-
 .../src/mage/sets/mercadianmasques/Gush.java  |   2 +-
 .../sets/mercadianmasques/HighwayRobber.java  |   2 +-
 .../sets/mercadianmasques/HuntedWumpus.java   |   2 +-
 .../sets/mercadianmasques/Invigorate.java     |   2 +-
 .../mage/sets/mercadianmasques/IvoryMask.java |   2 +-
 .../sets/mercadianmasques/LastBreath.java     |   2 +-
 .../src/mage/sets/mercadianmasques/Lure.java  |   2 +-
 .../mercadianmasques/NaturalAffinity.java     |   2 +-
 .../sets/mercadianmasques/OgreTaskmaster.java |   2 +-
 .../sets/mercadianmasques/RainOfTears.java    |   2 +-
 .../mage/sets/mercadianmasques/Revive.java    |   2 +-
 .../sets/mercadianmasques/RighteousAura.java  |   2 +-
 .../sets/mercadianmasques/RockBadger.java     |   2 +-
 .../sets/mercadianmasques/RushwoodDryad.java  |   2 +-
 .../SilvergladeElemental.java                 |   2 +-
 .../mercadianmasques/SpidersilkArmor.java     |   2 +-
 .../mage/sets/mercadianmasques/Squall.java    |   2 +-
 .../sets/mercadianmasques/Squallmonger.java   |   2 +-
 .../mercadianmasques/SqueeGoblinNabob.java    |   2 +-
 .../sets/mercadianmasques/SteadfastGuard.java |   2 +-
 .../mage/sets/mercadianmasques/StoneRain.java |   2 +-
 .../sets/mercadianmasques/TidalKraken.java    |   2 +-
 .../sets/mercadianmasques/TradeRoutes.java    |   2 +-
 .../sets/mercadianmasques/Tranquility.java    |   2 +-
 .../mage/sets/mercadianmasques/Tremor.java    |   2 +-
 .../sets/mercadianmasques/Undertaker.java     |   2 +-
 .../mage/sets/mercadianmasques/Vendetta.java  |   2 +-
 .../sets/mercadianmasques/WarCadence.java     |   2 +-
 .../mage/sets/mercadianmasques/Warmonger.java |   2 +-
 .../sets/mercadianmasques/WordOfBlasting.java |   2 +-
 .../mage/sets/mirage/AncestralMemories.java   |   2 +-
 Mage.Sets/src/mage/sets/mirage/Boomerang.java |   2 +-
 .../mage/sets/mirage/CadaverousKnight.java    |   2 +-
 .../src/mage/sets/mirage/CelestialDawn.java   |   2 +-
 .../src/mage/sets/mirage/CharcoalDiamond.java |   2 +-
 .../src/mage/sets/mirage/ChokingSands.java    |   2 +-
 .../src/mage/sets/mirage/CoralFighters.java   |   2 +-
 .../src/mage/sets/mirage/CrimsonHellkite.java |   2 +-
 .../mage/sets/mirage/DaringApprentice.java    |   2 +-
 .../src/mage/sets/mirage/DarkBanishing.java   |   2 +-
 .../src/mage/sets/mirage/DarkRitual.java      |   2 +-
 .../src/mage/sets/mirage/Disenchant.java      |   2 +-
 Mage.Sets/src/mage/sets/mirage/Dissipate.java |   2 +-
 .../src/mage/sets/mirage/DivineOffering.java  |   2 +-
 Mage.Sets/src/mage/sets/mirage/DrainLife.java |   2 +-
 .../src/mage/sets/mirage/DreamCache.java      |   2 +-
 .../src/mage/sets/mirage/EarlyHarvest.java    |   2 +-
 .../src/mage/sets/mirage/Enfeeblement.java    |   2 +-
 .../src/mage/sets/mirage/FemerefArchers.java  |   2 +-
 .../src/mage/sets/mirage/FinalFortune.java    |   2 +-
 .../src/mage/sets/mirage/FireDiamond.java     |   2 +-
 .../src/mage/sets/mirage/Firebreathing.java   |   2 +-
 Mage.Sets/src/mage/sets/mirage/Flare.java     |   2 +-
 .../src/mage/sets/mirage/FloodPlain.java      |   2 +-
 Mage.Sets/src/mage/sets/mirage/Fog.java       |   2 +-
 .../mage/sets/mirage/GoblinEliteInfantry.java |   2 +-
 .../src/mage/sets/mirage/Grasslands.java      |   2 +-
 .../src/mage/sets/mirage/GrinningTotem.java   |   2 +-
 .../src/mage/sets/mirage/HealingSalve.java    |   2 +-
 .../src/mage/sets/mirage/Incinerate.java      |   2 +-
 .../mage/sets/mirage/InfernalContract.java    |   2 +-
 .../src/mage/sets/mirage/KaerveksTorch.java   |   2 +-
 .../src/mage/sets/mirage/MarbleDiamond.java   |   2 +-
 Mage.Sets/src/mage/sets/mirage/Maro.java      |   2 +-
 .../src/mage/sets/mirage/MemoryLapse.java     |   2 +-
 .../src/mage/sets/mirage/MossDiamond.java     |   2 +-
 Mage.Sets/src/mage/sets/mirage/Pacifism.java  |   2 +-
 .../src/mage/sets/mirage/PatagiaGolem.java    |   2 +-
 .../src/mage/sets/mirage/PhyrexianVault.java  |   2 +-
 Mage.Sets/src/mage/sets/mirage/Polymorph.java |   2 +-
 Mage.Sets/src/mage/sets/mirage/PowerSink.java |   2 +-
 .../src/mage/sets/mirage/RampantGrowth.java   |   2 +-
 .../src/mage/sets/mirage/RayOfCommand.java    |   2 +-
 .../mage/sets/mirage/RecklessEmbermage.java   |   2 +-
 .../src/mage/sets/mirage/Regeneration.java    |   2 +-
 Mage.Sets/src/mage/sets/mirage/Sandstorm.java |   2 +-
 .../src/mage/sets/mirage/SavageTwister.java   |   2 +-
 .../src/mage/sets/mirage/SkyDiamond.java      |   2 +-
 .../src/mage/sets/mirage/SpittingEarth.java   |   2 +-
 .../src/mage/sets/mirage/StalkingTiger.java   |   2 +-
 Mage.Sets/src/mage/sets/mirage/StoneRain.java |   2 +-
 Mage.Sets/src/mage/sets/mirage/Stupor.java    |   2 +-
 Mage.Sets/src/mage/sets/mirage/Sunweb.java    |   2 +-
 .../src/mage/sets/mirage/UktabiWildcats.java  |   2 +-
 .../src/mage/sets/mirage/VolcanicDragon.java  |   2 +-
 .../src/mage/sets/mirage/VolcanicGeyser.java  |   2 +-
 .../src/mage/sets/mirage/WallOfRoots.java     |   2 +-
 .../mage/sets/mirage/ZhalfirinCommander.java  |   2 +-
 .../mage/sets/mirrodin/AEtherSpellbomb.java   |   2 +-
 .../src/mage/sets/mirrodin/BarterInBlood.java |   2 +-
 .../src/mage/sets/mirrodin/BlindingBeam.java  |   2 +-
 .../src/mage/sets/mirrodin/BoshIronGolem.java |   2 +-
 .../src/mage/sets/mirrodin/BottleGnomes.java  |   2 +-
 .../src/mage/sets/mirrodin/Broodstar.java     |   2 +-
 .../src/mage/sets/mirrodin/ConsumeSpirit.java |   2 +-
 .../mage/sets/mirrodin/ContaminatedBond.java  |   2 +-
 .../src/mage/sets/mirrodin/CreepingMold.java  |   2 +-
 .../src/mage/sets/mirrodin/Detonate.java      |   2 +-
 .../src/mage/sets/mirrodin/Fabricate.java     |   2 +-
 .../src/mage/sets/mirrodin/Fireshrieker.java  |   2 +-
 .../mage/sets/mirrodin/FistsOfTheAnvil.java   |   2 +-
 .../src/mage/sets/mirrodin/Frogmite.java      |   2 +-
 .../src/mage/sets/mirrodin/GildedLotus.java   |   2 +-
 .../mage/sets/mirrodin/IcyManipulator.java    |   2 +-
 .../mage/sets/mirrodin/LeoninBladetrap.java   |   2 +-
 .../mage/sets/mirrodin/LeoninScimitar.java    |   2 +-
 .../src/mage/sets/mirrodin/LodestoneMyr.java  |   2 +-
 .../mage/sets/mirrodin/LoxodonWarhammer.java  |   2 +-
 .../mage/sets/mirrodin/LumengridWarden.java   |   2 +-
 .../sets/mirrodin/MarchOfTheMachines.java     |   2 +-
 .../src/mage/sets/mirrodin/MaskOfMemory.java  |   2 +-
 .../src/mage/sets/mirrodin/Mindslaver.java    |   2 +-
 .../src/mage/sets/mirrodin/MyrEnforcer.java   |   2 +-
 .../src/mage/sets/mirrodin/MyrRetriever.java  |   2 +-
 .../mage/sets/mirrodin/NuisanceEngine.java    |   2 +-
 .../src/mage/sets/mirrodin/OneDozenEyes.java  |   2 +-
 .../src/mage/sets/mirrodin/Ornithopter.java   |   2 +-
 .../src/mage/sets/mirrodin/Pentavus.java      |   2 +-
 .../src/mage/sets/mirrodin/PlatinumAngel.java |   2 +-
 .../mage/sets/mirrodin/PromiseOfPower.java    |   2 +-
 .../src/mage/sets/mirrodin/RazorBarrier.java  |   2 +-
 .../src/mage/sets/mirrodin/ReiverDemon.java   |   2 +-
 .../src/mage/sets/mirrodin/RuleOfLaw.java     |   2 +-
 .../mage/sets/mirrodin/SculptingSteel.java    |   2 +-
 .../src/mage/sets/mirrodin/SkeletonShard.java |   2 +-
 .../mage/sets/mirrodin/SkyhunterPatrol.java   |   2 +-
 .../mage/sets/mirrodin/SolemnSimulacrum.java  |   2 +-
 .../mage/sets/mirrodin/StalkingStones.java    |   2 +-
 .../src/mage/sets/mirrodin/SunDroplet.java    |   2 +-
 .../src/mage/sets/mirrodin/SylvanScrying.java |   2 +-
 .../src/mage/sets/mirrodin/SynodSanctum.java  |   2 +-
 .../mage/sets/mirrodin/TempestOfLight.java    |   2 +-
 Mage.Sets/src/mage/sets/mirrodin/Terror.java  |   2 +-
 .../sets/mirrodin/ThirstForKnowledge.java     |   2 +-
 .../src/mage/sets/mirrodin/Thoughtcast.java   |   2 +-
 .../src/mage/sets/mirrodin/ToothAndNail.java  |   2 +-
 .../src/mage/sets/mirrodin/Triskelion.java    |   2 +-
 .../mage/sets/mirrodin/ViridianShaman.java    |   2 +-
 .../mage/sets/mirrodin/VulshokBerserker.java  |   2 +-
 .../mage/sets/mirrodin/WanderguardSentry.java |   2 +-
 .../src/mage/sets/mirrodin/WizardReplica.java |   2 +-
 .../src/mage/sets/mirrodin/Worldslayer.java   |   2 +-
 .../mirrodinbesieged/LeoninSkyhunter.java     |   2 +-
 .../sets/mirrodinbesieged/PhyrexianRager.java |   2 +-
 .../sets/modernmasters/AEtherSpellbomb.java   |   2 +-
 .../mage/sets/modernmasters/AEtherVial.java   |   2 +-
 .../mage/sets/modernmasters/AEthersnipe.java  |   2 +-
 .../mage/sets/modernmasters/AbsorbVis.java    |   2 +-
 .../mage/sets/modernmasters/AcademyRuins.java |   2 +-
 .../sets/modernmasters/AdarkarValkyrie.java   |   2 +-
 .../mage/sets/modernmasters/AmrouScout.java   |   2 +-
 .../mage/sets/modernmasters/AmrouSeekers.java |   2 +-
 .../mage/sets/modernmasters/AngelsGrace.java  |   2 +-
 .../sets/modernmasters/ArcboundRavager.java   |   2 +-
 .../sets/modernmasters/ArcboundStinger.java   |   2 +-
 .../sets/modernmasters/ArcboundWorker.java    |   2 +-
 .../sets/modernmasters/AvianChangeling.java   |   2 +-
 .../sets/modernmasters/Blightspeaker.java     |   2 +-
 .../mage/sets/modernmasters/BlindingBeam.java |   2 +-
 .../sets/modernmasters/BlinkmothNexus.java    |   2 +-
 .../mage/sets/modernmasters/BloodMoon.java    |   2 +-
 .../mage/sets/modernmasters/Bonesplitter.java |   2 +-
 .../sets/modernmasters/BridgeFromBelow.java   |   2 +-
 .../mage/sets/modernmasters/BruteForce.java   |   2 +-
 .../modernmasters/CarefulConsideration.java   |   2 +-
 .../sets/modernmasters/CennsEnlistment.java   |   2 +-
 .../sets/modernmasters/ChaliceOfTheVoid.java  |   2 +-
 .../modernmasters/CitanulWoodreaders.java     |   2 +-
 .../mage/sets/modernmasters/CityOfBrass.java  |   2 +-
 .../sets/modernmasters/CloudgoatRanger.java   |   2 +-
 .../sets/modernmasters/ColdEyedSelkie.java    |   2 +-
 .../modernmasters/CountrysideCrusher.java     |   2 +-
 .../sets/modernmasters/CourtHomunculus.java   |   2 +-
 .../sets/modernmasters/CrypticCommand.java    |   2 +-
 .../sets/modernmasters/DakmorSalvage.java     |   2 +-
 .../sets/modernmasters/DarkConfidant.java     |   2 +-
 .../mage/sets/modernmasters/DeathDenied.java  |   2 +-
 .../sets/modernmasters/DemigodOfRevenge.java  |   2 +-
 .../sets/modernmasters/DispellersCapsule.java |   2 +-
 .../sets/modernmasters/DivinityOfPride.java   |   2 +-
 .../src/mage/sets/modernmasters/DragDown.java |   2 +-
 .../mage/sets/modernmasters/Dragonstorm.java  |   2 +-
 .../sets/modernmasters/DurkwoodBaloth.java    |   2 +-
 .../mage/sets/modernmasters/EchoingTruth.java |   2 +-
 .../mage/sets/modernmasters/Electrolyze.java  |   2 +-
 .../modernmasters/ElspethKnightErrant.java    |   2 +-
 .../sets/modernmasters/EmptyTheWarrens.java   |   2 +-
 .../modernmasters/EngineeredExplosives.java   |   2 +-
 .../sets/modernmasters/ErrantEphemeron.java   |   2 +-
 .../sets/modernmasters/ErraticMutation.java   |   2 +-
 .../src/mage/sets/modernmasters/Esperzoa.java |   2 +-
 .../mage/sets/modernmasters/EtchedOracle.java |   2 +-
 .../sets/modernmasters/EternalWitness.java    |   2 +-
 .../sets/modernmasters/EtheriumSculptor.java  |   2 +-
 .../modernmasters/EtherswornCanonist.java     |   2 +-
 .../modernmasters/ExecutionersCapsule.java    |   2 +-
 .../mage/sets/modernmasters/Extirpate.java    |   2 +-
 .../mage/sets/modernmasters/Facevaulter.java  |   2 +-
 .../sets/modernmasters/FaerieMacabre.java     |   2 +-
 .../sets/modernmasters/FaerieMechanist.java   |   2 +-
 .../sets/modernmasters/FesteringGoblin.java   |   2 +-
 .../mage/sets/modernmasters/FieryFall.java    |   2 +-
 .../sets/modernmasters/FigureOfDestiny.java   |   2 +-
 .../mage/sets/modernmasters/Flickerwisp.java  |   2 +-
 .../src/mage/sets/modernmasters/Frogmite.java |   2 +-
 .../mage/sets/modernmasters/FuryCharm.java    |   2 +-
 .../sets/modernmasters/GiantDustwasp.java     |   2 +-
 .../mage/sets/modernmasters/GiftsUngiven.java |   2 +-
 .../sets/modernmasters/GleamOfResistance.java |   2 +-
 .../modernmasters/GlenElendraArchmage.java    |   2 +-
 .../mage/sets/modernmasters/Glimmervoid.java  |   2 +-
 .../mage/sets/modernmasters/Grapeshot.java    |   2 +-
 .../sets/modernmasters/GreaterGargadon.java   |   2 +-
 .../sets/modernmasters/GreaterMossdog.java    |   2 +-
 .../sets/modernmasters/HammerheimDeadeye.java |   2 +-
 .../src/mage/sets/modernmasters/HanaKami.java |   2 +-
 .../sets/modernmasters/HillcomberGiant.java   |   2 +-
 .../sets/modernmasters/HorobisWhisper.java    |   2 +-
 .../mage/sets/modernmasters/IvoryGiant.java   |   2 +-
 .../modernmasters/JuganTheRisingStar.java     |   2 +-
 .../sets/modernmasters/KatakiWarsWage.java    |   2 +-
 .../sets/modernmasters/KeigaTheTideStar.java  |   2 +-
 .../modernmasters/KikiJikiMirrorBreaker.java  |   2 +-
 .../modernmasters/KiraGreatGlassSpinner.java  |   2 +-
 .../mage/sets/modernmasters/KitchenFinks.java |   2 +-
 .../modernmasters/KnightOfTheReliquary.java   |   2 +-
 .../mage/sets/modernmasters/KodamasReach.java |   2 +-
 .../modernmasters/KokushoTheEveningStar.java  |   2 +-
 .../mage/sets/modernmasters/KrosanGrip.java   |   2 +-
 .../mage/sets/modernmasters/LavaSpike.java    |   2 +-
 .../sets/modernmasters/LifeFromTheLoam.java   |   2 +-
 .../sets/modernmasters/LightningHelix.java    |   2 +-
 .../mage/sets/modernmasters/LotusBloom.java   |   2 +-
 .../mage/sets/modernmasters/MadAuntie.java    |   2 +-
 .../sets/modernmasters/MaelstromPulse.java    |   2 +-
 .../mage/sets/modernmasters/Manamorphose.java |   2 +-
 .../mage/sets/modernmasters/Meadowboon.java   |   2 +-
 .../modernmasters/MelokuTheCloudedMirror.java |   2 +-
 .../mage/sets/modernmasters/MindFuneral.java  |   2 +-
 .../sets/modernmasters/MoggWarMarshal.java    |   2 +-
 .../sets/modernmasters/MoldervineCloak.java   |   2 +-
 .../modernmasters/MothdustChangeling.java     |   2 +-
 .../mage/sets/modernmasters/Mulldrifter.java  |   2 +-
 .../sets/modernmasters/MurderousRedcap.java   |   2 +-
 .../mage/sets/modernmasters/MyrEnforcer.java  |   2 +-
 .../sets/modernmasters/NantukoShaman.java     |   2 +-
 .../mage/sets/modernmasters/Narcomoeba.java   |   2 +-
 .../sets/modernmasters/OonaQueenOfTheFae.java |   2 +-
 .../modernmasters/OtherworldlyJourney.java    |   2 +-
 .../sets/modernmasters/PactOfNegation.java    |   2 +-
 .../sets/modernmasters/PallidMycoderm.java    |   2 +-
 .../sets/modernmasters/ParadiseMantle.java    |   2 +-
 .../mage/sets/modernmasters/PardicDragon.java |   2 +-
 .../mage/sets/modernmasters/PathToExile.java  |   2 +-
 .../sets/modernmasters/PeerThroughDepths.java |   2 +-
 .../sets/modernmasters/PenumbraSpider.java    |   2 +-
 .../sets/modernmasters/PerilousResearch.java  |   2 +-
 .../mage/sets/modernmasters/Pestermite.java   |   2 +-
 .../src/mage/sets/modernmasters/Phthisis.java |   2 +-
 .../mage/sets/modernmasters/Plumeveil.java    |   2 +-
 .../mage/sets/modernmasters/Progenitus.java   |   2 +-
 .../sets/modernmasters/PyriteSpellbomb.java   |   2 +-
 .../mage/sets/modernmasters/RathiTrapper.java |   2 +-
 .../mage/sets/modernmasters/RavensCrime.java  |   2 +-
 .../sets/modernmasters/ReachThroughMists.java |   2 +-
 .../sets/modernmasters/RelicOfProgenitus.java |   2 +-
 .../mage/sets/modernmasters/Reveillark.java   |   2 +-
 .../src/mage/sets/modernmasters/RiftBolt.java |   2 +-
 .../modernmasters/RiftwingCloudskate.java     |   2 +-
 .../modernmasters/RyuseiTheFallingStar.java   |   2 +-
 .../sets/modernmasters/SaltfieldRecluse.java  |   2 +-
 .../sets/modernmasters/SanctumGargoyle.java   |   2 +-
 .../mage/sets/modernmasters/Sandsower.java    |   2 +-
 .../mage/sets/modernmasters/SarkhanVol.java   |   2 +-
 .../mage/sets/modernmasters/ScionOfOona.java  |   2 +-
 .../sets/modernmasters/SearchForTomorrow.java |   2 +-
 .../sets/modernmasters/ShrapnelBlast.java     |   2 +-
 .../sets/modernmasters/SkeletalVampire.java   |   2 +-
 .../sets/modernmasters/SkyreachManta.java     |   2 +-
 .../sets/modernmasters/SlaughterPact.java     |   2 +-
 .../mage/sets/modernmasters/SpellSnare.java   |   2 +-
 .../modernmasters/SpellstutterSprite.java     |   2 +-
 .../sets/modernmasters/SporesowerThallid.java |   2 +-
 .../sets/modernmasters/SqueeGoblinNabob.java  |   2 +-
 .../sets/modernmasters/Stingscourger.java     |   2 +-
 .../modernmasters/StinkdrinkerDaredevil.java  |   2 +-
 .../mage/sets/modernmasters/StinkweedImp.java |   2 +-
 .../mage/sets/modernmasters/StreetWraith.java |   2 +-
 .../mage/sets/modernmasters/SuddenShock.java  |   2 +-
 .../sets/modernmasters/SummonersPact.java     |   2 +-
 .../sets/modernmasters/SwordOfFireAndIce.java |   2 +-
 .../modernmasters/SwordOfLightAndShadow.java  |   2 +-
 .../mage/sets/modernmasters/SylvanBounty.java |   2 +-
 .../mage/sets/modernmasters/SyphonLife.java   |   2 +-
 .../mage/sets/modernmasters/TarPitcher.java   |   2 +-
 .../mage/sets/modernmasters/Tarmogoyf.java    |   2 +-
 .../sets/modernmasters/TerashisGrasp.java     |   2 +-
 .../modernmasters/TerramorphicExpanse.java    |   2 +-
 .../src/mage/sets/modernmasters/Thallid.java  |   2 +-
 .../sets/modernmasters/ThallidGerminator.java |   2 +-
 .../modernmasters/ThallidShellDweller.java    |   2 +-
 .../modernmasters/ThirstForKnowledge.java     |   2 +-
 .../sets/modernmasters/ThunderingGiant.java   |   2 +-
 .../sets/modernmasters/TidehollowSculler.java |   2 +-
 .../sets/modernmasters/TorrentOfStone.java    |   2 +-
 .../sets/modernmasters/TraumaticVisions.java  |   2 +-
 .../mage/sets/modernmasters/TribalFlames.java |   2 +-
 .../sets/modernmasters/TrompTheDomains.java   |   2 +-
 .../sets/modernmasters/VedalkenDismisser.java |   2 +-
 .../sets/modernmasters/VendilionClique.java   |   2 +-
 .../modernmasters/VerdelothTheAncient.java    |   2 +-
 .../sets/modernmasters/VeteranArmorer.java    |   2 +-
 .../mage/sets/modernmasters/VividCrag.java    |   2 +-
 .../mage/sets/modernmasters/VividCreek.java   |   2 +-
 .../mage/sets/modernmasters/VividGrove.java   |   2 +-
 .../mage/sets/modernmasters/VividMarsh.java   |   2 +-
 .../mage/sets/modernmasters/VividMeadow.java  |   2 +-
 .../sets/modernmasters/WalkerOfTheGrove.java  |   2 +-
 .../modernmasters/WarSpikeChangeling.java     |   2 +-
 .../sets/modernmasters/WoodfallPrimus.java    |   2 +-
 .../mage/sets/modernmasters/WormHarvest.java  |   2 +-
 .../modernmasters/YoseiTheMorningStar.java    |   2 +-
 .../sets/modernmasters2015/AEthersnipe.java   |   2 +-
 .../sets/modernmasters2015/AgonyWarp.java     |   2 +-
 .../sets/modernmasters2015/AirServant.java    |   2 +-
 .../sets/modernmasters2015/AlgaeGharial.java  |   2 +-
 .../sets/modernmasters2015/AllIsDust.java     |   2 +-
 .../mage/sets/modernmasters2015/AlloyMyr.java |   2 +-
 .../mage/sets/modernmasters2015/AntQueen.java |   2 +-
 .../modernmasters2015/ApocalypseHydra.java    |   2 +-
 .../modernmasters2015/ApostlesBlessing.java   |   2 +-
 .../modernmasters2015/AquastrandSpider.java   |   2 +-
 .../sets/modernmasters2015/ArgentSphinx.java  |   2 +-
 .../mage/sets/modernmasters2015/Arrest.java   |   2 +-
 .../modernmasters2015/ArtisanOfKozilek.java   |   2 +-
 .../modernmasters2015/AshenmoorGouger.java    |   2 +-
 .../modernmasters2015/AzoriusChancery.java    |   2 +-
 .../mage/sets/modernmasters2015/Banefire.java |   2 +-
 .../modernmasters2015/BattlegraceAngel.java   |   2 +-
 .../sets/modernmasters2015/BestialMenace.java |   2 +-
 .../sets/modernmasters2015/Bitterblossom.java |   2 +-
 .../modernmasters2015/BladesOfVelisVel.java   |   2 +-
 .../modernmasters2015/BlindingSouleater.java  |   2 +-
 .../modernmasters2015/BlinkmothNexus.java     |   2 +-
 .../sets/modernmasters2015/BloodOgre.java     |   2 +-
 .../modernmasters2015/BloodshotTrainee.java   |   2 +-
 .../modernmasters2015/BloodthroneVampire.java |   2 +-
 .../sets/modernmasters2015/BoneSplinters.java |   2 +-
 .../sets/modernmasters2015/BorosGarrison.java |   2 +-
 .../modernmasters2015/BorosSwiftblade.java    |   2 +-
 .../sets/modernmasters2015/BruteForce.java    |   2 +-
 .../modernmasters2015/BurstLightning.java     |   2 +-
 .../sets/modernmasters2015/Cathodion.java     |   2 +-
 .../modernmasters2015/CelestialPurge.java     |   2 +-
 .../sets/modernmasters2015/ChimericMass.java  |   2 +-
 .../modernmasters2015/CloudElemental.java     |   2 +-
 .../mage/sets/modernmasters2015/Combust.java  |   2 +-
 .../sets/modernmasters2015/CometStorm.java    |   2 +-
 .../modernmasters2015/CommuneWithNature.java  |   2 +-
 .../modernmasters2015/ConclavePhalanx.java    |   2 +-
 .../modernmasters2015/CopperCarapace.java     |   2 +-
 .../modernmasters2015/CourtHomunculus.java    |   2 +-
 .../modernmasters2015/CranialPlating.java     |   2 +-
 .../modernmasters2015/CreakwoodLiege.java     |   2 +-
 .../modernmasters2015/CrypticCommand.java     |   2 +-
 .../sets/modernmasters2015/CullingDais.java   |   2 +-
 .../modernmasters2015/CytoplastRootKin.java   |   2 +-
 .../sets/modernmasters2015/DaggerclawImp.java |   2 +-
 .../sets/modernmasters2015/DarkConfidant.java |   2 +-
 .../sets/modernmasters2015/DarksteelAxe.java  |   2 +-
 .../modernmasters2015/DarksteelCitadel.java   |   2 +-
 .../modernmasters2015/DaybreakCoronet.java    |   2 +-
 .../sets/modernmasters2015/DeathDenied.java   |   2 +-
 .../sets/modernmasters2015/Deathmark.java     |   2 +-
 .../modernmasters2015/DevouringGreed.java     |   2 +-
 .../sets/modernmasters2015/DimirAqueduct.java |   2 +-
 .../modernmasters2015/DimirGuildmage.java     |   2 +-
 .../sets/modernmasters2015/Dismember.java     |   2 +-
 .../mage/sets/modernmasters2015/Dispatch.java |   2 +-
 .../modernmasters2015/DragonsoulKnight.java   |   2 +-
 .../sets/modernmasters2015/DreadDrone.java    |   2 +-
 .../modernmasters2015/DroolingGroodion.java   |   2 +-
 .../sets/modernmasters2015/DuskhunterBat.java |   2 +-
 .../sets/modernmasters2015/EldraziTemple.java |   2 +-
 .../sets/modernmasters2015/Electrolyze.java   |   2 +-
 .../EleshNornGrandCenobite.java               |   2 +-
 .../EmrakulTheAeonsTorn.java                  |   2 +-
 .../EndrekSahrMasterBreeder.java              |   2 +-
 .../modernmasters2015/EtchedChampion.java     |   2 +-
 .../modernmasters2015/EtchedMonstrosity.java  |   2 +-
 .../sets/modernmasters2015/EtchedOracle.java  |   2 +-
 .../modernmasters2015/EthercasteKnight.java   |   2 +-
 .../modernmasters2015/EverflowingChalice.java |   2 +-
 .../sets/modernmasters2015/EvolvingWilds.java |   2 +-
 .../sets/modernmasters2015/ExpeditionMap.java |   2 +-
 .../sets/modernmasters2015/EyeOfUgin.java     |   2 +-
 .../modernmasters2015/FaerieMechanist.java    |   2 +-
 .../sets/modernmasters2015/FieryFall.java     |   2 +-
 .../sets/modernmasters2015/Flashfreeze.java   |   2 +-
 .../sets/modernmasters2015/FlayerHusk.java    |   2 +-
 .../mage/sets/modernmasters2015/Fortify.java  |   2 +-
 .../mage/sets/modernmasters2015/Frogmite.java |   2 +-
 .../modernmasters2015/FulminatorMage.java     |   2 +-
 .../GhostCouncilOfOrzhova.java                |   2 +-
 .../modernmasters2015/GhostlyChangeling.java  |   2 +-
 .../sets/modernmasters2015/GlassdustHulk.java |   2 +-
 .../sets/modernmasters2015/GlintHawkIdol.java |   2 +-
 .../sets/modernmasters2015/GnarlidPack.java   |   2 +-
 .../modernmasters2015/GoblinFireslinger.java  |   2 +-
 .../modernmasters2015/GoblinWarPaint.java     |   2 +-
 .../modernmasters2015/GolgariRotFarm.java     |   2 +-
 .../modernmasters2015/GorehornMinotaurs.java  |   2 +-
 .../modernmasters2015/GrimAffliction.java     |   2 +-
 .../sets/modernmasters2015/GruulTurf.java     |   2 +-
 .../mage/sets/modernmasters2015/Guile.java    |   2 +-
 .../sets/modernmasters2015/GustSkimmer.java   |   2 +-
 .../mage/sets/modernmasters2015/GutShot.java  |   2 +-
 .../HearthfireHobgoblin.java                  |   2 +-
 .../modernmasters2015/HeliumSquirter.java     |   2 +-
 .../modernmasters2015/HellkiteCharger.java    |   2 +-
 .../HikariTwilightGuardian.java               |   2 +-
 .../modernmasters2015/HordeOfNotions.java     |   2 +-
 .../sets/modernmasters2015/HurkylsRecall.java |   2 +-
 .../IncandescentSoulstoke.java                |   2 +-
 .../IndomitableArchangel.java                 |   2 +-
 .../modernmasters2015/InexorableTide.java     |   2 +-
 .../modernmasters2015/InnerFlameIgniter.java  |   2 +-
 .../modernmasters2015/InstillInfection.java   |   2 +-
 .../modernmasters2015/IonaShieldOfEmeria.java |   2 +-
 .../modernmasters2015/IzzetBoilerworks.java   |   2 +-
 .../modernmasters2015/KamiOfAncientLaw.java   |   2 +-
 .../sets/modernmasters2015/KarnLiberated.java |   2 +-
 .../sets/modernmasters2015/KavuPrimarch.java  |   2 +-
 .../KikiJikiMirrorBreaker.java                |   2 +-
 .../mage/sets/modernmasters2015/Kitesail.java |   2 +-
 .../sets/modernmasters2015/KorDuelist.java    |   2 +-
 .../KozilekButcherOfTruth.java                |   2 +-
 .../modernmasters2015/KozileksPredator.java   |   2 +-
 .../modernmasters2015/LeylineOfSanctity.java  |   2 +-
 .../sets/modernmasters2015/LightningBolt.java |   2 +-
 .../modernmasters2015/LodestoneGolem.java     |   2 +-
 .../sets/modernmasters2015/LodestoneMyr.java  |   2 +-
 .../modernmasters2015/LongForgottenGohei.java |   2 +-
 .../modernmasters2015/LorescaleCoatl.java     |   2 +-
 .../mage/sets/modernmasters2015/ManaLeak.java |   2 +-
 .../sets/modernmasters2015/MatcaRioters.java  |   2 +-
 .../modernmasters2015/MidnightBanshee.java    |   2 +-
 .../sets/modernmasters2015/MightyLeap.java    |   2 +-
 .../modernmasters2015/MirranCrusader.java     |   2 +-
 .../sets/modernmasters2015/MirrorEntity.java  |   2 +-
 .../modernmasters2015/MoonlitStrider.java     |   2 +-
 .../sets/modernmasters2015/Mortarpod.java     |   2 +-
 .../mage/sets/modernmasters2015/MoxOpal.java  |   2 +-
 .../sets/modernmasters2015/Mulldrifter.java   |   2 +-
 .../modernmasters2015/MutagenicGrowth.java    |   2 +-
 .../sets/modernmasters2015/MyrEnforcer.java   |   2 +-
 .../mage/sets/modernmasters2015/Myrsmith.java |   2 +-
 .../sets/modernmasters2015/MysticSnake.java   |   2 +-
 .../modernmasters2015/NamelessInversion.java  |   2 +-
 .../sets/modernmasters2015/Narcolepsy.java    |   2 +-
 .../sets/modernmasters2015/Necrogenesis.java  |   2 +-
 .../sets/modernmasters2015/Necroskitter.java  |   2 +-
 .../sets/modernmasters2015/NestInvader.java   |   2 +-
 .../NivMizzetTheFiremind.java                 |   2 +-
 .../sets/modernmasters2015/NobilisOfWar.java  |   2 +-
 .../sets/modernmasters2015/NobleHierarch.java |   2 +-
 .../sets/modernmasters2015/NovijenSages.java  |   2 +-
 .../sets/modernmasters2015/OblivionRing.java  |   2 +-
 .../modernmasters2015/OrzhovBasilica.java     |   2 +-
 .../OtherworldlyJourney.java                  |   2 +-
 .../sets/modernmasters2015/Overwhelm.java     |   2 +-
 .../OverwhelmingStampede.java                 |   2 +-
 .../sets/modernmasters2015/PelakkaWurm.java   |   2 +-
 .../PilloryOfTheSleepless.java                |   2 +-
 .../modernmasters2015/PlaguedRusalka.java     |   2 +-
 .../modernmasters2015/PlaxcasterFrogling.java |   2 +-
 .../mage/sets/modernmasters2015/Plummet.java  |   2 +-
 .../modernmasters2015/PrecursorGolem.java     |   2 +-
 .../sets/modernmasters2015/PrimevalTitan.java |   2 +-
 .../modernmasters2015/ProfaneCommand.java     |   2 +-
 .../modernmasters2015/PuppeteerClique.java    |   2 +-
 .../mage/sets/modernmasters2015/Qumulox.java  |   2 +-
 .../sets/modernmasters2015/RaiseTheAlarm.java |   2 +-
 .../modernmasters2015/RakdosCarnarium.java    |   2 +-
 .../sets/modernmasters2015/RampantGrowth.java |   2 +-
 .../ReassemblingSkeleton.java                 |   2 +-
 .../mage/sets/modernmasters2015/Remand.java   |   2 +-
 .../mage/sets/modernmasters2015/Repeal.java   |   2 +-
 .../modernmasters2015/RestlessApparition.java |   2 +-
 .../sets/modernmasters2015/RootKinAlly.java   |   2 +-
 .../sets/modernmasters2015/RunedServitor.java |   2 +-
 .../sets/modernmasters2015/RustedRelic.java   |   2 +-
 .../sets/modernmasters2015/SavageTwister.java |   2 +-
 .../modernmasters2015/ScatterTheSeeds.java    |   2 +-
 .../modernmasters2015/ScavengerDrake.java     |   2 +-
 .../modernmasters2015/ScionOfTheWild.java     |   2 +-
 .../mage/sets/modernmasters2015/ScuteMob.java |   2 +-
 .../modernmasters2015/ScuttlingDeath.java     |   2 +-
 .../modernmasters2015/SelesnyaGuildmage.java  |   2 +-
 .../modernmasters2015/SelesnyaSanctuary.java  |   2 +-
 .../ShadowmageInfiltrator.java                |   2 +-
 .../modernmasters2015/ShrewdHatchling.java    |   2 +-
 .../mage/sets/modernmasters2015/Shrivel.java  |   2 +-
 .../sets/modernmasters2015/SickleRipper.java  |   2 +-
 .../sets/modernmasters2015/Sickleslicer.java  |   2 +-
 .../sets/modernmasters2015/SigilBlessing.java |   2 +-
 .../sets/modernmasters2015/SignInBlood.java   |   2 +-
 .../modernmasters2015/SimicGrowthChamber.java |   2 +-
 .../sets/modernmasters2015/SimicInitiate.java |   2 +-
 .../modernmasters2015/SkarrganFirebird.java   |   2 +-
 .../SkyhunterSkirmisher.java                  |   2 +-
 .../sets/modernmasters2015/SkyreachManta.java |   2 +-
 .../modernmasters2015/SmashToSmithereens.java |   2 +-
 .../sets/modernmasters2015/Smokebraider.java  |   2 +-
 .../modernmasters2015/SomberHoverguard.java   |   2 +-
 .../modernmasters2015/SoulbrightFlamekin.java |   2 +-
 .../modernmasters2015/SpectralProcession.java |   2 +-
 .../sets/modernmasters2015/Spellskite.java    |   2 +-
 .../modernmasters2015/SphereOfTheSuns.java    |   2 +-
 .../modernmasters2015/SpikeshotElder.java     |   2 +-
 .../sets/modernmasters2015/Spitebellows.java  |   2 +-
 .../sets/modernmasters2015/SplinterTwin.java  |   2 +-
 .../modernmasters2015/SpreadTheSickness.java  |   2 +-
 .../modernmasters2015/SteadyProgress.java     |   2 +-
 .../sets/modernmasters2015/StoicRebuttal.java |   2 +-
 .../StormbloodBerserker.java                  |   2 +-
 .../modernmasters2015/SunderingVitae.java     |   2 +-
 .../sets/modernmasters2015/Sunforger.java     |   2 +-
 .../mage/sets/modernmasters2015/Sunlance.java |   2 +-
 .../modernmasters2015/SunspearShikari.java    |   2 +-
 .../modernmasters2015/SurgicalExtraction.java |   2 +-
 .../modernmasters2015/SurrakarSpellblade.java |   2 +-
 .../modernmasters2015/SwansOfBrynArgoll.java  |   2 +-
 .../sets/modernmasters2015/SylvanBounty.java  |   2 +-
 .../modernmasters2015/TajNarSwordsmith.java   |   2 +-
 .../sets/modernmasters2015/Tarmogoyf.java     |   2 +-
 .../sets/modernmasters2015/TellingTime.java   |   2 +-
 .../sets/modernmasters2015/TerashisGrasp.java |   2 +-
 .../modernmasters2015/TezzeretTheSeeker.java  |   2 +-
 .../modernmasters2015/TezzeretsGambit.java    |   2 +-
 .../sets/modernmasters2015/ThiefOfHope.java   |   2 +-
 .../sets/modernmasters2015/Thoughtcast.java   |   2 +-
 .../mage/sets/modernmasters2015/Thrive.java   |   2 +-
 .../sets/modernmasters2015/Thrummingbird.java |   2 +-
 .../sets/modernmasters2015/Thunderblust.java  |   2 +-
 .../sets/modernmasters2015/TribalFlames.java  |   2 +-
 .../modernmasters2015/TukatongueThallid.java  |   2 +-
 .../sets/modernmasters2015/TumbleMagnet.java  |   2 +-
 .../UlamogTheInfiniteGyre.java                |   2 +-
 .../modernmasters2015/UlamogsCrusher.java     |   2 +-
 .../modernmasters2015/VampireLacerator.java   |   2 +-
 .../modernmasters2015/VampireOutcasts.java    |   2 +-
 .../sets/modernmasters2015/VaporSnag.java     |   2 +-
 .../modernmasters2015/VendilionClique.java    |   2 +-
 .../modernmasters2015/VengefulRebirth.java    |   2 +-
 .../ViashinoSlaughtermaster.java              |   2 +-
 .../modernmasters2015/VigeanGraftmage.java    |   2 +-
 .../modernmasters2015/VinesOfVastwood.java    |   2 +-
 .../modernmasters2015/WakingNightmare.java    |   2 +-
 .../sets/modernmasters2015/WaterServant.java  |   2 +-
 .../sets/modernmasters2015/WaxmaneBaku.java   |   2 +-
 .../modernmasters2015/WayfarersBauble.java    |   2 +-
 .../mage/sets/modernmasters2015/Wildfire.java |   2 +-
 .../sets/modernmasters2015/WiltLeafLiege.java |   2 +-
 .../modernmasters2015/WingsOfVelisVel.java    |   2 +-
 .../modernmasters2015/WolfbriarElemental.java |   2 +-
 .../sets/modernmasters2015/WrapInFlames.java  |   2 +-
 .../sets/modernmasters2015/WreckingBall.java  |   2 +-
 .../mage/sets/morningtide/AuntiesSnitch.java  |   2 +-
 .../sets/morningtide/BorderlandBehemoth.java  |   2 +-
 .../sets/morningtide/BurrentonBombardier.java |   2 +-
 .../src/mage/sets/morningtide/Disperse.java   |   2 +-
 .../sets/morningtide/DoorOfDestinies.java     |   2 +-
 .../mage/sets/morningtide/EarwigSquad.java    |   2 +-
 .../src/mage/sets/morningtide/Fertilid.java   |   2 +-
 .../sets/morningtide/FeudkillersVerdict.java  |   2 +-
 .../mage/sets/morningtide/KindledFury.java    |   2 +-
 .../mage/sets/morningtide/LatchkeyFaerie.java |   2 +-
 .../mage/sets/morningtide/MindShatter.java    |   2 +-
 .../src/mage/sets/morningtide/MindSpring.java |   2 +-
 .../mage/sets/morningtide/MosquitoGuard.java  |   2 +-
 .../src/mage/sets/morningtide/Negate.java     |   2 +-
 .../sets/morningtide/ReachOfBranches.java     |   2 +-
 .../src/mage/sets/morningtide/RivalsDuel.java |   2 +-
 .../mage/sets/morningtide/RusticClachan.java  |   2 +-
 .../mage/sets/morningtide/Spitebellows.java   |   2 +-
 .../sets/morningtide/StonehewerGiant.java     |   2 +-
 .../mage/sets/morningtide/SwellOfCourage.java |   2 +-
 .../mage/sets/morningtide/TaureanMauler.java  |   2 +-
 .../mage/sets/morningtide/WarrenWeirding.java |   2 +-
 .../mage/sets/nemesis/AscendantEvincar.java   |   2 +-
 .../mage/sets/nemesis/FlowstoneCrusher.java   |   2 +-
 .../src/mage/sets/nemesis/FlowstoneSlide.java |   2 +-
 .../mage/sets/nemesis/PredatorFlagship.java   |   2 +-
 Mage.Sets/src/mage/sets/nemesis/Rhox.java     |   2 +-
 .../mage/sets/nemesis/RootwaterCommando.java  |   2 +-
 .../src/mage/sets/nemesis/SaprolingBurst.java |   2 +-
 .../src/mage/sets/nemesis/SealOfDoom.java     |   2 +-
 .../src/mage/sets/nemesis/SpinelessThug.java  |   2 +-
 .../sets/nemesis/StrongholdDiscipline.java    |   2 +-
 .../mage/sets/nemesis/TerrainGenerator.java   |   2 +-
 .../mage/sets/ninthedition/AdarkarWastes.java |   2 +-
 .../mage/sets/ninthedition/AirElemental.java  |   2 +-
 .../mage/sets/ninthedition/AladdinsRing.java  |   2 +-
 .../src/mage/sets/ninthedition/Anaconda.java  |   2 +-
 .../sets/ninthedition/AncientSilverback.java  |   2 +-
 .../mage/sets/ninthedition/AngelOfMercy.java  |   2 +-
 .../sets/ninthedition/AngelicBlessing.java    |   2 +-
 .../mage/sets/ninthedition/AngelsFeather.java |   2 +-
 .../src/mage/sets/ninthedition/Annex.java     |   2 +-
 .../src/mage/sets/ninthedition/Archivist.java |   2 +-
 .../sets/ninthedition/AvenCloudchaser.java    |   2 +-
 .../mage/sets/ninthedition/AvenFisher.java    |   2 +-
 .../mage/sets/ninthedition/AzureDrake.java    |   2 +-
 .../mage/sets/ninthedition/BallistaSquad.java |   2 +-
 .../sets/ninthedition/BattlefieldForge.java   |   2 +-
 .../src/mage/sets/ninthedition/Biorhythm.java |   2 +-
 .../src/mage/sets/ninthedition/Blackmail.java |   2 +-
 .../sets/ninthedition/BlanchwoodArmor.java    |   2 +-
 .../src/mage/sets/ninthedition/Blaze.java     |   2 +-
 .../mage/sets/ninthedition/BlindingAngel.java |   2 +-
 .../sets/ninthedition/BloodfireColossus.java  |   2 +-
 .../src/mage/sets/ninthedition/BogImp.java    |   2 +-
 .../src/mage/sets/ninthedition/BogWraith.java |   2 +-
 .../src/mage/sets/ninthedition/Boomerang.java |   2 +-
 .../mage/sets/ninthedition/BottleGnomes.java  |   2 +-
 .../src/mage/sets/ninthedition/Brushland.java |   2 +-
 .../mage/sets/ninthedition/CavesOfKoilos.java |   2 +-
 .../ninthedition/CircleOfProtectionBlack.java |   2 +-
 .../ninthedition/CircleOfProtectionRed.java   |   2 +-
 .../src/mage/sets/ninthedition/Clone.java     |   2 +-
 .../mage/sets/ninthedition/CoatOfArms.java    |   2 +-
 .../src/mage/sets/ninthedition/Coercion.java  |   2 +-
 .../mage/sets/ninthedition/Confiscate.java    |   2 +-
 .../mage/sets/ninthedition/ConsumeSpirit.java |   2 +-
 .../src/mage/sets/ninthedition/CoralEel.java  |   2 +-
 .../ninthedition/CounselOfTheSoratami.java    |   2 +-
 .../sets/ninthedition/CraftyPathmage.java     |   2 +-
 .../src/mage/sets/ninthedition/CrawWurm.java  |   2 +-
 .../mage/sets/ninthedition/CreepingMold.java  |   2 +-
 .../mage/sets/ninthedition/CruelEdict.java    |   2 +-
 .../mage/sets/ninthedition/DarkBanishing.java |   2 +-
 .../sets/ninthedition/DeathPitsOfRath.java    |   2 +-
 .../mage/sets/ninthedition/Dehydration.java   |   2 +-
 .../src/mage/sets/ninthedition/Demolish.java  |   2 +-
 .../mage/sets/ninthedition/DemonsHorn.java    |   2 +-
 .../src/mage/sets/ninthedition/Demystify.java |   2 +-
 .../mage/sets/ninthedition/DiabolicTutor.java |   2 +-
 .../sets/ninthedition/DisruptingScepter.java  |   2 +-
 .../mage/sets/ninthedition/DragonsClaw.java   |   2 +-
 .../mage/sets/ninthedition/DreamProwler.java  |   2 +-
 .../sets/ninthedition/DrudgeSkeletons.java    |   2 +-
 .../mage/sets/ninthedition/EagerCadet.java    |   2 +-
 .../sets/ninthedition/ElvishChampion.java     |   2 +-
 .../mage/sets/ninthedition/ElvishPiper.java   |   2 +-
 .../mage/sets/ninthedition/ElvishWarrior.java |   2 +-
 .../mage/sets/ninthedition/Enfeeblement.java  |   2 +-
 .../sets/ninthedition/EnormousBaloth.java     |   2 +-
 .../mage/sets/ninthedition/Evacuation.java    |   2 +-
 .../mage/sets/ninthedition/Exhaustion.java    |   2 +-
 .../src/mage/sets/ninthedition/Fear.java      |   2 +-
 .../sets/ninthedition/FesteringGoblin.java    |   2 +-
 .../sets/ninthedition/FinalPunishment.java    |   2 +-
 .../mage/sets/ninthedition/Firebreathing.java |   2 +-
 .../mage/sets/ninthedition/FishliverOil.java  |   2 +-
 .../mage/sets/ninthedition/Flashfires.java    |   2 +-
 .../src/mage/sets/ninthedition/Flight.java    |   2 +-
 .../sets/ninthedition/FlowstoneSlide.java     |   2 +-
 .../mage/sets/ninthedition/ForceOfNature.java |   2 +-
 .../sets/ninthedition/FormOfTheDragon.java    |   2 +-
 .../src/mage/sets/ninthedition/FoulImp.java   |   2 +-
 .../sets/ninthedition/FugitiveWizard.java     |   2 +-
 .../mage/sets/ninthedition/FurnaceOfRath.java |   2 +-
 .../mage/sets/ninthedition/GiantGrowth.java   |   2 +-
 .../mage/sets/ninthedition/GiantSpider.java   |   2 +-
 .../mage/sets/ninthedition/GiftOfEstates.java |   2 +-
 .../sets/ninthedition/GloriousAnthem.java     |   2 +-
 .../mage/sets/ninthedition/GlorySeeker.java   |   2 +-
 .../sets/ninthedition/GluttonousZombie.java   |   2 +-
 .../ninthedition/GoblinBalloonBrigade.java    |   2 +-
 .../mage/sets/ninthedition/GoblinKing.java    |   2 +-
 .../sets/ninthedition/GoblinMountaineer.java  |   2 +-
 .../mage/sets/ninthedition/GoblinPiker.java   |   2 +-
 .../sets/ninthedition/GoblinSkyRaider.java    |   2 +-
 .../mage/sets/ninthedition/Gravedigger.java   |   2 +-
 .../mage/sets/ninthedition/GrizzlyBears.java  |   2 +-
 .../mage/sets/ninthedition/HighwayRobber.java |   2 +-
 .../src/mage/sets/ninthedition/HillGiant.java |   2 +-
 .../mage/sets/ninthedition/HollowDogs.java    |   2 +-
 .../src/mage/sets/ninthedition/HolyDay.java   |   2 +-
 .../mage/sets/ninthedition/HolyStrength.java  |   2 +-
 .../mage/sets/ninthedition/HonorGuard.java    |   2 +-
 .../mage/sets/ninthedition/HornedTurtle.java  |   2 +-
 .../sets/ninthedition/HorrorOfHorrors.java    |   2 +-
 .../mage/sets/ninthedition/HowlingMine.java   |   2 +-
 .../sets/ninthedition/HypnoticSpecter.java    |   2 +-
 .../sets/ninthedition/IcyManipulator.java     |   2 +-
 .../mage/sets/ninthedition/ImaginaryPet.java  |   2 +-
 .../src/mage/sets/ninthedition/Index.java     |   2 +-
 .../sets/ninthedition/InfantryVeteran.java    |   2 +-
 .../src/mage/sets/ninthedition/Inspirit.java  |   2 +-
 .../mage/sets/ninthedition/JestersCap.java    |   2 +-
 .../sets/ninthedition/KamiOfOldStone.java     |   2 +-
 .../sets/ninthedition/KarplusanForest.java    |   2 +-
 .../mage/sets/ninthedition/KarplusanYeti.java |   2 +-
 .../mage/sets/ninthedition/KavuClimber.java   |   2 +-
 .../mage/sets/ninthedition/KrakensEye.java    |   2 +-
 .../src/mage/sets/ninthedition/LavaAxe.java   |   2 +-
 .../sets/ninthedition/LeoninSkyhunter.java    |   2 +-
 .../mage/sets/ninthedition/Levitation.java    |   2 +-
 .../src/mage/sets/ninthedition/LeyDruid.java  |   2 +-
 .../sets/ninthedition/LightningElemental.java |   2 +-
 .../mage/sets/ninthedition/LlanowarElves.java |   2 +-
 .../sets/ninthedition/LlanowarWastes.java     |   2 +-
 .../mage/sets/ninthedition/LoomingShade.java  |   2 +-
 .../sets/ninthedition/LordOfTheUndead.java    |   2 +-
 .../sets/ninthedition/LoxodonWarhammer.java   |   2 +-
 .../sets/ninthedition/LumengridWarden.java    |   2 +-
 .../mage/sets/ninthedition/MahamotiDjinn.java |   2 +-
 .../src/mage/sets/ninthedition/ManaClash.java |   2 +-
 .../src/mage/sets/ninthedition/ManaLeak.java  |   2 +-
 .../mage/sets/ninthedition/MarbleTitan.java   |   2 +-
 .../mage/sets/ninthedition/MasterDecoy.java   |   2 +-
 .../src/mage/sets/ninthedition/Megrim.java    |   2 +-
 .../mage/sets/ninthedition/MendingHands.java  |   2 +-
 .../mage/sets/ninthedition/MightOfOaks.java   |   2 +-
 .../src/mage/sets/ninthedition/Millstone.java |   2 +-
 .../src/mage/sets/ninthedition/MindRot.java   |   2 +-
 .../src/mage/sets/ninthedition/Mortivore.java |   2 +-
 .../mage/sets/ninthedition/NantukoHusk.java   |   2 +-
 .../mage/sets/ninthedition/NaturalSpring.java |   2 +-
 .../mage/sets/ninthedition/Naturalize.java    |   2 +-
 .../mage/sets/ninthedition/NeedleStorm.java   |   2 +-
 .../src/mage/sets/ninthedition/Nightmare.java |   2 +-
 .../sets/ninthedition/OraclesAttendants.java  |   2 +-
 .../sets/ninthedition/OrcishArtillery.java    |   2 +-
 .../ninthedition/OrderOfTheSacredBell.java    |   2 +-
 .../mage/sets/ninthedition/Ornithopter.java   |   2 +-
 .../mage/sets/ninthedition/Overgrowth.java    |   2 +-
 .../src/mage/sets/ninthedition/Pacifism.java  |   2 +-
 .../mage/sets/ninthedition/PanicAttack.java   |   2 +-
 .../sets/ninthedition/PegasusCharger.java     |   2 +-
 .../src/mage/sets/ninthedition/Persecute.java |   2 +-
 .../sets/ninthedition/PhantomWarrior.java     |   2 +-
 .../sets/ninthedition/PhyrexianArena.java     |   2 +-
 .../sets/ninthedition/PhyrexianGargantua.java |   2 +-
 .../mage/sets/ninthedition/PhyrexianHulk.java |   2 +-
 .../mage/sets/ninthedition/PlagueBeetle.java  |   2 +-
 .../mage/sets/ninthedition/PlagueWind.java    |   2 +-
 .../src/mage/sets/ninthedition/Polymorph.java |   2 +-
 .../src/mage/sets/ninthedition/Puppeteer.java |   2 +-
 .../src/mage/sets/ninthedition/Pyroclasm.java |   2 +-
 .../src/mage/sets/ninthedition/Quicksand.java |   2 +-
 .../mage/sets/ninthedition/RagingGoblin.java  |   2 +-
 .../src/mage/sets/ninthedition/RaiseDead.java |   2 +-
 .../mage/sets/ninthedition/RampantGrowth.java |   2 +-
 .../mage/sets/ninthedition/RavenousRats.java  |   2 +-
 .../src/mage/sets/ninthedition/Reclaim.java   |   2 +-
 .../src/mage/sets/ninthedition/Reflexes.java  |   2 +-
 .../mage/sets/ninthedition/Regeneration.java  |   2 +-
 .../sets/ninthedition/RelentlessAssault.java  |   2 +-
 .../src/mage/sets/ninthedition/Reminisce.java |   2 +-
 .../mage/sets/ninthedition/RemoveSoul.java    |   2 +-
 .../mage/sets/ninthedition/ReverseDamage.java |   2 +-
 .../src/mage/sets/ninthedition/Rewind.java    |   2 +-
 .../mage/sets/ninthedition/Righteousness.java |   2 +-
 .../src/mage/sets/ninthedition/RodOfRuin.java |   2 +-
 .../sets/ninthedition/RootbreakerWurm.java    |   2 +-
 .../src/mage/sets/ninthedition/Rootwalla.java |   2 +-
 .../mage/sets/ninthedition/RoyalAssassin.java |   2 +-
 .../src/mage/sets/ninthedition/RukhEgg.java   |   2 +-
 .../mage/sets/ninthedition/SacredGround.java  |   2 +-
 .../mage/sets/ninthedition/SamiteHealer.java  |   2 +-
 .../sets/ninthedition/SandstoneWarrior.java   |   2 +-
 .../mage/sets/ninthedition/SavannahLions.java |   2 +-
 .../mage/sets/ninthedition/ScatheZombies.java |   2 +-
 .../mage/sets/ninthedition/SeaMonster.java    |   2 +-
 .../src/mage/sets/ninthedition/SeasClaim.java |   2 +-
 .../sets/ninthedition/SeasonedMarshal.java    |   2 +-
 .../mage/sets/ninthedition/SeethingSong.java  |   2 +-
 .../mage/sets/ninthedition/SengirVampire.java |   2 +-
 .../sets/ninthedition/SerpentWarrior.java     |   2 +-
 .../mage/sets/ninthedition/SerraAngel.java    |   2 +-
 .../mage/sets/ninthedition/ShardPhoenix.java  |   2 +-
 .../src/mage/sets/ninthedition/Shatter.java   |   2 +-
 .../mage/sets/ninthedition/ShivanDragon.java  |   2 +-
 .../mage/sets/ninthedition/ShivanReef.java    |   2 +-
 .../src/mage/sets/ninthedition/Shock.java     |   2 +-
 .../src/mage/sets/ninthedition/Sift.java      |   2 +-
 .../sets/ninthedition/SilklashSpider.java     |   2 +-
 .../sets/ninthedition/SkyhunterProwler.java   |   2 +-
 .../sets/ninthedition/SlateOfAncestry.java    |   2 +-
 .../src/mage/sets/ninthedition/SoulFeast.java |   2 +-
 .../mage/sets/ninthedition/SoulWarden.java    |   2 +-
 .../src/mage/sets/ninthedition/Spellbook.java |   2 +-
 .../mage/sets/ninthedition/SpinedWurm.java    |   2 +-
 .../mage/sets/ninthedition/SpinelessThug.java |   2 +-
 .../mage/sets/ninthedition/SpiritLink.java    |   2 +-
 .../src/mage/sets/ninthedition/StoneRain.java |   2 +-
 .../mage/sets/ninthedition/StoryCircle.java   |   2 +-
 .../mage/sets/ninthedition/StreamOfLife.java  |   2 +-
 .../mage/sets/ninthedition/SuddenImpact.java  |   2 +-
 .../sets/ninthedition/SulfurousSprings.java   |   2 +-
 .../mage/sets/ninthedition/SuntailHawk.java   |   2 +-
 .../mage/sets/ninthedition/Tanglebloom.java   |   2 +-
 .../src/mage/sets/ninthedition/Telepathy.java |   2 +-
 .../sets/ninthedition/TempestOfLight.java     |   2 +-
 .../mage/sets/ninthedition/ThranGolem.java    |   2 +-
 .../src/mage/sets/ninthedition/Threaten.java  |   2 +-
 .../mage/sets/ninthedition/Thundermare.java   |   2 +-
 .../src/mage/sets/ninthedition/Tidings.java   |   2 +-
 .../src/mage/sets/ninthedition/TimeEbb.java   |   2 +-
 .../sets/ninthedition/TrainedArmodon.java     |   2 +-
 .../mage/sets/ninthedition/Traumatize.java    |   2 +-
 .../sets/ninthedition/TreetopBracers.java     |   2 +-
 .../sets/ninthedition/UndergroundRiver.java   |   2 +-
 .../sets/ninthedition/UnderworldDreams.java   |   2 +-
 .../sets/ninthedition/UnholyStrength.java     |   2 +-
 .../mage/sets/ninthedition/UrGolemsEye.java   |   2 +-
 .../src/mage/sets/ninthedition/UrzasMine.java |   2 +-
 .../sets/ninthedition/UrzasPowerPlant.java    |   2 +-
 .../mage/sets/ninthedition/UrzasTower.java    |   2 +-
 .../mage/sets/ninthedition/UtopiaTree.java    |   2 +-
 .../mage/sets/ninthedition/VenerableMonk.java |   2 +-
 .../src/mage/sets/ninthedition/Vengeance.java |   2 +-
 .../mage/sets/ninthedition/VerdantForce.java  |   2 +-
 .../ninthedition/VerduranEnchantress.java     |   2 +-
 .../sets/ninthedition/ViridianShaman.java     |   2 +-
 .../mage/sets/ninthedition/Vizzerdrix.java    |   2 +-
 .../sets/ninthedition/VulshokMorningstar.java |   2 +-
 .../mage/sets/ninthedition/WarriorsHonor.java |   2 +-
 .../sets/ninthedition/WeatheredWayfarer.java  |   2 +-
 Mage.Sets/src/mage/sets/ninthedition/Web.java |   2 +-
 .../mage/sets/ninthedition/WeirdHarvest.java  |   2 +-
 .../mage/sets/ninthedition/WhipSergeant.java  |   2 +-
 .../src/mage/sets/ninthedition/Wildfire.java  |   2 +-
 .../mage/sets/ninthedition/WillOTheWisp.java  |   2 +-
 .../src/mage/sets/ninthedition/WindDrake.java |   2 +-
 .../mage/sets/ninthedition/WitheringGaze.java |   2 +-
 .../src/mage/sets/ninthedition/Worship.java   |   2 +-
 .../mage/sets/ninthedition/WrathOfGod.java    |   2 +-
 .../mage/sets/ninthedition/WurmsTooth.java    |   2 +-
 .../mage/sets/ninthedition/YavimayaCoast.java |   2 +-
 .../ninthedition/YavimayaEnchantress.java     |   2 +-
 .../mage/sets/ninthedition/ZursWeirding.java  |   2 +-
 .../mage/sets/oathofthegatewatch/BoneSaw.java |   2 +-
 .../oathofthegatewatch/GraspOfDarkness.java   |   2 +-
 .../sets/oathofthegatewatch/MightyLeap.java   |   2 +-
 .../mage/sets/oathofthegatewatch/Negate.java  |   2 +-
 .../oathofthegatewatch/NetcasterSpider.java   |   2 +-
 .../oathofthegatewatch/StriderHarness.java    |   2 +-
 .../oathofthegatewatch/UnknownShores.java     |   2 +-
 .../mage/sets/oathofthegatewatch/Wastes2.java |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Afflict.java  |   2 +-
 .../src/mage/sets/odyssey/Anarchist.java      |   2 +-
 .../src/mage/sets/odyssey/AngelicWall.java    |   2 +-
 .../src/mage/sets/odyssey/AuraGraft.java      |   2 +-
 .../src/mage/sets/odyssey/Auramancer.java     |   2 +-
 .../mage/sets/odyssey/AvenCloudchaser.java    |   2 +-
 .../src/mage/sets/odyssey/AvenFisher.java     |   2 +-
 .../src/mage/sets/odyssey/AvenFlock.java      |   2 +-
 .../src/mage/sets/odyssey/AvenWindreader.java |   2 +-
 .../src/mage/sets/odyssey/BattleOfWits.java   |   2 +-
 .../src/mage/sets/odyssey/BlessedOrator.java  |   2 +-
 .../src/mage/sets/odyssey/BuriedAlive.java    |   2 +-
 .../src/mage/sets/odyssey/CallOfTheHerd.java  |   2 +-
 .../src/mage/sets/odyssey/Cartographer.java   |   2 +-
 .../src/mage/sets/odyssey/CryptCreeper.java   |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Deluge.java   |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Demolish.java |   2 +-
 .../src/mage/sets/odyssey/DiabolicTutor.java  |   2 +-
 Mage.Sets/src/mage/sets/odyssey/DuskImp.java  |   2 +-
 .../src/mage/sets/odyssey/EmberBeast.java     |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Execute.java  |   2 +-
 .../src/mage/sets/odyssey/Gallantry.java      |   2 +-
 .../src/mage/sets/odyssey/Gravedigger.java    |   2 +-
 .../src/mage/sets/odyssey/GroundSeal.java     |   2 +-
 .../src/mage/sets/odyssey/HauntingEchoes.java |   2 +-
 .../src/mage/sets/odyssey/InnocentBlood.java  |   2 +-
 .../src/mage/sets/odyssey/IvyElemental.java   |   2 +-
 .../mage/sets/odyssey/KamahlPitFighter.java   |   2 +-
 .../src/mage/sets/odyssey/KirtarsWrath.java   |   2 +-
 .../src/mage/sets/odyssey/Magnivore.java      |   2 +-
 .../src/mage/sets/odyssey/Mindslicer.java     |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Mirari.java   |   2 +-
 .../src/mage/sets/odyssey/Mortivore.java      |   2 +-
 .../src/mage/sets/odyssey/MysticEnforcer.java |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Overrun.java  |   2 +-
 .../mage/sets/odyssey/PatchworkGnomes.java    |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Peek.java     |   2 +-
 .../src/mage/sets/odyssey/Persuasion.java     |   2 +-
 .../src/mage/sets/odyssey/Psychatog.java      |   2 +-
 .../src/mage/sets/odyssey/Puppeteer.java      |   2 +-
 .../src/mage/sets/odyssey/RecklessCharge.java |   2 +-
 .../src/mage/sets/odyssey/Scrivener.java      |   2 +-
 .../sets/odyssey/ShadowmageInfiltrator.java   |   2 +-
 .../src/mage/sets/odyssey/SquirrelNest.java   |   2 +-
 .../src/mage/sets/odyssey/Syncopate.java      |   2 +-
 .../src/mage/sets/odyssey/TimeStretch.java    |   2 +-
 .../src/mage/sets/odyssey/Traumatize.java     |   2 +-
 .../src/mage/sets/odyssey/VampiricDragon.java |   2 +-
 .../mage/sets/odyssey/ZombieInfestation.java  |   2 +-
 Mage.Sets/src/mage/sets/odyssey/Zombify.java  |   2 +-
 .../mage/sets/onslaught/AkromasVengeance.java |   2 +-
 .../sets/onslaught/ArcanisTheOmnipotent.java  |   2 +-
 .../sets/onslaught/BatteringCraghorn.java     |   2 +-
 Mage.Sets/src/mage/sets/onslaught/Clone.java  |   2 +-
 .../mage/sets/onslaught/CraftyPathmage.java   |   2 +-
 .../mage/sets/onslaught/DaruEncampment.java   |   2 +-
 .../src/mage/sets/onslaught/Demystify.java    |   2 +-
 .../mage/sets/onslaught/DiscipleOfGrace.java  |   2 +-
 .../mage/sets/onslaught/Discombobulate.java   |   2 +-
 .../sets/onslaught/DoomedNecromancer.java     |   2 +-
 .../src/mage/sets/onslaught/DragonRoost.java  |   2 +-
 .../mage/sets/onslaught/ElvishWarrior.java    |   2 +-
 .../mage/sets/onslaught/ErraticExplosion.java |   2 +-
 .../sets/onslaught/ExplosiveVegetation.java   |   2 +-
 .../mage/sets/onslaught/FesteringGoblin.java  |   2 +-
 .../src/mage/sets/onslaught/GlorySeeker.java  |   2 +-
 .../mage/sets/onslaught/GoblinSkyRaider.java  |   2 +-
 .../mage/sets/onslaught/GustcloakHarrier.java |   2 +-
 Mage.Sets/src/mage/sets/onslaught/Infest.java |   2 +-
 .../src/mage/sets/onslaught/KrosanTusker.java |   2 +-
 .../src/mage/sets/onslaught/LayWaste.java     |   2 +-
 .../src/mage/sets/onslaught/Mobilization.java |   2 +-
 .../src/mage/sets/onslaught/NantukoHusk.java  |   2 +-
 .../src/mage/sets/onslaught/Naturalize.java   |   2 +-
 .../src/mage/sets/onslaught/Pacifism.java     |   2 +-
 .../sets/onslaught/QuicksilverDragon.java     |   2 +-
 .../mage/sets/onslaught/RighteousCause.java   |   2 +-
 .../mage/sets/onslaught/RorixBladewing.java   |   2 +-
 .../src/mage/sets/onslaught/SageAven.java     |   2 +-
 .../mage/sets/onslaught/ScreamingSeahawk.java |   2 +-
 .../mage/sets/onslaught/SeveredLegion.java    |   2 +-
 Mage.Sets/src/mage/sets/onslaught/Shock.java  |   2 +-
 .../src/mage/sets/onslaught/Smother.java      |   2 +-
 .../src/mage/sets/onslaught/SyphonSoul.java   |   2 +-
 .../src/mage/sets/onslaught/Threaten.java     |   2 +-
 .../pdsfireandlightning/BallLightning.java    |   2 +-
 .../pdsfireandlightning/BarbarianRing.java    |   2 +-
 .../pdsfireandlightning/BoggartRamGang.java   |   2 +-
 .../sets/pdsfireandlightning/Browbeat.java    |   2 +-
 .../pdsfireandlightning/ChainLightning.java   |   2 +-
 .../pdsfireandlightning/CinderPyromancer.java |   2 +-
 .../pdsfireandlightning/FigureOfDestiny.java  |   2 +-
 .../sets/pdsfireandlightning/FireServant.java |   2 +-
 .../sets/pdsfireandlightning/Fireball.java    |   2 +-
 .../sets/pdsfireandlightning/Fireblast.java   |   2 +-
 .../FlamesOfTheBloodHand.java                 |   2 +-
 .../pdsfireandlightning/GhituEncampment.java  |   2 +-
 .../pdsfireandlightning/GrimLavamancer.java   |   2 +-
 .../pdsfireandlightning/HammerOfBogardan.java |   2 +-
 .../HellsparkElemental.java                   |   2 +-
 .../sets/pdsfireandlightning/JackalPup.java   |   2 +-
 .../JayaBallardTaskMage.java                  |   2 +-
 .../pdsfireandlightning/KeldonChampion.java   |   2 +-
 .../pdsfireandlightning/KeldonMarauders.java  |   2 +-
 .../pdsfireandlightning/LightningBolt.java    |   2 +-
 .../sets/pdsfireandlightning/MoggFanatic.java |   2 +-
 .../pdsfireandlightning/MoggFlunkies.java     |   2 +-
 .../sets/pdsfireandlightning/Pillage.java     |   2 +-
 .../pdsfireandlightning/PriceOfProgress.java  |   2 +-
 .../sets/pdsfireandlightning/Reverberate.java |   2 +-
 .../pdsfireandlightning/SparkElemental.java   |   2 +-
 .../pdsfireandlightning/SuddenImpact.java     |   2 +-
 .../pdsfireandlightning/TeeteringPeaks.java   |   2 +-
 .../sets/pdsfireandlightning/Thunderbolt.java |   2 +-
 .../pdsfireandlightning/VulshokSorcerer.java  |   2 +-
 .../mage/sets/pdsgraveborn/AnimateDead.java   |   2 +-
 .../mage/sets/pdsgraveborn/AvatarOfWoe.java   |   2 +-
 .../mage/sets/pdsgraveborn/BlazingArchon.java |   2 +-
 .../mage/sets/pdsgraveborn/BuriedAlive.java   |   2 +-
 .../mage/sets/pdsgraveborn/CabalTherapy.java  |   2 +-
 .../sets/pdsgraveborn/CrosisThePurger.java    |   2 +-
 .../mage/sets/pdsgraveborn/CrystalVein.java   |   2 +-
 .../sets/pdsgraveborn/DiabolicServitude.java  |   2 +-
 .../mage/sets/pdsgraveborn/DreadReturn.java   |   2 +-
 .../src/mage/sets/pdsgraveborn/Duress.java    |   2 +-
 .../sets/pdsgraveborn/EbonStronghold.java     |   2 +-
 .../src/mage/sets/pdsgraveborn/Entomb.java    |   2 +-
 .../src/mage/sets/pdsgraveborn/Exhume.java    |   2 +-
 .../sets/pdsgraveborn/FacelessButcher.java    |   2 +-
 .../mage/sets/pdsgraveborn/HiddenHorror.java  |   2 +-
 .../sets/pdsgraveborn/InkwellLeviathan.java   |   2 +-
 .../mage/sets/pdsgraveborn/PollutedMire.java  |   2 +-
 .../src/mage/sets/pdsgraveborn/PutridImp.java |   2 +-
 .../src/mage/sets/pdsgraveborn/Reanimate.java |   2 +-
 .../pdsgraveborn/SphinxOfTheSteelWind.java    |   2 +-
 .../mage/sets/pdsgraveborn/Terastodon.java    |   2 +-
 .../sets/pdsgraveborn/TwistedAbomination.java |   2 +-
 .../mage/sets/pdsgraveborn/VerdantForce.java  |   2 +-
 .../sets/pdsgraveborn/ZombieInfestation.java  |   2 +-
 .../mage/sets/pdsslivers/AcidicSliver.java    |   2 +-
 .../sets/pdsslivers/AmoeboidChangeling.java   |   2 +-
 .../mage/sets/pdsslivers/AncientZiggurat.java |   2 +-
 .../mage/sets/pdsslivers/AphettoDredging.java |   2 +-
 .../src/mage/sets/pdsslivers/ArmorSliver.java |   2 +-
 .../mage/sets/pdsslivers/BarbedSliver.java    |   2 +-
 .../src/mage/sets/pdsslivers/BroodSliver.java |   2 +-
 .../src/mage/sets/pdsslivers/ClotSliver.java  |   2 +-
 .../src/mage/sets/pdsslivers/CoatOfArms.java  |   2 +-
 .../sets/pdsslivers/CrystallineSliver.java    |   2 +-
 .../mage/sets/pdsslivers/DistantMelody.java   |   2 +-
 .../mage/sets/pdsslivers/FrenzySliver.java    |   2 +-
 .../mage/sets/pdsslivers/FungusSliver.java    |   2 +-
 .../src/mage/sets/pdsslivers/FurySliver.java  |   2 +-
 .../mage/sets/pdsslivers/GemhideSliver.java   |   2 +-
 .../src/mage/sets/pdsslivers/HeartSliver.java |   2 +-
 .../src/mage/sets/pdsslivers/Heartstone.java  |   2 +-
 .../sets/pdsslivers/HibernationSliver.java    |   2 +-
 .../mage/sets/pdsslivers/HomingSliver.java    |   2 +-
 .../mage/sets/pdsslivers/MetallicSliver.java  |   2 +-
 .../src/mage/sets/pdsslivers/MightSliver.java |   2 +-
 .../mage/sets/pdsslivers/MuscleSliver.java    |   2 +-
 .../mage/sets/pdsslivers/NecroticSliver.java  |   2 +-
 .../src/mage/sets/pdsslivers/QuickSliver.java |   2 +-
 .../mage/sets/pdsslivers/RootboundCrag.java   |   2 +-
 .../mage/sets/pdsslivers/RuptureSpire.java    |   2 +-
 .../mage/sets/pdsslivers/SliverOverlord.java  |   2 +-
 .../mage/sets/pdsslivers/SpectralSliver.java  |   2 +-
 .../mage/sets/pdsslivers/SpinedSliver.java    |   2 +-
 .../sets/pdsslivers/TerramorphicExpanse.java  |   2 +-
 .../mage/sets/pdsslivers/VictualSliver.java   |   2 +-
 .../mage/sets/pdsslivers/VirulentSliver.java  |   2 +-
 .../src/mage/sets/pdsslivers/VividCreek.java  |   2 +-
 .../src/mage/sets/pdsslivers/VividGrove.java  |   2 +-
 .../src/mage/sets/pdsslivers/WildPair.java    |   2 +-
 .../mage/sets/pdsslivers/WingedSliver.java    |   2 +-
 .../AlliedStrategies.java                     |   2 +-
 .../ArmadilloCloak.java                       |   2 +-
 .../phyrexiavsthecoalition/BoneShredder.java  |   2 +-
 .../phyrexiavsthecoalition/CarrionFeeder.java |   2 +-
 .../phyrexiavsthecoalition/ChargingTroll.java |   2 +-
 .../CoalitionRelic.java                       |   2 +-
 .../DarigaazsCharm.java                       |   2 +-
 .../phyrexiavsthecoalition/DarkRitual.java    |   2 +-
 .../phyrexiavsthecoalition/ElfhamePalace.java |   2 +-
 .../phyrexiavsthecoalition/EvasiveAction.java |   2 +-
 .../phyrexiavsthecoalition/FertileGround.java |   2 +-
 .../GerrardCapashen.java                      |   2 +-
 .../sets/phyrexiavsthecoalition/Harrow.java   |   2 +-
 .../phyrexiavsthecoalition/HideousEnd.java    |   2 +-
 .../LightningGreaves.java                     |   2 +-
 .../phyrexiavsthecoalition/LivingDeath.java   |   2 +-
 .../phyrexiavsthecoalition/NarrowEscape.java  |   2 +-
 .../phyrexiavsthecoalition/NomadicElf.java    |   2 +-
 .../OrderOfYawgmoth.java                      |   2 +-
 .../PhyrexianArena.java                       |   2 +-
 .../PhyrexianBroodlings.java                  |   2 +-
 .../PhyrexianColossus.java                    |   2 +-
 .../PhyrexianDebaser.java                     |   2 +-
 .../PhyrexianDefiler.java                     |   2 +-
 .../PhyrexianDenouncer.java                   |   2 +-
 .../PhyrexianGargantua.java                   |   2 +-
 .../PhyrexianGhoul.java                       |   2 +-
 .../phyrexiavsthecoalition/PhyrexianHulk.java |   2 +-
 .../PhyrexianNegator.java                     |   2 +-
 .../PhyrexianPlaguelord.java                  |   2 +-
 .../PhyrexianProcessor.java                   |   2 +-
 .../PhyrexianVault.java                       |   2 +-
 .../phyrexiavsthecoalition/PowerArmor.java    |   2 +-
 .../phyrexiavsthecoalition/PriestOfGix.java   |   2 +-
 .../phyrexiavsthecoalition/PuppetStrings.java |   2 +-
 .../phyrexiavsthecoalition/QuirionElves.java  |   2 +-
 .../RithTheAwakener.java                      |   2 +-
 .../phyrexiavsthecoalition/RithsCharm.java    |   2 +-
 .../phyrexiavsthecoalition/SanguineGuard.java |   2 +-
 .../phyrexiavsthecoalition/ShivanOasis.java   |   2 +-
 .../sets/phyrexiavsthecoalition/Slay.java     |   2 +-
 .../SunscapeBattlemage.java                   |   2 +-
 .../TendrilsOfCorruption.java                 |   2 +-
 .../TerramorphicExpanse.java                  |   2 +-
 .../TrevaTheRenewer.java                      |   2 +-
 .../phyrexiavsthecoalition/TrevasCharm.java   |   2 +-
 .../phyrexiavsthecoalition/TribalFlames.java  |   2 +-
 .../phyrexiavsthecoalition/VoltaicKey.java    |   2 +-
 .../WhispersilkCloak.java                     |   2 +-
 .../WornPowerstone.java                       |   2 +-
 .../phyrexiavsthecoalition/YavimayaElder.java |   2 +-
 .../mage/sets/planarchaos/AEtherMembrane.java |   2 +-
 .../mage/sets/planarchaos/AeonChronicler.java |   2 +-
 .../sets/planarchaos/AkromaAngelOfFury.java   |   2 +-
 .../sets/planarchaos/AquamorphEntity.java     |   2 +-
 .../src/mage/sets/planarchaos/BodyDouble.java |   2 +-
 .../sets/planarchaos/DeadwoodTreefolk.java    |   2 +-
 .../src/mage/sets/planarchaos/Enslave.java    |   2 +-
 .../mage/sets/planarchaos/KavuPredator.java   |   2 +-
 .../sets/planarchaos/MagusOfTheArena.java     |   2 +-
 .../sets/planarchaos/MagusOfTheCoffers.java   |   2 +-
 .../sets/planarchaos/MesaEnchantress.java     |   2 +-
 .../sets/planarchaos/NumotTheDevastator.java  |   2 +-
 .../mage/sets/planarchaos/OrosTheAvenger.java |   2 +-
 .../mage/sets/planarchaos/PrimalPlasma.java   |   2 +-
 .../sets/planarchaos/ProdigalPyromancer.java  |   2 +-
 .../mage/sets/planarchaos/RoughTumble.java    |   2 +-
 .../src/mage/sets/planarchaos/SerrasBoon.java |   2 +-
 .../mage/sets/planarchaos/ShaperParasite.java |   2 +-
 .../mage/sets/planarchaos/SkirkShaman.java    |   2 +-
 .../mage/sets/planarchaos/Stonecloaker.java   |   2 +-
 .../sets/planarchaos/TenebTheHarvester.java   |   2 +-
 .../src/mage/sets/planarchaos/Torchling.java  |   2 +-
 .../sets/planarchaos/VoroshTheHunter.java     |   2 +-
 .../mage/sets/planarchaos/WhitemaneLion.java  |   2 +-
 .../src/mage/sets/planechase/AncientDen.java  |   2 +-
 .../mage/sets/planechase/ArcLightning.java    |   2 +-
 .../mage/sets/planechase/ArsenalThresher.java |   2 +-
 .../mage/sets/planechase/BalefireLiege.java   |   2 +-
 .../mage/sets/planechase/BattlegateMimic.java |   2 +-
 .../src/mage/sets/planechase/BeastHunt.java   |   2 +-
 .../mage/sets/planechase/BeseechTheQueen.java |   2 +-
 .../mage/sets/planechase/BorosGuildmage.java  |   2 +-
 .../src/mage/sets/planechase/BorosSignet.java |   2 +-
 .../mage/sets/planechase/BranchingBolt.java   |   2 +-
 .../src/mage/sets/planechase/Browbeat.java    |   2 +-
 .../src/mage/sets/planechase/BullCerodon.java |   2 +-
 .../mage/sets/planechase/CerodonYearling.java |   2 +-
 .../mage/sets/planechase/CinderElemental.java |   2 +-
 .../src/mage/sets/planechase/ConeOfFlame.java |   2 +-
 .../src/mage/sets/planechase/Congregate.java  |   2 +-
 .../mage/sets/planechase/ConsumeSpirit.java   |   2 +-
 .../src/mage/sets/planechase/CopperMyr.java   |   2 +-
 .../mage/sets/planechase/CruelRevival.java    |   2 +-
 .../mage/sets/planechase/DarksteelForge.java  |   2 +-
 .../src/mage/sets/planechase/DeathBaron.java  |   2 +-
 .../mage/sets/planechase/DoubleCleave.java    |   2 +-
 .../mage/sets/planechase/DregscapeZombie.java |   2 +-
 .../sets/planechase/DuergarHedgeMage.java     |   2 +-
 .../src/mage/sets/planechase/Fabricate.java   |   2 +-
 .../mage/sets/planechase/FertileGround.java   |   2 +-
 .../src/mage/sets/planechase/Fertilid.java    |   2 +-
 .../sets/planechase/ForgottenAncient.java     |   2 +-
 .../mage/sets/planechase/FurnaceOfRath.java   |   2 +-
 .../mage/sets/planechase/GloryOfWarfare.java  |   2 +-
 .../mage/sets/planechase/GoblinOffensive.java |   2 +-
 .../src/mage/sets/planechase/GoldMyr.java     |   2 +-
 .../src/mage/sets/planechase/GravePact.java   |   2 +-
 .../src/mage/sets/planechase/Gravedigger.java |   2 +-
 .../mage/sets/planechase/GreatFurnace.java    |   2 +-
 .../sets/planechase/HearthfireHobgoblin.java  |   2 +-
 .../src/mage/sets/planechase/HideousEnd.java  |   2 +-
 .../src/mage/sets/planechase/HullBreach.java  |   2 +-
 .../sets/planechase/IncrementalBlight.java    |   2 +-
 .../mage/sets/planechase/Insurrection.java    |   2 +-
 .../src/mage/sets/planechase/IronMyr.java     |   2 +-
 .../src/mage/sets/planechase/KeepWatch.java   |   2 +-
 .../mage/sets/planechase/KorSanctifiers.java  |   2 +-
 .../src/mage/sets/planechase/LeadenMyr.java   |   2 +-
 .../sets/planechase/LeechriddenSwamp.java     |   2 +-
 .../mage/sets/planechase/LightningHelix.java  |   2 +-
 .../src/mage/sets/planechase/LivingHive.java  |   2 +-
 .../src/mage/sets/planechase/MageSlayer.java  |   2 +-
 .../sets/planechase/MasterOfEtherium.java     |   2 +-
 .../mage/sets/planechase/OblivionRing.java    |   2 +-
 .../src/mage/sets/planechase/OrderChaos.java  |   2 +-
 .../mage/sets/planechase/OrimsThunder.java    |   2 +-
 .../src/mage/sets/planechase/Pentavus.java    |   2 +-
 .../mage/sets/planechase/PhyrexianArena.java  |   2 +-
 .../src/mage/sets/planechase/PrisonTerm.java  |   2 +-
 .../mage/sets/planechase/ProfaneCommand.java  |   2 +-
 .../mage/sets/planechase/Pyrotechnics.java    |   2 +-
 .../src/mage/sets/planechase/Qumulox.java     |   2 +-
 .../mage/sets/planechase/RampantGrowth.java   |   2 +-
 .../sets/planechase/RelentlessAssault.java    |   2 +-
 .../sets/planechase/RelicOfProgenitus.java    |   2 +-
 .../sets/planechase/RockslideElemental.java   |   2 +-
 .../mage/sets/planechase/RollingThunder.java  |   2 +-
 .../src/mage/sets/planechase/RottingRats.java |   2 +-
 .../mage/sets/planechase/RumblingSlum.java    |   2 +-
 .../mage/sets/planechase/SavageTwister.java   |   2 +-
 .../sets/planechase/SearchForTomorrow.java    |   2 +-
 .../mage/sets/planechase/SeatOfTheSynod.java  |   2 +-
 .../src/mage/sets/planechase/SerumTank.java   |   2 +-
 .../mage/sets/planechase/ShepherdOfRot.java   |   2 +-
 .../src/mage/sets/planechase/SilverMyr.java   |   2 +-
 .../mage/sets/planechase/SludgeStrider.java   |   2 +-
 .../src/mage/sets/planechase/SoulWarden.java  |   2 +-
 .../src/mage/sets/planechase/SoullessOne.java |   2 +-
 .../src/mage/sets/planechase/SyphonMind.java  |   2 +-
 .../sets/planechase/TerramorphicExpanse.java  |   2 +-
 .../sets/planechase/TornadoElemental.java     |   2 +-
 .../src/mage/sets/planechase/TreeOfTales.java |   2 +-
 .../mage/sets/planechase/VaultOfWhispers.java |   2 +-
 .../mage/sets/planechase/VerdantForce.java    |   2 +-
 .../mage/sets/planechase/WhiplashTrap.java    |   2 +-
 .../mage/sets/planechase2012/ArcTrail.java    |   2 +-
 .../sets/planechase2012/ArmillarySphere.java  |   2 +-
 .../mage/sets/planechase2012/Assassinate.java |   2 +-
 .../mage/sets/planechase2012/AuguryOwl.java   |   2 +-
 .../mage/sets/planechase2012/AuraGnarlid.java |   2 +-
 .../mage/sets/planechase2012/Auramancer.java  |   2 +-
 .../sets/planechase2012/AwakeningZone.java    |   2 +-
 .../mage/sets/planechase2012/BeastWithin.java |   2 +-
 .../sets/planechase2012/BituminousBlast.java  |   2 +-
 .../sets/planechase2012/BloodbraidElf.java    |   2 +-
 .../mage/sets/planechase2012/BoarUmbra.java   |   2 +-
 .../sets/planechase2012/BrambleElemental.java |   2 +-
 .../sets/planechase2012/BrutalizerExarch.java |   2 +-
 .../mage/sets/planechase2012/CadaverImp.java  |   2 +-
 .../mage/sets/planechase2012/CageOfHands.java |   2 +-
 .../src/mage/sets/planechase2012/Cancel.java  |   2 +-
 .../sets/planechase2012/CelestialAncient.java |   2 +-
 .../mage/sets/planechase2012/Concentrate.java |   2 +-
 .../mage/sets/planechase2012/Cultivate.java   |   2 +-
 .../sets/planechase2012/DarkHatchling.java    |   2 +-
 .../mage/sets/planechase2012/DenyReality.java |   2 +-
 .../sets/planechase2012/DimirAqueduct.java    |   2 +-
 .../sets/planechase2012/DimirInfiltrator.java |   2 +-
 .../sets/planechase2012/DowsingShaman.java    |   2 +-
 .../sets/planechase2012/EnigmaSphinx.java     |   2 +-
 .../sets/planechase2012/EnlistedWurm.java     |   2 +-
 .../sets/planechase2012/ExoticOrchard.java    |   2 +-
 .../sets/planechase2012/FarsightMask.java     |   2 +-
 .../sets/planechase2012/FieryConclusion.java  |   2 +-
 .../mage/sets/planechase2012/FieryFall.java   |   2 +-
 .../sets/planechase2012/FiresOfYavimaya.java  |   2 +-
 .../mage/sets/planechase2012/FlayerHusk.java  |   2 +-
 .../src/mage/sets/planechase2012/Fling.java   |   2 +-
 .../sets/planechase2012/FusionElemental.java  |   2 +-
 .../sets/planechase2012/GhostlyPrison.java    |   2 +-
 .../sets/planechase2012/GlenElendraLiege.java |   2 +-
 .../sets/planechase2012/GluttonousSlime.java  |   2 +-
 .../sets/planechase2012/GraypeltRefuge.java   |   2 +-
 .../mage/sets/planechase2012/GruulTurf.java   |   2 +-
 .../sets/planechase2012/GuardGomazoa.java     |   2 +-
 .../sets/planechase2012/HellionEruption.java  |   2 +-
 .../planechase2012/HellkiteHatchling.java     |   2 +-
 .../planechase2012/HigureTheStillWind.java    |   2 +-
 .../sets/planechase2012/HissingIguanar.java   |   2 +-
 .../mage/sets/planechase2012/HyenaUmbra.java  |   2 +-
 .../planechase2012/InkEyesServantOfOni.java   |   2 +-
 .../sets/planechase2012/JwarIsleRefuge.java   |   2 +-
 .../sets/planechase2012/KathariRemnant.java   |   2 +-
 .../sets/planechase2012/KazanduRefuge.java    |   2 +-
 .../sets/planechase2012/KhalniGarden.java     |   2 +-
 .../sets/planechase2012/KorSpiritdancer.java  |   2 +-
 .../sets/planechase2012/LilianasSpecter.java  |   2 +-
 .../mage/sets/planechase2012/Lumberknot.java  |   2 +-
 .../sets/planechase2012/MammothUmbra.java     |   2 +-
 .../sets/planechase2012/MarkOfMutiny.java     |   2 +-
 .../sets/planechase2012/MistbladeShinobi.java |   2 +-
 .../sets/planechase2012/MitoticSlime.java     |   2 +-
 .../planechase2012/MudbuttonTorchrunner.java  |   2 +-
 .../mage/sets/planechase2012/Mycoloth.java    |   2 +-
 .../mage/sets/planechase2012/NestInvader.java |   2 +-
 .../planechase2012/NinjaOfTheDeepHours.java   |   2 +-
 .../sets/planechase2012/OkibaGangShinobi.java |   2 +-
 .../mage/sets/planechase2012/OnduGiant.java   |   2 +-
 .../src/mage/sets/planechase2012/Overrun.java |   2 +-
 .../sets/planechase2012/PeregrineDrake.java   |   2 +-
 .../sets/planechase2012/PredatoryUrge.java    |   2 +-
 .../sets/planechase2012/QuietusSpike.java     |   2 +-
 .../src/mage/sets/planechase2012/Rancor.java  |   2 +-
 .../sets/planechase2012/RuptureSpire.java     |   2 +-
 .../mage/sets/planechase2012/SeeBeyond.java   |   2 +-
 .../planechase2012/SelesnyaSanctuary.java     |   2 +-
 .../sets/planechase2012/ShimmeringGrotto.java |   2 +-
 .../planechase2012/SigilOfTheEmptyThrone.java |   2 +-
 .../planechase2012/SilhanaLedgewalker.java    |   2 +-
 .../planechase2012/SkarrgTheRagePits.java     |   2 +-
 .../sets/planechase2012/Skullsnatcher.java    |   2 +-
 .../mage/sets/planechase2012/SnakeUmbra.java  |   2 +-
 .../sets/planechase2012/SpiritMantle.java     |   2 +-
 .../mage/sets/planechase2012/SunkenHope.java  |   2 +-
 .../planechase2012/TerramorphicExpanse.java   |   2 +-
 .../planechase2012/ThornThrashViashino.java   |   2 +-
 .../mage/sets/planechase2012/ThranGolem.java  |   2 +-
 .../sets/planechase2012/ThroatSlitter.java    |   2 +-
 .../planechase2012/ThunderThrashElder.java    |   2 +-
 .../sets/planechase2012/TormentedSoul.java    |   2 +-
 .../planechase2012/TukatongueThallid.java     |   2 +-
 .../sets/planechase2012/ViridianEmissary.java |   2 +-
 .../planechase2012/VituGhaziTheCityTree.java  |   2 +-
 .../mage/sets/planechase2012/VividCreek.java  |   2 +-
 .../planechase2012/WalkerOfSecretWays.java    |   2 +-
 .../sets/planechase2012/WallOfBlossoms.java   |   2 +-
 .../mage/sets/planechase2012/WallOfFrost.java |   2 +-
 .../sets/planechase2012/WarstormSurge.java    |   2 +-
 .../sets/planechase2012/WhispersilkCloak.java |   2 +-
 .../mage/sets/planeshift/CrosissCharm.java    |   2 +-
 Mage.Sets/src/mage/sets/planeshift/Draco.java |   2 +-
 .../mage/sets/planeshift/DromarsCharm.java    |   2 +-
 ...Corrupted.java => ErtaiTheCorrupted1.java} |  12 +-
 .../sets/planeshift/ErtaiTheCorrupted2.java   |  51 +++++
 .../mage/sets/planeshift/FlametongueKavu.java |   2 +-
 .../src/mage/sets/planeshift/GaeasHerald.java |   2 +-
 .../src/mage/sets/planeshift/Gainsay.java     |   2 +-
 .../mage/sets/planeshift/GerrardsCommand.java |   2 +-
 .../src/mage/sets/planeshift/HullBreach.java  |   2 +-
 .../mage/sets/planeshift/LordOfTheUndead.java |   2 +-
 .../src/mage/sets/planeshift/ManaCylix.java   |   2 +-
 .../mage/sets/planeshift/MeddlingMage.java    |   2 +-
 .../src/mage/sets/planeshift/MoggSentry.java  |   2 +-
 .../sets/planeshift/QuestingPhelddagrif.java  |   2 +-
 .../mage/sets/planeshift/QuirionDryad.java    |   2 +-
 .../mage/sets/planeshift/SawtoothLoon.java    |   2 +-
 .../src/mage/sets/planeshift/ShivanWurm.java  |   2 +-
 .../src/mage/sets/planeshift/SilverDrake.java |   2 +-
 ...erlight.java => SkyshipWeatherlight1.java} |  12 +-
 .../sets/planeshift/SkyshipWeatherlight2.java |  30 +++
 Mage.Sets/src/mage/sets/planeshift/Slay.java  |   2 +-
 .../src/mage/sets/planeshift/StarCompass.java |   2 +-
 .../sets/planeshift/StormscapeBattlemage.java |   2 +-
 .../sets/planeshift/StormscapeFamiliar.java   |   2 +-
 ...umHero.java => TahngarthTalruumHero1.java} |  12 +-
 .../planeshift/TahngarthTalruumHero2.java     |  51 +++++
 .../src/mage/sets/planeshift/Terminate.java   |   2 +-
 .../sets/planeshift/ThornscapeBattlemage.java |   2 +-
 .../planeshift/ThunderscapeBattlemage.java    |   2 +-
 .../mage/sets/planeshift/WarpedDevotion.java  |   2 +-
 Mage.Sets/src/mage/sets/portal/Anaconda1.java |   2 +-
 Mage.Sets/src/mage/sets/portal/Anaconda2.java |   2 +-
 .../mage/sets/portal/AncestralMemories.java   |   2 +-
 .../src/mage/sets/portal/AngelicBlessing.java |   2 +-
 Mage.Sets/src/mage/sets/portal/Archangel.java |   2 +-
 .../src/mage/sets/portal/ArdentMilitia.java   |   2 +-
 .../src/mage/sets/portal/Armageddon.java      |   2 +-
 .../src/mage/sets/portal/ArmoredPegasus.java  |   2 +-
 .../src/mage/sets/portal/BalanceOfPower.java  |   2 +-
 .../src/mage/sets/portal/BalefulStare.java    |   2 +-
 Mage.Sets/src/mage/sets/portal/Blaze1.java    |   2 +-
 Mage.Sets/src/mage/sets/portal/Blaze2.java    |   2 +-
 .../src/mage/sets/portal/BlessedReversal.java |   2 +-
 .../src/mage/sets/portal/BlindingLight.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/BogImp.java    |   2 +-
 .../src/mage/sets/portal/BogRaiders.java      |   2 +-
 Mage.Sets/src/mage/sets/portal/BogWraith.java |   2 +-
 .../src/mage/sets/portal/BoilingSeas.java     |   2 +-
 .../src/mage/sets/portal/BreathOfLife.java    |   2 +-
 Mage.Sets/src/mage/sets/portal/BullHippo.java |   2 +-
 .../src/mage/sets/portal/ChargingPaladin.java |   2 +-
 .../src/mage/sets/portal/ChargingRhino.java   |   2 +-
 .../src/mage/sets/portal/CloudDragon.java     |   2 +-
 .../src/mage/sets/portal/CloudSpirit.java     |   2 +-
 Mage.Sets/src/mage/sets/portal/CoralEel.java  |   2 +-
 .../src/mage/sets/portal/CravenGiant.java     |   2 +-
 .../src/mage/sets/portal/CruelBargain.java    |   2 +-
 .../src/mage/sets/portal/DreadReaper.java     |   2 +-
 Mage.Sets/src/mage/sets/portal/DrySpell.java  |   2 +-
 .../src/mage/sets/portal/Earthquake.java      |   2 +-
 .../src/mage/sets/portal/EbonDragon.java      |   2 +-
 .../mage/sets/portal/EliteCatWarrior2.java    |   2 +-
 .../src/mage/sets/portal/ElvenCache.java      |   2 +-
 .../mage/sets/portal/EndlessCockroaches.java  |   2 +-
 .../src/mage/sets/portal/Exhaustion.java      |   2 +-
 .../src/mage/sets/portal/FeralShadow.java     |   2 +-
 .../src/mage/sets/portal/Flashfires.java      |   2 +-
 .../src/mage/sets/portal/FootSoldiers.java    |   2 +-
 .../src/mage/sets/portal/GiantOctopus.java    |   2 +-
 .../src/mage/sets/portal/GiantSpider.java     |   2 +-
 .../src/mage/sets/portal/GiftOfEstates.java   |   2 +-
 .../src/mage/sets/portal/GorillaWarrior.java  |   2 +-
 .../src/mage/sets/portal/Gravedigger.java     |   2 +-
 .../src/mage/sets/portal/GrizzlyBears.java    |   2 +-
 .../src/mage/sets/portal/HandOfDeath1.java    |   2 +-
 .../src/mage/sets/portal/HandOfDeath2.java    |   2 +-
 Mage.Sets/src/mage/sets/portal/HillGiant.java |   2 +-
 .../src/mage/sets/portal/HornedTurtle.java    |   2 +-
 .../src/mage/sets/portal/HowlingFury.java     |   2 +-
 .../src/mage/sets/portal/HulkingCyclops.java  |   2 +-
 .../src/mage/sets/portal/HulkingGoblin.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/Hurricane.java |   2 +-
 .../src/mage/sets/portal/KnightErrant.java    |   2 +-
 .../src/mage/sets/portal/LastChance.java      |   2 +-
 Mage.Sets/src/mage/sets/portal/LavaAxe.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/ManOWar.java   |   2 +-
 .../sets/portal/MerfolkOfThePearlTrident.java |   2 +-
 Mage.Sets/src/mage/sets/portal/MindRot.java   |   2 +-
 .../mage/sets/portal/MonstrousGrowth1.java    |   2 +-
 .../mage/sets/portal/MonstrousGrowth2.java    |   2 +-
 .../src/mage/sets/portal/MountainGoat.java    |   2 +-
 Mage.Sets/src/mage/sets/portal/MuckRats.java  |   2 +-
 .../src/mage/sets/portal/NaturalOrder.java    |   2 +-
 .../src/mage/sets/portal/NaturalSpring.java   |   2 +-
 .../src/mage/sets/portal/NaturesCloak.java    |   2 +-
 .../src/mage/sets/portal/NaturesLore.java     |   2 +-
 .../src/mage/sets/portal/NaturesRuin.java     |   2 +-
 .../src/mage/sets/portal/NeedleStorm.java     |   2 +-
 .../src/mage/sets/portal/PantherWarriors.java |   2 +-
 .../src/mage/sets/portal/PhantomWarrior.java  |   2 +-
 .../src/mage/sets/portal/PillagingHorde.java  |   2 +-
 .../src/mage/sets/portal/PrimevalForce.java   |   2 +-
 .../src/mage/sets/portal/Prosperity.java      |   2 +-
 Mage.Sets/src/mage/sets/portal/Pyroclasm.java |   2 +-
 Mage.Sets/src/mage/sets/portal/Python.java    |   2 +-
 .../src/mage/sets/portal/RagingGoblin1.java   |   2 +-
 .../src/mage/sets/portal/RagingGoblin2.java   |   2 +-
 .../src/mage/sets/portal/RainOfSalt.java      |   2 +-
 .../src/mage/sets/portal/RainOfTears.java     |   2 +-
 Mage.Sets/src/mage/sets/portal/RaiseDead.java |   2 +-
 .../src/mage/sets/portal/RedwoodTreefolk.java |   2 +-
 .../src/mage/sets/portal/RegalUnicorn.java    |   2 +-
 .../src/mage/sets/portal/SacredNectar.java    |   2 +-
 .../src/mage/sets/portal/ScorchingSpear.java  |   2 +-
 .../src/mage/sets/portal/SeasonedMarshal.java |   2 +-
 .../src/mage/sets/portal/SerpentWarrior.java  |   2 +-
 .../src/mage/sets/portal/SnappingDrake.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/SoulShred.java |   2 +-
 .../src/mage/sets/portal/SpinedWurm.java      |   2 +-
 .../src/mage/sets/portal/SpittingEarth.java   |   2 +-
 .../src/mage/sets/portal/StalkingTiger.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/Starlight.java |   2 +-
 .../src/mage/sets/portal/Steadfastness.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/StoneRain.java |   2 +-
 Mage.Sets/src/mage/sets/portal/StormCrow.java |   2 +-
 .../src/mage/sets/portal/SummerBloom.java     |   2 +-
 .../src/mage/sets/portal/TheftOfDreams.java   |   2 +-
 .../mage/sets/portal/ThingFromTheDeep.java    |   2 +-
 .../src/mage/sets/portal/TidalSurge.java      |   2 +-
 Mage.Sets/src/mage/sets/portal/TimeEbb.java   |   2 +-
 .../mage/sets/portal/TouchOfBrilliance.java   |   2 +-
 .../src/mage/sets/portal/UntamedWilds.java    |   2 +-
 .../src/mage/sets/portal/VenerableMonk.java   |   2 +-
 Mage.Sets/src/mage/sets/portal/Vengeance.java |   2 +-
 .../src/mage/sets/portal/VolcanicDragon.java  |   2 +-
 .../src/mage/sets/portal/VolcanicHammer.java  |   2 +-
 .../src/mage/sets/portal/WallOfSwords.java    |   2 +-
 .../src/mage/sets/portal/WarriorsCharge2.java |   2 +-
 Mage.Sets/src/mage/sets/portal/WindDrake.java |   2 +-
 .../src/mage/sets/portal/WindsOfChange.java   |   2 +-
 .../src/mage/sets/portal/WintersGrasp.java    |   2 +-
 Mage.Sets/src/mage/sets/portal/WoodElves.java |   2 +-
 .../src/mage/sets/portal/WrathOfGod.java      |   2 +-
 .../sets/portalsecondage/AirElemental.java    |   2 +-
 .../sets/portalsecondage/AlluringScent.java   |   2 +-
 .../sets/portalsecondage/AncientCraving.java  |   2 +-
 .../sets/portalsecondage/AngelOfMercy.java    |   2 +-
 .../sets/portalsecondage/AngelicBlessing.java |   2 +-
 .../sets/portalsecondage/AngelicWall.java     |   2 +-
 .../mage/sets/portalsecondage/Archangel.java  |   2 +-
 .../mage/sets/portalsecondage/Armageddon.java |   2 +-
 .../sets/portalsecondage/ArmoredGriffin.java  |   2 +-
 .../mage/sets/portalsecondage/Bargain.java    |   2 +-
 .../mage/sets/portalsecondage/BeeSting.java   |   2 +-
 .../src/mage/sets/portalsecondage/Blaze.java  |   2 +-
 .../sets/portalsecondage/BreathOfLife.java    |   2 +-
 .../mage/sets/portalsecondage/Coercion.java   |   2 +-
 .../mage/sets/portalsecondage/CruelEdict.java |   2 +-
 .../sets/portalsecondage/DakmorPlague.java    |   2 +-
 .../sets/portalsecondage/DakmorSorceress.java |   2 +-
 .../src/mage/sets/portalsecondage/DejaVu.java |   2 +-
 .../portalsecondage/DenizenOfTheDeep.java     |   2 +-
 .../mage/sets/portalsecondage/Earthquake.java |   2 +-
 .../mage/sets/portalsecondage/Exhaustion.java |   2 +-
 .../src/mage/sets/portalsecondage/EyeSpy.java |   2 +-
 .../mage/sets/portalsecondage/FoulSpirit.java |   2 +-
 .../sets/portalsecondage/GoblinGeneral.java   |   2 +-
 .../sets/portalsecondage/GoblinGlider.java    |   2 +-
 .../mage/sets/portalsecondage/GoblinLore.java |   2 +-
 .../sets/portalsecondage/GoblinMatron.java    |   2 +-
 .../portalsecondage/GoblinMountaineer.java    |   2 +-
 .../sets/portalsecondage/GoblinPiker.java     |   2 +-
 .../sets/portalsecondage/GoblinRaider.java    |   2 +-
 .../sets/portalsecondage/GoblinWarStrike.java |   2 +-
 .../sets/portalsecondage/HandOfDeath.java     |   2 +-
 .../sets/portalsecondage/HiddenHorror.java    |   2 +-
 .../mage/sets/portalsecondage/Hurricane.java  |   2 +-
 .../sets/portalsecondage/JaggedLightning.java |   2 +-
 .../mage/sets/portalsecondage/LavaAxe.java    |   2 +-
 .../mage/sets/portalsecondage/LoneWolf.java   |   2 +-
 .../mage/sets/portalsecondage/MindRot.java    |   2 +-
 .../sets/portalsecondage/MonstrousGrowth.java |   2 +-
 .../sets/portalsecondage/MysticDenial.java    |   2 +-
 .../sets/portalsecondage/NaturalSpring.java   |   2 +-
 .../sets/portalsecondage/NaturesLore.java     |   2 +-
 .../portalsecondage/NorwoodPriestess.java     |   2 +-
 .../sets/portalsecondage/NorwoodRanger.java   |   2 +-
 .../sets/portalsecondage/OgreTaskmaster.java  |   2 +-
 .../PredatoryNightstalker.java                |   2 +-
 .../portalsecondage/ProwlingNightstalker.java |   2 +-
 .../sets/portalsecondage/RagingGoblin.java    |   2 +-
 .../mage/sets/portalsecondage/RaiseDead.java  |   2 +-
 .../sets/portalsecondage/RavenousRats.java    |   2 +-
 .../sets/portalsecondage/RighteousCharge.java |   2 +-
 .../sets/portalsecondage/RighteousFury.java   |   2 +-
 .../mage/sets/portalsecondage/RiverBear.java  |   2 +-
 .../sets/portalsecondage/ScreechingDrake.java |   2 +-
 .../mage/sets/portalsecondage/SeaDrake.java   |   2 +-
 .../sets/portalsecondage/SleightOfHand.java   |   2 +-
 .../sets/portalsecondage/SpittingEarth.java   |   2 +-
 .../mage/sets/portalsecondage/StoneRain.java  |   2 +-
 .../sets/portalsecondage/SwarmOfRats.java     |   2 +-
 .../mage/sets/portalsecondage/SylvanYeti.java |   2 +-
 .../sets/portalsecondage/TempleAcolyte.java   |   2 +-
 .../sets/portalsecondage/TheftOfDreams.java   |   2 +-
 .../mage/sets/portalsecondage/TidalSurge.java |   2 +-
 .../mage/sets/portalsecondage/TimeEbb.java    |   2 +-
 .../mage/sets/portalsecondage/TreeMonkey.java |   2 +-
 .../src/mage/sets/portalsecondage/Tremor.java |   2 +-
 .../src/mage/sets/portalsecondage/Undo.java   |   2 +-
 .../sets/portalsecondage/UntamedWilds.java    |   2 +-
 .../sets/portalsecondage/VampiricSpirit.java  |   2 +-
 .../mage/sets/portalsecondage/Vengeance.java  |   2 +-
 .../sets/portalsecondage/VolcanicHammer.java  |   2 +-
 .../portalsecondage/VolunteerMilitia.java     |   2 +-
 .../sets/portalsecondage/WildGriffin.java     |   2 +-
 .../mage/sets/portalsecondage/Wildfire.java   |   2 +-
 .../mage/sets/portalsecondage/WindSail.java   |   2 +-
 .../portalthreekingdoms/AmbitionsCost.java    |   2 +-
 .../portalthreekingdoms/BalanceOfPower.java   |   2 +-
 .../mage/sets/portalthreekingdoms/Blaze.java  |   2 +-
 .../Borrowing100000Arrows.java                |   2 +-
 .../portalthreekingdoms/BrilliantPlan.java    |   2 +-
 .../sets/portalthreekingdoms/Coercion.java    |   2 +-
 .../portalthreekingdoms/CorruptEunuchs.java   |   2 +-
 .../sets/portalthreekingdoms/Extinguish.java  |   2 +-
 .../sets/portalthreekingdoms/FalseDefeat.java |   2 +-
 .../mage/sets/portalthreekingdoms/Famine.java |   2 +-
 .../portalthreekingdoms/ForcedRetreat.java    |   2 +-
 .../GuanYuSaintedWarrior.java                 |   2 +-
 .../GuanYus1000LiMarch.java                   |   2 +-
 .../HuaTuoHonoredPhysician.java               |   2 +-
 .../KongmingSleepingDragon.java               |   2 +-
 .../sets/portalthreekingdoms/LoneWolf.java    |   2 +-
 .../portalthreekingdoms/LuBuMasterAtArms.java |   2 +-
 .../LuXunScholarGeneral.java                  |   2 +-
 .../portalthreekingdoms/MysticDenial.java     |   2 +-
 .../portalthreekingdoms/PeachGardenOath.java  |   2 +-
 .../portalthreekingdoms/RedCliffsArmada.java  |   2 +-
 .../RelentlessAssault.java                    |   2 +-
 .../RidingTheDiluHorse.java                   |   2 +-
 .../sets/portalthreekingdoms/ShuCavalry.java  |   2 +-
 .../ShuEliteCompanions.java                   |   2 +-
 .../portalthreekingdoms/SpoilsOfVictory.java  |   2 +-
 .../portalthreekingdoms/StalkingTiger.java    |   2 +-
 .../sets/portalthreekingdoms/StolenGrain.java |   2 +-
 .../sets/portalthreekingdoms/StoneRain.java   |   2 +-
 .../StrategicPlanning.java                    |   2 +-
 .../SunCeYoungConquerer.java                  |   2 +-
 .../sets/portalthreekingdoms/TripWire.java    |   2 +-
 .../sets/portalthreekingdoms/Vengeance.java   |   2 +-
 .../WeiEliteCompanions.java                   |   2 +-
 .../sets/portalthreekingdoms/WolfPack.java    |   2 +-
 .../sets/portalthreekingdoms/WuWarship.java   |   2 +-
 .../portalthreekingdoms/YoungWeiRecruits.java |   2 +-
 .../ZhangFeiFierceWarrior.java                |   2 +-
 .../portalthreekingdoms/ZodiacMonkey.java     |   2 +-
 .../prereleaseevents/AbbotOfKeralKeep.java    |   2 +-
 .../prereleaseevents/AbhorrentOverlord.java   |   2 +-
 .../prereleaseevents/AbzanAscendancy.java     |   2 +-
 .../sets/prereleaseevents/AjaniVengeant.java  |   2 +-
 .../sets/prereleaseevents/AkoumFirebird.java  |   2 +-
 .../sets/prereleaseevents/AkoumHellkite.java  |   2 +-
 .../AleshaWhoSmilesAtDeath.java               |   2 +-
 .../AlhammarretHighArbiter.java               |   2 +-
 .../AlignedHedronNetwork.java                 |   2 +-
 .../prereleaseevents/AllosaurusRider.java     |   2 +-
 .../sets/prereleaseevents/AllyEncampment.java |   2 +-
 .../AnafenzaKinTreeSpirit.java                |   2 +-
 .../prereleaseevents/AnafenzaTheForemost.java |   2 +-
 .../sets/prereleaseevents/AngelicCaptain.java |   2 +-
 .../sets/prereleaseevents/AnkleShanker.java   |   2 +-
 .../AnthousaSetessanHero.java                 |   2 +-
 .../prereleaseevents/ArashinForemost.java     |   2 +-
 .../prereleaseevents/ArashinSovereign.java    |   2 +-
 .../prereleaseevents/ArbiterOfTheIdeal.java   |   2 +-
 .../mage/sets/prereleaseevents/Arcbond.java   |   2 +-
 .../prereleaseevents/ArchdemonOfGreed.java    |   2 +-
 .../ArchfiendOfDepravity.java                 |   2 +-
 .../ArchonOfTheTriumvirate.java               |   2 +-
 .../prereleaseevents/AtarkaWorldRender.java   |   2 +-
 .../sets/prereleaseevents/AtarkasCommand.java |   2 +-
 .../prereleaseevents/AvalancheTusker.java     |   2 +-
 .../prereleaseevents/AvatarOfDiscord.java     |   2 +-
 .../sets/prereleaseevents/AvatarOfHope.java   |   2 +-
 .../prereleaseevents/AvatarOfTheResolute.java |   2 +-
 .../sets/prereleaseevents/BarrageTyrant.java  |   2 +-
 .../sets/prereleaseevents/BeastOfBurden.java  |   2 +-
 .../prereleaseevents/BeastcallerSavant.java   |   2 +-
 .../BlessedReincarnation.java                 |   2 +-
 .../sets/prereleaseevents/BlightHerder.java   |   2 +-
 .../prereleaseevents/BloodChinFanatic.java    |   2 +-
 .../prereleaseevents/BloodlordOfVaasgoth.java |   2 +-
 .../prereleaseevents/BloodsoakedChampion.java |   2 +-
 .../prereleaseevents/BoltwingMarauder.java    |   2 +-
 .../sets/prereleaseevents/BringToLight.java   |   2 +-
 .../sets/prereleaseevents/BroodButcher.java   |   2 +-
 .../prereleaseevents/BrutalExpulsion.java     |   2 +-
 .../prereleaseevents/BrutalHordechief.java    |   2 +-
 .../prereleaseevents/ButcherOfTheHorde.java   |   2 +-
 .../sets/prereleaseevents/CanopyVista.java    |   2 +-
 .../prereleaseevents/CarnivalHellsteed.java   |   2 +-
 .../prereleaseevents/CelestialArchon.java     |   2 +-
 .../ChandraFireOfKaladesh.java                |   2 +-
 .../prereleaseevents/ChandrasIgnition.java    |   2 +-
 .../sets/prereleaseevents/CinderGlade.java    |   2 +-
 .../sets/prereleaseevents/CometStorm.java     |   2 +-
 .../sets/prereleaseevents/ConduitOfRuin.java  |   2 +-
 .../prereleaseevents/ConsumingAberration.java |   2 +-
 .../prereleaseevents/CorpsejackMenace.java    |   2 +-
 .../sets/prereleaseevents/CracklingDoom.java  |   2 +-
 .../prereleaseevents/CraterElemental.java     |   2 +-
 .../sets/prereleaseevents/CratersClaws.java   |   2 +-
 .../prereleaseevents/DaghatarTheAdamant.java  |   2 +-
 .../sets/prereleaseevents/DamnablePact.java   |   2 +-
 .../sets/prereleaseevents/DarkPetition.java   |   2 +-
 .../DawnbringerCharioteers.java               |   2 +-
 .../prereleaseevents/DeathbringerRegent.java  |   2 +-
 .../prereleaseevents/DefiantBloodlord.java    |   2 +-
 .../sets/prereleaseevents/DeflectingPalm.java |   2 +-
 .../prereleaseevents/DemigodOfRevenge.java    |   2 +-
 .../sets/prereleaseevents/DenProtector.java   |   2 +-
 .../sets/prereleaseevents/DesolationTwin.java |   2 +-
 .../prereleaseevents/DespoilerOfSouls.java    |   2 +-
 .../sets/prereleaseevents/DigThroughTime.java |   2 +-
 .../sets/prereleaseevents/DoomwakeGiant.java  |   2 +-
 .../prereleaseevents/DoorOfDestinies.java     |   2 +-
 .../prereleaseevents/DragonBroodmother.java   |   2 +-
 .../prereleaseevents/DragonStyleTwins.java    |   2 +-
 .../prereleaseevents/DragonlordAtarka.java    |   2 +-
 .../prereleaseevents/DragonlordDromoka.java   |   2 +-
 .../prereleaseevents/DragonlordKolaghan.java  |   2 +-
 .../prereleaseevents/DragonlordOjutai.java    |   2 +-
 .../prereleaseevents/DragonlordSilumgar.java  |   2 +-
 .../prereleaseevents/DragonmasterOutcast.java |   2 +-
 .../prereleaseevents/DragonscaleGeneral.java  |   2 +-
 .../DranaLiberatorOfMalakir.java              |   2 +-
 .../prereleaseevents/DromokaTheEternal.java   |   2 +-
 .../prereleaseevents/DromokasCommand.java     |   2 +-
 .../sets/prereleaseevents/DrownerOfHope.java  |   2 +-
 .../mage/sets/prereleaseevents/Duneblast.java |   2 +-
 .../sets/prereleaseevents/DustStalker.java    |   2 +-
 .../prereleaseevents/DwynenGiltLeafDaen.java  |   2 +-
 .../sets/prereleaseevents/EaterOfHope.java    |   2 +-
 .../sets/prereleaseevents/EmberSwallower.java |   2 +-
 .../prereleaseevents/EmbermawHellion.java     |   2 +-
 .../sets/prereleaseevents/EmeriaShepherd.java |   2 +-
 .../prereleaseevents/EmrakulTheAeonsTorn.java |   2 +-
 .../sets/prereleaseevents/EndlessOne.java     |   2 +-
 .../prereleaseevents/EvolutionaryLeap.java    |   2 +-
 .../sets/prereleaseevents/ExertInfluence.java |   2 +-
 .../prereleaseevents/ExquisiteFirecraft.java  |   2 +-
 .../sets/prereleaseevents/FalseProphet.java   |   2 +-
 .../sets/prereleaseevents/FathomFeeder.java   |   2 +-
 .../sets/prereleaseevents/FathomMage.java     |   2 +-
 .../prereleaseevents/FelidarSovereign.java    |   2 +-
 .../sets/prereleaseevents/FlamerushRider.java |   2 +-
 .../prereleaseevents/FlamewakePhoenix.java    |   2 +-
 .../FlyingCraneTechnique.java                 |   2 +-
 .../sets/prereleaseevents/FoeRazerRegent.java |   2 +-
 .../prereleaseevents/ForgestokerDragon.java   |   2 +-
 .../prereleaseevents/FoundryChampion.java     |   2 +-
 .../sets/prereleaseevents/FromBeyond.java     |   2 +-
 .../sets/prereleaseevents/FungalShambler.java |   2 +-
 .../sets/prereleaseevents/GaeasRevenge.java   |   2 +-
 .../GideonAllyOfZendikar.java                 |   2 +-
 .../sets/prereleaseevents/GideonsPhalanx.java |   2 +-
 .../prereleaseevents/GiltLeafWinnower.java    |   2 +-
 .../prereleaseevents/GlissaTheTraitor.java    |   2 +-
 .../prereleaseevents/GoblinPiledriver.java    |   2 +-
 .../prereleaseevents/GravebladeMarauder.java  |   2 +-
 .../prereleaseevents/GreenwardenOfMurasa.java |   2 +-
 .../sets/prereleaseevents/GrimHaruspex.java   |   2 +-
 .../prereleaseevents/GroveOfTheGuardian.java  |   2 +-
 .../prereleaseevents/GruesomeSlaughter.java   |   2 +-
 .../prereleaseevents/GuardianOfTazeem.java    |   2 +-
 .../prereleaseevents/GuulDrazOverseer.java    |   2 +-
 .../prereleaseevents/HarbingerOfTheHunt.java  |   2 +-
 .../prereleaseevents/HarbingerOfTheTides.java |   2 +-
 .../sets/prereleaseevents/HardenedScales.java |   2 +-
 .../sets/prereleaseevents/HelmOfKaldra.java   |   2 +-
 .../prereleaseevents/HeraldOfAnafenza.java    |   2 +-
 .../prereleaseevents/HeroOfBladehold.java     |   2 +-
 .../sets/prereleaseevents/HeroOfGomaFada.java |   2 +-
 .../sets/prereleaseevents/HeroesBane.java     |   2 +-
 .../prereleaseevents/HiddenDragonslayer.java  |   2 +-
 .../HighSentinelsOfArashin.java               |   2 +-
 .../prereleaseevents/HixusPrisonWarden.java   |   2 +-
 .../prereleaseevents/HonoredHierarch.java     |   2 +-
 .../sets/prereleaseevents/HowlpackAlpha.java  |   2 +-
 .../prereleaseevents/HypersonicDragon.java    |   2 +-
 .../sets/prereleaseevents/IcefallRegent.java  |   2 +-
 .../mage/sets/prereleaseevents/IcyBlast.java  |   2 +-
 .../prereleaseevents/IndulgentTormentor.java  |   2 +-
 .../prereleaseevents/InkEyesServantOfOni.java |   2 +-
 .../mage/sets/prereleaseevents/IreShaman.java |   2 +-
 .../prereleaseevents/IvorytuskFortress.java   |   2 +-
 .../prereleaseevents/JaceVrynsProdigy.java    |   2 +-
 .../prereleaseevents/JeeringInstigator.java   |   2 +-
 .../prereleaseevents/JeskaiAscendancy.java    |   2 +-
 .../prereleaseevents/JeskaiInfiltrator.java   |   2 +-
 .../sets/prereleaseevents/KheruLichLord.java  |   2 +-
 .../KioraMasterOfTheDepths.java               |   2 +-
 .../KolaghanTheStormsFury.java                |   2 +-
 .../prereleaseevents/KolaghansCommand.java    |   2 +-
 .../KorlashHeirToBlackblade.java              |   2 +-
 .../KothophedSoulHoarder.java                 |   2 +-
 .../prereleaseevents/KytheonHeroOfAkros.java  |   2 +-
 .../prereleaseevents/KytheonsIrregulars.java  |   2 +-
 .../mage/sets/prereleaseevents/Languish.java  |   2 +-
 .../sets/prereleaseevents/LanternScout.java   |   2 +-
 .../prereleaseevents/LaquatussChampion.java   |   2 +-
 .../LilianaHereticalHealer.java               |   2 +-
 .../sets/prereleaseevents/LivingLore.java     |   2 +-
 .../sets/prereleaseevents/LotusBloom.java     |   2 +-
 .../prereleaseevents/LuBuMasterAtArms.java    |   2 +-
 .../sets/prereleaseevents/LumberingFalls.java |   2 +-
 .../mage/sets/prereleaseevents/Malfegor.java  |   2 +-
 .../prereleaseevents/ManagorgerHydra.java     |   2 +-
 .../prereleaseevents/MarchFromTheTomb.java    |   2 +-
 .../prereleaseevents/MarduAscendancy.java     |   2 +-
 .../prereleaseevents/MarduStrikeLeader.java   |   2 +-
 .../sets/prereleaseevents/MasterOfPearls.java |   2 +-
 .../prereleaseevents/MasteryOfTheUnseen.java  |   2 +-
 .../prereleaseevents/MayorOfAvabruck.java     |   2 +-
 .../mage/sets/prereleaseevents/MazesEnd.java  |   2 +-
 .../sets/prereleaseevents/MeganticSliver.java |   2 +-
 .../prereleaseevents/MercurialPretender.java  |   2 +-
 .../sets/prereleaseevents/MizziumMeddler.java |   2 +-
 .../prereleaseevents/MoonsilverSpear.java     |   2 +-
 .../prereleaseevents/MundaAmbushLeader.java   |   2 +-
 .../sets/prereleaseevents/MythRealized.java   |   2 +-
 .../NarsetEnlightenedMaster.java              |   2 +-
 .../prereleaseevents/NecromasterDragon.java   |   2 +-
 .../prereleaseevents/NecropolisFiend.java     |   2 +-
 .../prereleaseevents/NessianWildsRavager.java |   2 +-
 .../prereleaseevents/NissaVastwoodSeer.java   |   2 +-
 .../sets/prereleaseevents/NissasRenewal.java  |   2 +-
 .../prereleaseevents/NissasRevelation.java    |   2 +-
 .../prereleaseevents/NoyanDarRoilShaper.java  |   2 +-
 .../prereleaseevents/ObNixilisReignited.java  |   2 +-
 .../sets/prereleaseevents/OblivionSower.java  |   2 +-
 .../prereleaseevents/OjutaiSoulOfWinter.java  |   2 +-
 .../sets/prereleaseevents/OjutaisCommand.java |   2 +-
 .../prereleaseevents/OmnathLocusOfRage.java   |   2 +-
 .../sets/prereleaseevents/OranRiefHydra.java  |   2 +-
 .../sets/prereleaseevents/OrosTheAvenger.java |   2 +-
 .../prereleaseevents/OutlandColossus.java     |   2 +-
 .../prereleaseevents/OverbeingOfMyth.java     |   2 +-
 .../mage/sets/prereleaseevents/Overtaker.java |   2 +-
 .../sets/prereleaseevents/PainfulTruths.java  |   2 +-
 .../prereleaseevents/PartTheWaterveil.java    |   2 +-
 .../sets/prereleaseevents/Phytotitan.java     |   2 +-
 .../prereleaseevents/PiaAndKiranNalaar.java   |   2 +-
 .../sets/prereleaseevents/PitilessHorde.java  |   2 +-
 .../sets/prereleaseevents/PlanarOutburst.java |   2 +-
 .../sets/prereleaseevents/PrairieStream.java  |   2 +-
 .../PriestOfTheBloodRite.java                 |   2 +-
 .../sets/prereleaseevents/PrismArray.java     |   2 +-
 .../prereleaseevents/PristineSkywise.java     |   2 +-
 .../prereleaseevents/ProfanerOfTheDead.java   |   2 +-
 .../prereleaseevents/QuarantineField.java     |   2 +-
 .../sets/prereleaseevents/RadiantFlames.java  |   2 +-
 .../sets/prereleaseevents/RagingKavu.java     |   2 +-
 .../sets/prereleaseevents/RakshasaVizier.java |   2 +-
 .../prereleaseevents/RallyTheAncestors.java   |   2 +-
 .../prereleaseevents/RampagingBaloths.java    |   2 +-
 .../sets/prereleaseevents/RathiAssassin.java  |   2 +-
 .../prereleaseevents/RattleclawMystic.java    |   2 +-
 .../sets/prereleaseevents/RavenousDemon.java  |   2 +-
 .../sets/prereleaseevents/RelicSeeker.java    |   2 +-
 .../prereleaseevents/ResoluteArchangel.java   |   2 +-
 .../mage/sets/prereleaseevents/Revenant.java  |   2 +-
 .../sets/prereleaseevents/Rubblehulk.java     |   2 +-
 .../sets/prereleaseevents/RuinousPath.java    |   2 +-
 .../RyuseiTheFallingStar.java                 |   2 +-
 .../prereleaseevents/SageOfTheInwardEye.java  |   2 +-
 .../sets/prereleaseevents/SanctumOfUgin.java  |   2 +-
 .../prereleaseevents/SandsteppeMastodon.java  |   2 +-
 .../prereleaseevents/ScabClanBerserker.java   |   2 +-
 .../prereleaseevents/ScatterToTheWinds.java   |   2 +-
 .../prereleaseevents/ScourgeOfFleets.java     |   2 +-
 .../prereleaseevents/SerpentineSpike.java     |   2 +-
 .../ShamanOfTheGreatHunt.java                 |   2 +-
 .../prereleaseevents/ShamanicRevelation.java  |   2 +-
 .../sets/prereleaseevents/ShamblingVent.java  |   2 +-
 .../SheoldredWhisperingOne.java               |   2 +-
 .../sets/prereleaseevents/ShieldOfKaldra.java |   2 +-
 .../prereleaseevents/ShipbreakerKraken.java   |   2 +-
 .../ShrineOfTheForsakenGods.java              |   2 +-
 .../ShuYunTheSilentTempest.java               |   2 +-
 .../prereleaseevents/SidisiBroodTyrant.java   |   2 +-
 .../prereleaseevents/SidisiUndeadVizier.java  |   2 +-
 .../sets/prereleaseevents/SiegeDragon.java    |   2 +-
 .../sets/prereleaseevents/SiegeRhino.java     |   2 +-
 .../sets/prereleaseevents/SilentSentinel.java |   2 +-
 .../sets/prereleaseevents/SilentSpecter.java  |   2 +-
 .../prereleaseevents/SilumgarAssassin.java    |   2 +-
 .../SilumgarTheDriftingDeath.java             |   2 +-
 .../prereleaseevents/SilumgarsCommand.java    |   2 +-
 .../prereleaseevents/SireOfStagnation.java    |   2 +-
 .../prereleaseevents/SmolderingMarsh.java     |   2 +-
 .../SmotheringAbomination.java                |   2 +-
 .../sets/prereleaseevents/SoulCollector.java  |   2 +-
 .../sets/prereleaseevents/SoulbladeDjinn.java |   2 +-
 .../prereleaseevents/SoulfireGrandMaster.java |   2 +-
 .../sets/prereleaseevents/Soulflayer.java     |   2 +-
 .../sets/prereleaseevents/SpawnOfThraxes.java |   2 +-
 .../sets/prereleaseevents/StratusDancer.java  |   2 +-
 .../prereleaseevents/SultaiAscendancy.java    |   2 +-
 .../mage/sets/prereleaseevents/SunTitan.java  |   2 +-
 .../sets/prereleaseevents/SunkenHollow.java   |   2 +-
 .../prereleaseevents/SunscorchRegent.java     |   2 +-
 .../sets/prereleaseevents/SupplantForm.java   |   2 +-
 .../prereleaseevents/SurrakDragonclaw.java    |   2 +-
 .../prereleaseevents/SurrakTheHuntCaller.java |   2 +-
 .../sets/prereleaseevents/SwordOfKaldra.java  |   2 +-
 .../prereleaseevents/TalentOfTheTelepath.java |   2 +-
 .../TasigurTheGoldenFang.java                 |   2 +-
 .../prereleaseevents/TemurAscendancy.java     |   2 +-
 .../prereleaseevents/ThopterSpyNetwork.java   |   2 +-
 .../sets/prereleaseevents/ThousandWinds.java  |   2 +-
 .../prereleaseevents/ThunderbreakRegent.java  |   2 +-
 .../prereleaseevents/TorrentElemental.java    |   2 +-
 .../prereleaseevents/TragicArrogance.java     |   2 +-
 .../sets/prereleaseevents/TrailOfMystery.java |   2 +-
 .../sets/prereleaseevents/TrapEssence.java    |   2 +-
 .../sets/prereleaseevents/TreasuryThrull.java |   2 +-
 .../sets/prereleaseevents/UginsInsight.java   |   2 +-
 .../UlamogTheCeaselessHunger.java             |   2 +-
 .../prereleaseevents/UndergrowthChampion.java |   2 +-
 .../mage/sets/prereleaseevents/UtterEnd.java  |   2 +-
 .../prereleaseevents/VampireNocturnus.java    |   2 +-
 .../prereleaseevents/VeteranWarleader.java    |   2 +-
 .../prereleaseevents/VillainousWealth.java    |   2 +-
 .../sets/prereleaseevents/VoidWinnower.java   |   2 +-
 .../sets/prereleaseevents/VolcanicVision.java |   2 +-
 .../sets/prereleaseevents/VrynWingmare.java   |   2 +-
 .../WardenOfTheFirstTree.java                 |   2 +-
 .../prereleaseevents/WastelandStrangler.java  |   2 +-
 .../mage/sets/prereleaseevents/Wildcall.java  |   2 +-
 .../sets/prereleaseevents/Willbreaker.java    |   2 +-
 .../prereleaseevents/WoodlandWanderer.java    |   2 +-
 .../prereleaseevents/WrensRunPackmaster.java  |   2 +-
 .../sets/prereleaseevents/WurmcoilEngine.java |   2 +-
 .../sets/prereleaseevents/XathridGorgon.java  |   2 +-
 .../prereleaseevents/YasovaDragonclaw.java    |   2 +-
 .../prereleaseevents/ZadaHedronGrinder.java   |   2 +-
 .../prereleaseevents/ZurgoBellstriker.java    |   2 +-
 .../prereleaseevents/ZurgoHelmsmasher.java    |   2 +-
 .../src/mage/sets/prophecy/AvatarOfWoe.java   |   2 +-
 .../src/mage/sets/prophecy/DivingGriffin.java |   2 +-
 .../src/mage/sets/prophecy/PanicAttack.java   |   2 +-
 .../sets/prophecy/SpiketailHatchling.java     |   2 +-
 .../mage/sets/ravnica/BirdsOfParadise.java    |   2 +-
 .../src/mage/sets/ravnica/BorosGarrison.java  |   2 +-
 .../mage/sets/ravnica/BorosSwiftblade.java    |   2 +-
 .../sets/ravnica/ChorusOfTheConclave.java     |   2 +-
 .../src/mage/sets/ravnica/CivicWayfinder.java |   2 +-
 .../mage/sets/ravnica/ConclaveEquenaut.java   |   2 +-
 .../mage/sets/ravnica/ConclavePhalanx.java    |   2 +-
 .../src/mage/sets/ravnica/DoublingSeason.java |   2 +-
 .../mage/sets/ravnica/DroolingGroodion.java   |   2 +-
 .../src/mage/sets/ravnica/FaithsFetters.java  |   2 +-
 .../src/mage/sets/ravnica/Flickerform.java    |   2 +-
 .../src/mage/sets/ravnica/FlowOfIdeas.java    |   2 +-
 .../src/mage/sets/ravnica/Gleancrawler.java   |   2 +-
 .../src/mage/sets/ravnica/Helldozer.java      |   2 +-
 .../mage/sets/ravnica/PeelFromReality.java    |   2 +-
 .../src/mage/sets/ravnica/PlagueBoiler.java   |   2 +-
 .../mage/sets/ravnica/PollenbrightWings.java  |   2 +-
 .../sets/ravnica/RaziaBorosArchangel.java     |   2 +-
 .../src/mage/sets/ravnica/Recollect.java      |   2 +-
 .../mage/sets/ravnica/SadisticAugermage.java  |   2 +-
 .../src/mage/sets/ravnica/ScionOfTheWild.java |   2 +-
 Mage.Sets/src/mage/sets/ravnica/Smash.java    |   2 +-
 .../sets/ravnica/SparkmageApprentice.java     |   2 +-
 .../ravnica/SunhomeFortressOfTheLegion.java   |   2 +-
 .../sets/ravnica/SvogthosTheRestlessTomb.java |   2 +-
 .../sets/ravnica/SzadekLordOfSecrets.java     |   2 +-
 .../src/mage/sets/ravnica/TellingTime.java    |   2 +-
 .../src/mage/sets/ravnica/ThreeDreams.java    |   2 +-
 .../mage/sets/ravnica/VulturousZombie.java    |   2 +-
 .../src/mage/sets/ravnica/WarpWorld.java      |   2 +-
 .../src/mage/sets/returntoravnica/Arrest.java |   2 +-
 .../mage/sets/returntoravnica/BloodCrypt.java |   2 +-
 .../src/mage/sets/returntoravnica/Cancel.java |   2 +-
 .../mage/sets/returntoravnica/Cremate.java    |   2 +-
 .../src/mage/sets/returntoravnica/Dispel.java |   2 +-
 .../sets/returntoravnica/GiantGrowth.java     |   2 +-
 .../returntoravnica/HallowedFountain.java     |   2 +-
 .../sets/returntoravnica/HeroesReunion.java   |   2 +-
 .../mage/sets/returntoravnica/MindRot.java    |   2 +-
 .../sets/returntoravnica/OvergrownTomb.java   |   2 +-
 .../sets/returntoravnica/ParalyzingGrasp.java |   2 +-
 .../sets/returntoravnica/PithingNeedle.java   |   2 +-
 .../sets/returntoravnica/SeekTheHorizon.java  |   2 +-
 .../mage/sets/returntoravnica/SteamVents.java |   2 +-
 .../sets/returntoravnica/TempleGarden.java    |   2 +-
 .../returntoravnica/TraitorousInstinct.java   |   2 +-
 .../sets/revisededition/AirElemental.java     |   2 +-
 .../sets/revisededition/AladdinsRing.java     |   2 +-
 .../mage/sets/revisededition/AnimateDead.java |   2 +-
 .../mage/sets/revisededition/AnimateWall.java |   2 +-
 .../sets/revisededition/AnkhOfMishra.java     |   2 +-
 .../mage/sets/revisededition/Armageddon.java  |   2 +-
 .../sets/revisededition/ArmageddonClock.java  |   2 +-
 .../sets/revisededition/AspectOfWolf.java     |   2 +-
 .../src/mage/sets/revisededition/Atog.java    |   2 +-
 .../src/mage/sets/revisededition/BadMoon.java |   2 +-
 .../mage/sets/revisededition/Badlands.java    |   2 +-
 .../src/mage/sets/revisededition/Balance.java |   2 +-
 .../sets/revisededition/BasaltMonolith.java   |   2 +-
 .../src/mage/sets/revisededition/Bayou.java   |   2 +-
 .../sets/revisededition/BirdsOfParadise.java  |   2 +-
 .../mage/sets/revisededition/BlackKnight.java |   2 +-
 .../mage/sets/revisededition/BlackVise.java   |   2 +-
 .../mage/sets/revisededition/Blessing.java    |   2 +-
 .../revisededition/BlueElementalBlast.java    |   2 +-
 .../mage/sets/revisededition/BlueWard.java    |   2 +-
 .../mage/sets/revisededition/BogWraith.java   |   2 +-
 .../sets/revisededition/BottleOfSuleiman.java |   2 +-
 .../mage/sets/revisededition/Braingeyser.java |   2 +-
 .../mage/sets/revisededition/BrassMan.java    |   2 +-
 .../mage/sets/revisededition/Burrowing.java   |   2 +-
 .../src/mage/sets/revisededition/Castle.java  |   2 +-
 .../sets/revisededition/CelestialPrism.java   |   2 +-
 .../mage/sets/revisededition/Chaoslace.java   |   2 +-
 .../CircleOfProtectionBlack.java              |   2 +-
 .../CircleOfProtectionBlue.java               |   2 +-
 .../CircleOfProtectionGreen.java              |   2 +-
 .../revisededition/CircleOfProtectionRed.java |   2 +-
 .../CircleOfProtectionWhite.java              |   2 +-
 .../sets/revisededition/ClockworkBeast.java   |   2 +-
 .../src/mage/sets/revisededition/Clone.java   |   2 +-
 .../mage/sets/revisededition/Cockatrice.java  |   2 +-
 .../mage/sets/revisededition/Conservator.java |   2 +-
 .../sets/revisededition/ControlMagic.java     |   2 +-
 .../mage/sets/revisededition/Conversion.java  |   2 +-
 .../sets/revisededition/CopyArtifact.java     |   2 +-
 .../sets/revisededition/Counterspell.java     |   2 +-
 .../mage/sets/revisededition/CrawWurm.java    |   2 +-
 .../src/mage/sets/revisededition/Crumble.java |   2 +-
 .../src/mage/sets/revisededition/Crusade.java |   2 +-
 .../mage/sets/revisededition/CrystalRod.java  |   2 +-
 .../mage/sets/revisededition/CursedLand.java  |   2 +-
 .../sets/revisededition/DancingScimitar.java  |   2 +-
 .../mage/sets/revisededition/DarkRitual.java  |   2 +-
 .../mage/sets/revisededition/DeathWard.java   |   2 +-
 .../mage/sets/revisededition/Deathgrip.java   |   2 +-
 .../mage/sets/revisededition/Deathlace.java   |   2 +-
 .../sets/revisededition/DemonicHordes.java    |   2 +-
 .../sets/revisededition/DemonicTutor.java     |   2 +-
 .../mage/sets/revisededition/DingusEgg.java   |   2 +-
 .../mage/sets/revisededition/Disenchant.java  |   2 +-
 .../sets/revisededition/Disintegrate.java     |   2 +-
 .../revisededition/DisruptingScepter.java     |   2 +-
 .../sets/revisededition/DragonEngine.java     |   2 +-
 .../mage/sets/revisededition/DragonWhelp.java |   2 +-
 .../mage/sets/revisededition/DrainLife.java   |   2 +-
 .../sets/revisededition/DrudgeSkeletons.java  |   2 +-
 .../sets/revisededition/EarthElemental.java   |   2 +-
 .../mage/sets/revisededition/Earthbind.java   |   2 +-
 .../mage/sets/revisededition/Earthquake.java  |   2 +-
 .../mage/sets/revisededition/EbonyHorse.java  |   2 +-
 .../mage/sets/revisededition/ElHajjaj.java    |   2 +-
 .../sets/revisededition/ElvishArchers.java    |   2 +-
 .../mage/sets/revisededition/EnergyFlux.java  |   2 +-
 .../mage/sets/revisededition/ErgRaiders.java  |   2 +-
 .../sets/revisededition/EvilPresence.java     |   2 +-
 .../mage/sets/revisededition/EyeForAnEye.java |   2 +-
 .../mage/sets/revisededition/Farmstead.java   |   2 +-
 .../mage/sets/revisededition/Fastbond.java    |   2 +-
 .../src/mage/sets/revisededition/Fear.java    |   2 +-
 .../mage/sets/revisededition/Feedback.java    |   2 +-
 .../sets/revisededition/FireElemental.java    |   2 +-
 .../mage/sets/revisededition/Fireball.java    |   2 +-
 .../sets/revisededition/Firebreathing.java    |   2 +-
 .../mage/sets/revisededition/Flashfires.java  |   2 +-
 .../src/mage/sets/revisededition/Flight.java  |   2 +-
 .../sets/revisededition/FlyingCarpet.java     |   2 +-
 .../src/mage/sets/revisededition/Fog.java     |   2 +-
 .../sets/revisededition/ForceOfNature.java    |   2 +-
 .../src/mage/sets/revisededition/Fork.java    |   2 +-
 .../mage/sets/revisededition/FrozenShade.java |   2 +-
 .../mage/sets/revisededition/Fungusaur.java   |   2 +-
 .../mage/sets/revisededition/GiantGrowth.java |   2 +-
 .../mage/sets/revisededition/GiantSpider.java |   2 +-
 .../sets/revisededition/GlassesOfUrza.java    |   2 +-
 .../src/mage/sets/revisededition/Gloom.java   |   2 +-
 .../revisededition/GoblinBalloonBrigade.java  |   2 +-
 .../mage/sets/revisededition/GoblinKing.java  |   2 +-
 .../mage/sets/revisededition/GrayOgre.java    |   2 +-
 .../mage/sets/revisededition/GreenWard.java   |   2 +-
 .../sets/revisededition/GrizzlyBears.java     |   2 +-
 .../sets/revisededition/HealingSalve.java     |   2 +-
 .../mage/sets/revisededition/HillGiant.java   |   2 +-
 .../mage/sets/revisededition/HolyArmor.java   |   2 +-
 .../sets/revisededition/HolyStrength.java     |   2 +-
 .../sets/revisededition/HowlFromBeyond.java   |   2 +-
 .../mage/sets/revisededition/HowlingMine.java |   2 +-
 .../sets/revisededition/HurkylsRecall.java    |   2 +-
 .../sets/revisededition/HurloonMinotaur.java  |   2 +-
 .../mage/sets/revisededition/Hurricane.java   |   2 +-
 .../sets/revisededition/HypnoticSpecter.java  |   2 +-
 .../sets/revisededition/InstillEnergy.java    |   2 +-
 .../mage/sets/revisededition/IronStar.java    |   2 +-
 .../sets/revisededition/IronrootTreefolk.java |   2 +-
 .../revisededition/IslandFishJasconius.java   |   2 +-
 .../sets/revisededition/IslandSanctuary.java  |   2 +-
 .../mage/sets/revisededition/IvoryCup.java    |   2 +-
 .../mage/sets/revisededition/IvoryTower.java  |   2 +-
 .../sets/revisededition/JadeMonolith.java     |   2 +-
 .../revisededition/JandorsSaddlebags.java     |   2 +-
 .../sets/revisededition/JayemdaeTome.java     |   2 +-
 .../mage/sets/revisededition/Juggernaut.java  |   2 +-
 .../src/mage/sets/revisededition/Jump.java    |   2 +-
 .../src/mage/sets/revisededition/Karma.java   |   2 +-
 .../sets/revisededition/KeldonWarlord.java    |   2 +-
 .../src/mage/sets/revisededition/KirdApe.java |   2 +-
 .../mage/sets/revisededition/KormusBell.java  |   2 +-
 .../src/mage/sets/revisededition/Lance.java   |   2 +-
 .../mage/sets/revisededition/LeyDruid.java    |   2 +-
 .../sets/revisededition/LibraryOfLeng.java    |   2 +-
 .../mage/sets/revisededition/Lifeforce.java   |   2 +-
 .../mage/sets/revisededition/Lifelace.java    |   2 +-
 .../src/mage/sets/revisededition/Lifetap.java |   2 +-
 .../sets/revisededition/LightningBolt.java    |   2 +-
 .../sets/revisededition/LivingArtifact.java   |   2 +-
 .../mage/sets/revisededition/LivingLands.java |   2 +-
 .../mage/sets/revisededition/LivingWall.java  |   2 +-
 .../sets/revisededition/LlanowarElves.java    |   2 +-
 .../sets/revisededition/LordOfAtlantis.java   |   2 +-
 .../sets/revisededition/LordOfThePit.java     |   2 +-
 .../src/mage/sets/revisededition/Lure.java    |   2 +-
 .../sets/revisededition/MagneticMountain.java |   2 +-
 .../sets/revisededition/MahamotiDjinn.java    |   2 +-
 .../mage/sets/revisededition/ManaFlare.java   |   2 +-
 .../mage/sets/revisededition/ManaShort.java   |   2 +-
 .../mage/sets/revisededition/ManaVault.java   |   2 +-
 .../mage/sets/revisededition/Manabarbs.java   |   2 +-
 .../mage/sets/revisededition/Meekstone.java   |   2 +-
 .../MerfolkOfThePearlTrident.java             |   2 +-
 .../mage/sets/revisededition/MijaeDjinn.java  |   2 +-
 .../mage/sets/revisededition/Millstone.java   |   2 +-
 .../mage/sets/revisededition/MindTwist.java   |   2 +-
 .../revisededition/MonssGoblinRaiders.java    |   2 +-
 .../sets/revisededition/NetherShadow.java     |   2 +-
 .../sets/revisededition/NevinyrralsDisk.java  |   2 +-
 .../mage/sets/revisededition/Nightmare.java   |   2 +-
 .../sets/revisededition/NorthernPaladin.java  |   2 +-
 .../sets/revisededition/ObsianusGolem.java    |   2 +-
 .../src/mage/sets/revisededition/Onulet.java  |   2 +-
 .../sets/revisededition/OrcishArtillery.java  |   2 +-
 .../sets/revisededition/OrcishOriflamme.java  |   2 +-
 .../mage/sets/revisededition/Ornithopter.java |   2 +-
 .../mage/sets/revisededition/Paralyze.java    |   2 +-
 .../sets/revisededition/PearledUnicorn.java   |   2 +-
 .../mage/sets/revisededition/Pestilence.java  |   2 +-
 .../sets/revisededition/PhantasmalForces.java |   2 +-
 .../revisededition/PhantasmalTerrain.java     |   2 +-
 .../sets/revisededition/PhantomMonster.java   |   2 +-
 .../mage/sets/revisededition/PirateShip.java  |   2 +-
 .../mage/sets/revisededition/PlagueRats.java  |   2 +-
 .../src/mage/sets/revisededition/Plateau.java |   2 +-
 .../mage/sets/revisededition/PowerSink.java   |   2 +-
 .../mage/sets/revisededition/PrimalClay.java  |   2 +-
 .../sets/revisededition/ProdigalSorcerer.java |   2 +-
 .../sets/revisededition/PsychicVenom.java     |   2 +-
 .../mage/sets/revisededition/Purelace.java    |   2 +-
 .../mage/sets/revisededition/RaiseDead.java   |   2 +-
 .../sets/revisededition/Reconstruction.java   |   2 +-
 .../revisededition/RedElementalBlast.java     |   2 +-
 .../sets/revisededition/Regeneration.java     |   2 +-
 .../mage/sets/revisededition/Regrowth.java    |   2 +-
 .../sets/revisededition/Resurrection.java     |   2 +-
 .../sets/revisededition/ReverseDamage.java    |   2 +-
 .../sets/revisededition/Righteousness.java    |   2 +-
 .../sets/revisededition/RocOfKherRidges.java  |   2 +-
 .../mage/sets/revisededition/RodOfRuin.java   |   2 +-
 .../sets/revisededition/RoyalAssassin.java    |   2 +-
 .../mage/sets/revisededition/Sacrifice.java   |   2 +-
 .../sets/revisededition/SamiteHealer.java     |   2 +-
 .../mage/sets/revisededition/Savannah.java    |   2 +-
 .../sets/revisededition/SavannahLions.java    |   2 +-
 .../sets/revisededition/ScatheZombies.java    |   2 +-
 .../sets/revisededition/ScavengingGhoul.java  |   2 +-
 .../mage/sets/revisededition/Scrubland.java   |   2 +-
 .../sets/revisededition/ScrybSprites.java     |   2 +-
 .../mage/sets/revisededition/SeaSerpent.java  |   2 +-
 .../mage/sets/revisededition/SedgeTroll.java  |   2 +-
 .../sets/revisededition/SengirVampire.java    |   2 +-
 .../sets/revisededition/SerendibEfreet.java   |   2 +-
 .../mage/sets/revisededition/SerraAngel.java  |   2 +-
 .../sets/revisededition/ShanodinDryads.java   |   2 +-
 .../src/mage/sets/revisededition/Shatter.java |   2 +-
 .../sets/revisededition/Shatterstorm.java     |   2 +-
 .../sets/revisededition/ShivanDragon.java     |   2 +-
 .../mage/sets/revisededition/SirensCall.java  |   2 +-
 .../src/mage/sets/revisededition/Smoke.java   |   2 +-
 .../src/mage/sets/revisededition/SoulNet.java |   2 +-
 .../mage/sets/revisededition/SpellBlast.java  |   2 +-
 .../src/mage/sets/revisededition/Stasis.java  |   2 +-
 .../sets/revisededition/StealArtifact.java    |   2 +-
 .../mage/sets/revisededition/StoneGiant.java  |   2 +-
 .../mage/sets/revisededition/StoneRain.java   |   2 +-
 .../sets/revisededition/StreamOfLife.java     |   2 +-
 .../sets/revisededition/SunglassesOfUrza.java |   2 +-
 .../revisededition/SwordsToPlowshares.java    |   2 +-
 .../src/mage/sets/revisededition/Taiga.java   |   2 +-
 .../src/mage/sets/revisededition/Terror.java  |   2 +-
 .../src/mage/sets/revisededition/TheHive.java |   2 +-
 .../src/mage/sets/revisededition/TheRack.java |   2 +-
 .../sets/revisededition/ThicketBasilisk.java  |   2 +-
 .../mage/sets/revisededition/Thoughtlace.java |   2 +-
 .../sets/revisededition/ThroneOfBone.java     |   2 +-
 .../sets/revisededition/TitaniasSong.java     |   2 +-
 .../mage/sets/revisededition/Tranquility.java |   2 +-
 .../sets/revisededition/TropicalIsland.java   |   2 +-
 .../src/mage/sets/revisededition/Tsunami.java |   2 +-
 .../src/mage/sets/revisededition/Tundra.java  |   2 +-
 .../sets/revisededition/UndergroundSea.java   |   2 +-
 .../sets/revisededition/UnholyStrength.java   |   2 +-
 .../sets/revisededition/UnstableMutation.java |   2 +-
 .../mage/sets/revisededition/Unsummon.java    |   2 +-
 .../mage/sets/revisededition/UthdenTroll.java |   2 +-
 .../revisededition/VerduranEnchantress.java   |   2 +-
 .../revisededition/VesuvanDoppelganger.java   |   2 +-
 .../sets/revisededition/VolcanicEruption.java |   2 +-
 .../sets/revisededition/VolcanicIsland.java   |   2 +-
 .../mage/sets/revisededition/WallOfAir.java   |   2 +-
 .../mage/sets/revisededition/WallOfBone.java  |   2 +-
 .../sets/revisededition/WallOfBrambles.java   |   2 +-
 .../mage/sets/revisededition/WallOfFire.java  |   2 +-
 .../mage/sets/revisededition/WallOfIce.java   |   2 +-
 .../mage/sets/revisededition/WallOfStone.java |   2 +-
 .../sets/revisededition/WallOfSwords.java     |   2 +-
 .../mage/sets/revisededition/WallOfWater.java |   2 +-
 .../mage/sets/revisededition/WallOfWood.java  |   2 +-
 .../mage/sets/revisededition/Wanderlust.java  |   2 +-
 .../mage/sets/revisededition/WarMammoth.java  |   2 +-
 .../sets/revisededition/WarpArtifact.java     |   2 +-
 .../sets/revisededition/WaterElemental.java   |   2 +-
 .../mage/sets/revisededition/Weakness.java    |   2 +-
 .../src/mage/sets/revisededition/Web.java     |   2 +-
 .../sets/revisededition/WheelOfFortune.java   |   2 +-
 .../mage/sets/revisededition/WhiteKnight.java |   2 +-
 .../mage/sets/revisededition/WhiteWard.java   |   2 +-
 .../mage/sets/revisededition/WildGrowth.java  |   2 +-
 .../sets/revisededition/WillOTheWisp.java     |   2 +-
 .../mage/sets/revisededition/WinterOrb.java   |   2 +-
 .../sets/revisededition/WoodenSphere.java     |   2 +-
 .../mage/sets/revisededition/WrathOfGod.java  |   2 +-
 .../sets/revisededition/ZombieMaster.java     |   2 +-
 .../mage/sets/riseoftheeldrazi/Demystify.java |   2 +-
 .../sets/riseoftheeldrazi/Naturalize.java     |   2 +-
 .../mage/sets/riseoftheeldrazi/Regress.java   |   2 +-
 .../mage/sets/saviorsofkamigawa/Twincast.java |   2 +-
 .../src/mage/sets/scarsofmirrodin/Arrest.java |   2 +-
 .../mage/sets/scarsofmirrodin/CopperMyr.java  |   2 +-
 .../mage/sets/scarsofmirrodin/GoldMyr.java    |   2 +-
 .../mage/sets/scarsofmirrodin/IronMyr.java    |   2 +-
 .../mage/sets/scarsofmirrodin/LeadenMyr.java  |   2 +-
 .../mage/sets/scarsofmirrodin/Shatter.java    |   2 +-
 .../mage/sets/scarsofmirrodin/SilverMyr.java  |   2 +-
 .../mage/sets/scourge/AmbushCommander.java    |   2 +-
 .../mage/sets/scourge/BladewingTheRisen.java  |   2 +-
 .../src/mage/sets/scourge/CallToTheGrave.java |   2 +-
 .../mage/sets/scourge/ClawsOfWirewood.java    |   2 +-
 .../mage/sets/scourge/DecreeOfJustice.java    |   2 +-
 .../src/mage/sets/scourge/DecreeOfPain.java   |   2 +-
 .../src/mage/sets/scourge/DragonBreath.java   |   2 +-
 .../src/mage/sets/scourge/Dragonstorm.java    |   2 +-
 Mage.Sets/src/mage/sets/scourge/Enrage.java   |   2 +-
 .../src/mage/sets/scourge/FierceEmpath.java   |   2 +-
 .../src/mage/sets/scourge/FrozenSolid.java    |   2 +-
 .../src/mage/sets/scourge/GildedLight.java    |   2 +-
 .../src/mage/sets/scourge/GoblinBrigand.java  |   2 +-
 .../src/mage/sets/scourge/MindsDesire.java    |   2 +-
 Mage.Sets/src/mage/sets/scourge/Nefashu.java  |   2 +-
 .../src/mage/sets/scourge/RainOfBlades.java   |   2 +-
 .../mage/sets/scourge/RiptideSurvivor.java    |   2 +-
 .../mage/sets/scourge/RushOfKnowledge.java    |   2 +-
 .../mage/sets/scourge/SiegeGangCommander.java |   2 +-
 .../src/mage/sets/scourge/SilverKnight.java   |   2 +-
 .../src/mage/sets/scourge/SoulCollector.java  |   2 +-
 .../src/mage/sets/scourge/SparkSpray.java     |   2 +-
 .../sets/scourge/TempleOfTheFalseGod.java     |   2 +-
 .../mage/sets/scourge/TwistedAbomination.java |   2 +-
 .../src/mage/sets/scourge/UndeadWarchief.java |   2 +-
 .../src/mage/sets/scourge/Upwelling.java      |   2 +-
 .../mage/sets/scourge/ZealousInquisitor.java  |   2 +-
 .../sets/seventhedition/AbyssalHorror.java    |   2 +-
 .../sets/seventhedition/AbyssalSpecter.java   |   2 +-
 .../sets/seventhedition/AdarkarWastes.java    |   2 +-
 .../sets/seventhedition/AirElemental.java     |   2 +-
 .../mage/sets/seventhedition/Anaconda.java    |   2 +-
 .../seventhedition/AncientSilverback.java     |   2 +-
 .../mage/sets/seventhedition/AngelicPage.java |   2 +-
 .../sets/seventhedition/ArcaneLaboratory.java |   2 +-
 .../mage/sets/seventhedition/Archivist.java   |   2 +-
 .../sets/seventhedition/ArdentMilitia.java    |   2 +-
 .../seventhedition/BalduvianBarbarians.java   |   2 +-
 .../sets/seventhedition/BalefulStare.java     |   2 +-
 .../sets/seventhedition/BeastOfBurden.java    |   2 +-
 .../src/mage/sets/seventhedition/Bedlam.java  |   2 +-
 .../src/mage/sets/seventhedition/Befoul.java  |   2 +-
 .../sets/seventhedition/BellowingFiend.java   |   2 +-
 .../sets/seventhedition/BenthicBehemoth.java  |   2 +-
 .../mage/sets/seventhedition/Bereavement.java |   2 +-
 .../sets/seventhedition/BirdsOfParadise.java  |   2 +-
 .../sets/seventhedition/BlanchwoodArmor.java  |   2 +-
 .../src/mage/sets/seventhedition/Blaze.java   |   2 +-
 .../sets/seventhedition/BlessedReversal.java  |   2 +-
 .../mage/sets/seventhedition/BloodPet.java    |   2 +-
 .../sets/seventhedition/BloodshotCyclops.java |   2 +-
 .../src/mage/sets/seventhedition/BogImp.java  |   2 +-
 .../mage/sets/seventhedition/BogWraith.java   |   2 +-
 .../src/mage/sets/seventhedition/Boil.java    |   2 +-
 .../mage/sets/seventhedition/Boomerang.java   |   2 +-
 .../sets/seventhedition/BreathOfLife.java     |   2 +-
 .../mage/sets/seventhedition/Brushland.java   |   2 +-
 .../mage/sets/seventhedition/BullHippo.java   |   2 +-
 .../mage/sets/seventhedition/Caltrops.java    |   2 +-
 .../sets/seventhedition/CanopySpider.java     |   2 +-
 .../src/mage/sets/seventhedition/Castle.java  |   2 +-
 .../CircleOfProtectionBlack.java              |   2 +-
 .../CircleOfProtectionBlue.java               |   2 +-
 .../CircleOfProtectionGreen.java              |   2 +-
 .../seventhedition/CircleOfProtectionRed.java |   2 +-
 .../CircleOfProtectionWhite.java              |   2 +-
 .../sets/seventhedition/CloudchaserEagle.java |   2 +-
 .../mage/sets/seventhedition/CoatOfArms.java  |   2 +-
 .../mage/sets/seventhedition/Confiscate.java  |   2 +-
 .../sets/seventhedition/CoralMerfolk.java     |   2 +-
 .../src/mage/sets/seventhedition/Corrupt.java |   2 +-
 .../sets/seventhedition/Counterspell.java     |   2 +-
 .../sets/seventhedition/CreepingMold.java     |   2 +-
 .../sets/seventhedition/CrossbowInfantry.java |   2 +-
 .../mage/sets/seventhedition/CryptRats.java   |   2 +-
 .../mage/sets/seventhedition/CrystalRod.java  |   2 +-
 .../sets/seventhedition/DakmorLancer.java     |   2 +-
 .../sets/seventhedition/DaringApprentice.java |   2 +-
 .../sets/seventhedition/DarkBanishing.java    |   2 +-
 .../mage/sets/seventhedition/Deflection.java  |   2 +-
 .../seventhedition/DelusionsOfMediocrity.java |   2 +-
 .../mage/sets/seventhedition/DingusEgg.java   |   2 +-
 .../mage/sets/seventhedition/Disenchant.java  |   2 +-
 .../sets/seventhedition/DregsOfSorrow.java    |   2 +-
 .../sets/seventhedition/DrudgeSkeletons.java  |   2 +-
 .../src/mage/sets/seventhedition/Duress.java  |   2 +-
 .../sets/seventhedition/EarlyHarvest.java     |   2 +-
 .../mage/sets/seventhedition/Earthquake.java  |   2 +-
 .../sets/seventhedition/EasternPaladin.java   |   2 +-
 .../mage/sets/seventhedition/ElderDruid.java  |   2 +-
 .../sets/seventhedition/EliteArchers.java     |   2 +-
 .../sets/seventhedition/ElvishArchers.java    |   2 +-
 .../sets/seventhedition/ElvishChampion.java   |   2 +-
 .../sets/seventhedition/ElvishLyrist.java     |   2 +-
 .../mage/sets/seventhedition/ElvishPiper.java |   2 +-
 .../sets/seventhedition/EngineeredPlague.java |   2 +-
 .../sets/seventhedition/EnsnaringBridge.java  |   2 +-
 .../mage/sets/seventhedition/Equilibrium.java |   2 +-
 .../mage/sets/seventhedition/Evacuation.java  |   2 +-
 .../src/mage/sets/seventhedition/Fear.java    |   2 +-
 .../sets/seventhedition/FemerefArchers.java   |   2 +-
 .../mage/sets/seventhedition/FerozsBan.java   |   2 +-
 .../src/mage/sets/seventhedition/Fervor.java  |   2 +-
 .../sets/seventhedition/FightingDrake.java    |   2 +-
 .../sets/seventhedition/FireElemental.java    |   2 +-
 .../sets/seventhedition/FleetingImage.java    |   2 +-
 .../src/mage/sets/seventhedition/Flight.java  |   2 +-
 .../src/mage/sets/seventhedition/Fog.java     |   2 +-
 .../src/mage/sets/seventhedition/FoulImp.java |   2 +-
 .../sets/seventhedition/FyndhornElder.java    |   2 +-
 .../mage/sets/seventhedition/GangOfElk.java   |   2 +-
 .../sets/seventhedition/GerrardsWisdom.java   |   2 +-
 .../sets/seventhedition/GiantCockroach.java   |   2 +-
 .../mage/sets/seventhedition/GiantGrowth.java |   2 +-
 .../mage/sets/seventhedition/GiantSpider.java |   2 +-
 .../mage/sets/seventhedition/GlacialWall.java |   2 +-
 .../sets/seventhedition/GloriousAnthem.java   |   2 +-
 .../sets/seventhedition/GoblinChariot.java    |   2 +-
 .../seventhedition/GoblinDiggingTeam.java     |   2 +-
 .../seventhedition/GoblinEliteInfantry.java   |   2 +-
 .../sets/seventhedition/GoblinGardener.java   |   2 +-
 .../mage/sets/seventhedition/GoblinKing.java  |   2 +-
 .../sets/seventhedition/GoblinMatron.java     |   2 +-
 .../sets/seventhedition/GoblinRaider.java     |   2 +-
 .../sets/seventhedition/GoblinSpelunkers.java |   2 +-
 .../sets/seventhedition/GoblinWarDrums.java   |   2 +-
 .../sets/seventhedition/GraftedSkullcap.java  |   2 +-
 .../mage/sets/seventhedition/GraniteGrip.java |   2 +-
 .../mage/sets/seventhedition/Gravedigger.java |   2 +-
 .../src/mage/sets/seventhedition/Greed.java   |   2 +-
 .../sets/seventhedition/GrizzlyBears.java     |   2 +-
 .../mage/sets/seventhedition/Hibernation.java |   2 +-
 .../mage/sets/seventhedition/HillGiant.java   |   2 +-
 .../mage/sets/seventhedition/HollowDogs.java  |   2 +-
 .../sets/seventhedition/HolyStrength.java     |   2 +-
 .../mage/sets/seventhedition/HonorGuard.java  |   2 +-
 .../sets/seventhedition/HornedTurtle.java     |   2 +-
 .../sets/seventhedition/HowlFromBeyond.java   |   2 +-
 .../mage/sets/seventhedition/HowlingMine.java |   2 +-
 .../mage/sets/seventhedition/Hurricane.java   |   2 +-
 .../src/mage/sets/seventhedition/Inferno.java |   2 +-
 .../mage/sets/seventhedition/Inspiration.java |   2 +-
 .../sets/seventhedition/IntrepidHero.java     |   2 +-
 .../mage/sets/seventhedition/IronStar.java    |   2 +-
 .../mage/sets/seventhedition/IvoryCup.java    |   2 +-
 .../sets/seventhedition/JayemdaeTome.java     |   2 +-
 .../sets/seventhedition/KarplusanForest.java  |   2 +-
 .../seventhedition/KjeldoranRoyalGuard.java   |   2 +-
 .../mage/sets/seventhedition/Knighthood.java  |   2 +-
 .../src/mage/sets/seventhedition/LavaAxe.java |   2 +-
 .../sets/seventhedition/LeshracsRite.java     |   2 +-
 .../mage/sets/seventhedition/Levitation.java  |   2 +-
 .../sets/seventhedition/LightningBlast.java   |   2 +-
 .../seventhedition/LightningElemental.java    |   2 +-
 .../sets/seventhedition/LlanowarElves.java    |   2 +-
 .../mage/sets/seventhedition/LoneWolf.java    |   2 +-
 .../sets/seventhedition/LoomingShade.java     |   2 +-
 .../sets/seventhedition/LordOfAtlantis.java   |   2 +-
 .../src/mage/sets/seventhedition/Lure.java    |   2 +-
 .../sets/seventhedition/MahamotiDjinn.java    |   2 +-
 .../mage/sets/seventhedition/ManaBreach.java  |   2 +-
 .../mage/sets/seventhedition/ManaClash.java   |   2 +-
 .../mage/sets/seventhedition/ManaShort.java   |   2 +-
 .../src/mage/sets/seventhedition/Maro.java    |   2 +-
 .../sets/seventhedition/MasterHealer.java     |   2 +-
 .../src/mage/sets/seventhedition/Mawcor.java  |   2 +-
 .../mage/sets/seventhedition/Meekstone.java   |   2 +-
 .../src/mage/sets/seventhedition/Megrim.java  |   2 +-
 .../sets/seventhedition/MerfolkLooter.java    |   2 +-
 .../MerfolkOfThePearlTrident.java             |   2 +-
 .../mage/sets/seventhedition/MightOfOaks.java |   2 +-
 .../mage/sets/seventhedition/Millstone.java   |   2 +-
 .../src/mage/sets/seventhedition/MindRot.java |   2 +-
 .../mage/sets/seventhedition/Necrologia.java  |   2 +-
 .../mage/sets/seventhedition/Nightmare.java   |   2 +-
 .../sets/seventhedition/NocturnalRaid.java    |   2 +-
 .../sets/seventhedition/NorthernPaladin.java  |   2 +-
 .../sets/seventhedition/OgreTaskmaster.java   |   2 +-
 .../src/mage/sets/seventhedition/Okk.java     |   2 +-
 .../mage/sets/seventhedition/Opportunity.java |   2 +-
 .../mage/sets/seventhedition/Oppression.java  |   2 +-
 .../sets/seventhedition/OrcishOriflamme.java  |   2 +-
 .../mage/sets/seventhedition/Ostracize.java   |   2 +-
 .../mage/sets/seventhedition/Pacifism.java    |   2 +-
 .../src/mage/sets/seventhedition/Pariah.java  |   2 +-
 .../mage/sets/seventhedition/Persecute.java   |   2 +-
 .../sets/seventhedition/PhantomWarrior.java   |   2 +-
 .../seventhedition/PhyrexianColossus.java     |   2 +-
 .../sets/seventhedition/PhyrexianHulk.java    |   2 +-
 .../src/mage/sets/seventhedition/PitTrap.java |   2 +-
 .../sets/seventhedition/PlagueBeetle.java     |   2 +-
 .../sets/seventhedition/PrideOfLions.java     |   2 +-
 .../sets/seventhedition/ProdigalSorcerer.java |   2 +-
 .../src/mage/sets/seventhedition/Purify.java  |   2 +-
 .../sets/seventhedition/PygmyPyrosaur.java    |   2 +-
 .../mage/sets/seventhedition/Pyroclasm.java   |   2 +-
 .../src/mage/sets/seventhedition/RagMan.java  |   2 +-
 .../sets/seventhedition/RagingGoblin.java     |   2 +-
 .../sets/seventhedition/RampantGrowth.java    |   2 +-
 .../sets/seventhedition/RazorfootGriffin.java |   2 +-
 .../sets/seventhedition/RazortoothRats.java   |   2 +-
 .../src/mage/sets/seventhedition/Reclaim.java |   2 +-
 .../sets/seventhedition/RedwoodTreefolk.java  |   2 +-
 .../mage/sets/seventhedition/Reflexes.java    |   2 +-
 .../sets/seventhedition/Regeneration.java     |   2 +-
 .../mage/sets/seventhedition/RemoveSoul.java  |   2 +-
 .../mage/sets/seventhedition/Revenant.java    |   2 +-
 .../sets/seventhedition/ReverseDamage.java    |   2 +-
 .../mage/sets/seventhedition/RodOfRuin.java   |   2 +-
 .../sets/seventhedition/RollingStones.java    |   2 +-
 .../sets/seventhedition/SabretoothTiger.java  |   2 +-
 .../sets/seventhedition/SacredGround.java     |   2 +-
 .../sets/seventhedition/SacredNectar.java     |   2 +-
 .../src/mage/sets/seventhedition/SageOwl.java |   2 +-
 .../sets/seventhedition/SamiteHealer.java     |   2 +-
 .../sets/seventhedition/ScatheZombies.java    |   2 +-
 .../sets/seventhedition/ScavengerFolk.java    |   2 +-
 .../mage/sets/seventhedition/SeaMonster.java  |   2 +-
 .../sets/seventhedition/SeasonedMarshal.java  |   2 +-
 .../sets/seventhedition/SeekerOfSkybreak.java |   2 +-
 .../sets/seventhedition/SerpentWarrior.java   |   2 +-
 .../sets/seventhedition/SerraAdvocate.java    |   2 +-
 .../mage/sets/seventhedition/SerraAngel.java  |   2 +-
 .../sets/seventhedition/SerrasEmbrace.java    |   2 +-
 .../sets/seventhedition/ShanodinDryads.java   |   2 +-
 .../src/mage/sets/seventhedition/Shatter.java |   2 +-
 .../mage/sets/seventhedition/ShieldWall.java  |   2 +-
 .../sets/seventhedition/ShivanDragon.java     |   2 +-
 .../src/mage/sets/seventhedition/Shock.java   |   2 +-
 .../sets/seventhedition/SkyshroudFalcon.java  |   2 +-
 .../sets/seventhedition/SleightOfHand.java    |   2 +-
 .../mage/sets/seventhedition/SoulFeast.java   |   2 +-
 .../src/mage/sets/seventhedition/SoulNet.java |   2 +-
 .../mage/sets/seventhedition/Spellbook.java   |   2 +-
 .../mage/sets/seventhedition/SpinedWurm.java  |   2 +-
 .../sets/seventhedition/SpinelessThug.java    |   2 +-
 .../sets/seventhedition/SpittingEarth.java    |   2 +-
 .../src/mage/sets/seventhedition/Squall.java  |   2 +-
 .../sets/seventhedition/StandingTroops.java   |   2 +-
 .../mage/sets/seventhedition/StaticOrb.java   |   2 +-
 .../sets/seventhedition/StaunchDefenders.java |   2 +-
 .../mage/sets/seventhedition/StoneRain.java   |   2 +-
 .../mage/sets/seventhedition/StormCrow.java   |   2 +-
 .../mage/sets/seventhedition/StormShaman.java |   2 +-
 .../seventhedition/StrongholdAssassin.java    |   2 +-
 .../sets/seventhedition/SulfurousSprings.java |   2 +-
 .../seventhedition/SustainerOfTheRealm.java   |   2 +-
 .../sets/seventhedition/TaintedAEther.java    |   2 +-
 .../sets/seventhedition/TeferisPuzzleBox.java |   2 +-
 .../sets/seventhedition/TelepathicSpies.java  |   2 +-
 .../mage/sets/seventhedition/Telepathy.java   |   2 +-
 .../sets/seventhedition/TemporalAdept.java    |   2 +-
 .../sets/seventhedition/ThievingMagpie.java   |   2 +-
 .../sets/seventhedition/ThornElemental.java   |   2 +-
 .../sets/seventhedition/ThroneOfBone.java     |   2 +-
 .../sets/seventhedition/TolarianWinds.java    |   2 +-
 .../sets/seventhedition/TrainedArmodon.java   |   2 +-
 .../mage/sets/seventhedition/Tranquility.java |   2 +-
 .../sets/seventhedition/TreasureTrove.java    |   2 +-
 .../seventhedition/TreefolkSeedlings.java     |   2 +-
 .../src/mage/sets/seventhedition/Twiddle.java |   2 +-
 .../sets/seventhedition/UndergroundRiver.java |   2 +-
 .../sets/seventhedition/UnholyStrength.java   |   2 +-
 .../mage/sets/seventhedition/Unsummon.java    |   2 +-
 .../sets/seventhedition/VenerableMonk.java    |   2 +-
 .../mage/sets/seventhedition/VernalBloom.java |   2 +-
 .../sets/seventhedition/VigilantDrake.java    |   2 +-
 .../sets/seventhedition/VolcanicHammer.java   |   2 +-
 .../mage/sets/seventhedition/WallOfAir.java   |   2 +-
 .../mage/sets/seventhedition/WallOfBone.java  |   2 +-
 .../mage/sets/seventhedition/WallOfFire.java  |   2 +-
 .../sets/seventhedition/WallOfSpears.java     |   2 +-
 .../sets/seventhedition/WallOfSwords.java     |   2 +-
 .../sets/seventhedition/WesternPaladin.java   |   2 +-
 .../mage/sets/seventhedition/WildGrowth.java  |   2 +-
 .../mage/sets/seventhedition/Wildfire.java    |   2 +-
 .../mage/sets/seventhedition/WindDancer.java  |   2 +-
 .../mage/sets/seventhedition/WindDrake.java   |   2 +-
 .../mage/sets/seventhedition/WingSnare.java   |   2 +-
 .../mage/sets/seventhedition/WoodElves.java   |   2 +-
 .../sets/seventhedition/WoodenSphere.java     |   2 +-
 .../src/mage/sets/seventhedition/Worship.java |   2 +-
 .../mage/sets/seventhedition/WrathOfGod.java  |   2 +-
 .../seventhedition/YavimayaEnchantress.java   |   2 +-
 .../sets/seventhedition/YawgmothsEdict.java   |   2 +-
 .../sets/shadowmoor/ArmoredAscension.java     |   2 +-
 .../src/mage/sets/shadowmoor/Corrupt.java     |   2 +-
 .../mage/sets/shadowmoor/DeusOfCalamity.java  |   2 +-
 .../src/mage/sets/shadowmoor/Gloomwidow.java  |   2 +-
 .../mage/sets/shadowmoor/GoldenglowMoth.java  |   2 +-
 .../sets/shadowmoor/HowlOfTheNightPack.java   |   2 +-
 .../mage/sets/shadowmoor/InkfathomWitch.java  |   2 +-
 .../src/mage/sets/shadowmoor/PowerOfFire.java |   2 +-
 .../mage/sets/shadowmoor/PresenceOfGond.java  |   2 +-
 .../mage/sets/shadowmoor/ReflectingPool.java  |   2 +-
 .../src/mage/sets/shadowmoor/Spawnwrithe.java |   2 +-
 .../mage/sets/shadowmoor/TorrentOfSouls.java  |   2 +-
 .../src/mage/sets/shadowmoor/Torture.java     |   2 +-
 .../src/mage/sets/shadowmoor/TripNoose.java   |   2 +-
 .../sets/shadowsoverinnistrad/Catalog.java    |   2 +-
 .../sets/shadowsoverinnistrad/DeadWeight.java |   2 +-
 .../shadowsoverinnistrad/EerieInterlude.java  |   2 +-
 .../shadowsoverinnistrad/FieryTemper.java     |   2 +-
 .../sets/shadowsoverinnistrad/Gloomwidow.java |   2 +-
 .../shadowsoverinnistrad/Groundskeeper.java   |   2 +-
 .../shadowsoverinnistrad/LightningAxe.java    |   2 +-
 .../shadowsoverinnistrad/MacabreWaltz.java    |   2 +-
 .../sets/shadowsoverinnistrad/MadProphet.java |   2 +-
 .../shadowsoverinnistrad/MagmaticChasm.java   |   2 +-
 .../shadowsoverinnistrad/MindwrackDemon.java  |   2 +-
 .../shadowsoverinnistrad/PuncturingLight.java |   2 +-
 .../shadowsoverinnistrad/RecklessScholar.java |   2 +-
 .../sets/shadowsoverinnistrad/Throttle.java   |   2 +-
 .../shadowsoverinnistrad/ToothCollector.java  |   2 +-
 .../shadowsoverinnistrad/TormentingVoice.java |   2 +-
 .../sets/shadowsoverinnistrad/UnrulyMob.java  |   2 +-
 .../src/mage/sets/shardsofalara/Cancel.java   |   2 +-
 .../mage/sets/shardsofalara/Naturalize.java   |   2 +-
 .../mage/sets/sorinvstibalt/AbsorbVis.java    |   2 +-
 .../mage/sets/sorinvstibalt/AkoumRefuge.java  |   2 +-
 .../sets/sorinvstibalt/AncientCraving.java    |   2 +-
 .../sets/sorinvstibalt/AshmouthHound.java     |   2 +-
 .../mage/sets/sorinvstibalt/BlazingSalvo.java |   2 +-
 .../mage/sets/sorinvstibalt/Blightning.java   |   2 +-
 .../sets/sorinvstibalt/BloodrageVampire.java  |   2 +-
 .../sets/sorinvstibalt/BreakingPoint.java     |   2 +-
 .../src/mage/sets/sorinvstibalt/Browbeat.java |   2 +-
 .../sets/sorinvstibalt/BumpInTheNight.java    |   2 +-
 .../sets/sorinvstibalt/ButcherOfMalakir.java  |   2 +-
 .../mage/sets/sorinvstibalt/ChildOfNight.java |   2 +-
 .../sets/sorinvstibalt/CorpseConnoisseur.java |   2 +-
 .../mage/sets/sorinvstibalt/DeathGrasp.java   |   2 +-
 .../mage/sets/sorinvstibalt/Decompose.java    |   2 +-
 .../mage/sets/sorinvstibalt/DevilsPlay.java   |   2 +-
 .../sets/sorinvstibalt/DoomedTraveler.java    |   2 +-
 .../sets/sorinvstibalt/DuskhunterBat.java     |   2 +-
 .../sets/sorinvstibalt/EvolvingWilds.java     |   2 +-
 .../sets/sorinvstibalt/FaithlessLooting.java  |   2 +-
 .../mage/sets/sorinvstibalt/FieldOfSouls.java |   2 +-
 .../mage/sets/sorinvstibalt/FiendHunter.java  |   2 +-
 .../mage/sets/sorinvstibalt/FlameJavelin.java |   2 +-
 .../mage/sets/sorinvstibalt/FlameSlash.java   |   2 +-
 .../mage/sets/sorinvstibalt/GangOfDevils.java |   2 +-
 .../sorinvstibalt/GatekeeperOfMalakir.java    |   2 +-
 .../mage/sets/sorinvstibalt/Geistflame.java   |   2 +-
 .../sets/sorinvstibalt/GoblinArsonist.java    |   2 +-
 .../mage/sets/sorinvstibalt/Hellrider.java    |   2 +-
 .../sorinvstibalt/HellsparkElemental.java     |   2 +-
 .../sets/sorinvstibalt/LingeringSouls.java    |   2 +-
 .../mage/sets/sorinvstibalt/MadProphet.java   |   2 +-
 .../sets/sorinvstibalt/MarkOfTheVampire.java  |   2 +-
 .../sets/sorinvstibalt/MausoleumGuard.java    |   2 +-
 .../sets/sorinvstibalt/MesmericFiend.java     |   2 +-
 .../src/mage/sets/sorinvstibalt/Mortify.java  |   2 +-
 .../sets/sorinvstibalt/PhantomGeneral.java    |   2 +-
 .../mage/sets/sorinvstibalt/Pyroclasm.java    |   2 +-
 .../sets/sorinvstibalt/RakdosCarnarium.java   |   2 +-
 .../sorinvstibalt/ReassemblingSkeleton.java   |   2 +-
 .../src/mage/sets/sorinvstibalt/Recoup.java   |   2 +-
 .../sets/sorinvstibalt/ScorchedRusalka.java   |   2 +-
 .../mage/sets/sorinvstibalt/ScourgeDevil.java |   2 +-
 .../sets/sorinvstibalt/SengirVampire.java     |   2 +-
 .../sets/sorinvstibalt/ShamblingRemains.java  |   2 +-
 .../sets/sorinvstibalt/SkirsdagCultist.java   |   2 +-
 .../sorinvstibalt/SorinLordOfInnistrad.java   |   2 +-
 .../mage/sets/sorinvstibalt/SorinsThirst.java |   2 +-
 .../sorinvstibalt/SpectralProcession.java     |   2 +-
 .../sets/sorinvstibalt/SulfuricVortex.java    |   2 +-
 .../mage/sets/sorinvstibalt/TaintedField.java |   2 +-
 .../mage/sets/sorinvstibalt/Terminate.java    |   2 +-
 .../sorinvstibalt/TibaltTheFiendBlooded.java  |   2 +-
 .../sets/sorinvstibalt/TwilightDrover.java    |   2 +-
 .../src/mage/sets/sorinvstibalt/Unmake.java   |   2 +-
 .../mage/sets/sorinvstibalt/UrgeToFeed.java   |   2 +-
 .../sets/sorinvstibalt/VampireLacerator.java  |   2 +-
 .../sets/sorinvstibalt/VampireNighthawk.java  |   2 +-
 .../sets/sorinvstibalt/VampireOutcasts.java   |   2 +-
 .../mage/sets/sorinvstibalt/VampiresBite.java |   2 +-
 .../sets/sorinvstibalt/VithianStinger.java    |   2 +-
 .../mage/sets/sorinvstibalt/WallOfOmens.java  |   2 +-
 .../sorinvstibalt/ZealousPersecution.java     |   2 +-
 .../sets/speedvscunning/ActOfTreason.java     |   2 +-
 .../mage/sets/speedvscunning/ArcTrail.java    |   2 +-
 .../speedvscunning/ArcanisTheOmnipotent.java  |   2 +-
 .../sets/speedvscunning/ArrowVolleyTrap.java  |   2 +-
 .../mage/sets/speedvscunning/Banefire.java    |   2 +-
 .../sets/speedvscunning/BeetlebackChief.java  |   2 +-
 .../sets/speedvscunning/BoneSplinters.java    |   2 +-
 .../speedvscunning/DauntlessOnslaught.java    |   2 +-
 .../sets/speedvscunning/DregscapeZombie.java  |   2 +-
 .../sets/speedvscunning/EvolvingWilds.java    |   2 +-
 .../sets/speedvscunning/FaerieImpostor.java   |   2 +-
 .../sets/speedvscunning/FaerieInvaders.java   |   2 +-
 .../mage/sets/speedvscunning/FathomSeer.java  |   2 +-
 .../mage/sets/speedvscunning/FieryFall.java   |   2 +-
 .../sets/speedvscunning/FlameKinZealot.java   |   2 +-
 .../speedvscunning/FleetingDistraction.java   |   2 +-
 .../sets/speedvscunning/FleshbagMarauder.java |   2 +-
 .../sets/speedvscunning/FrenziedGoblin.java   |   2 +-
 .../sets/speedvscunning/FuryOfTheHorde.java   |   2 +-
 .../sets/speedvscunning/GhituEncampment.java  |   2 +-
 .../speedvscunning/GoblinBombardment.java     |   2 +-
 .../speedvscunning/GoblinDeathraiders.java    |   2 +-
 .../sets/speedvscunning/GoblinWarchief.java   |   2 +-
 .../sets/speedvscunning/HellraiserGoblin.java |   2 +-
 .../sets/speedvscunning/HellsThunder.java     |   2 +-
 .../mage/sets/speedvscunning/HoldTheLine.java |   2 +-
 .../sets/speedvscunning/HussarPatrol.java     |   2 +-
 .../src/mage/sets/speedvscunning/Impulse.java |   2 +-
 .../sets/speedvscunning/InfantryVeteran.java  |   2 +-
 .../mage/sets/speedvscunning/InfernoTrap.java |   2 +-
 .../mage/sets/speedvscunning/JeskaiElder.java |   2 +-
 .../sets/speedvscunning/KathariBomber.java    |   2 +-
 .../sets/speedvscunning/KorHookmaster.java    |   2 +-
 .../sets/speedvscunning/KrenkoMobBoss.java    |   2 +-
 .../sets/speedvscunning/KrenkosCommand.java   |   2 +-
 .../speedvscunning/LeoninSnarecaster.java     |   2 +-
 .../sets/speedvscunning/LightningAngel.java   |   2 +-
 .../sets/speedvscunning/LightningHelix.java   |   2 +-
 .../sets/speedvscunning/LoneMissionary.java   |   2 +-
 .../mage/sets/speedvscunning/ManaLeak.java    |   2 +-
 .../speedvscunning/MarduHeartPiercer.java     |   2 +-
 .../mage/sets/speedvscunning/MasterDecoy.java |   2 +-
 .../sets/speedvscunning/MysticMonastery.java  |   2 +-
 .../sets/speedvscunning/NomadOutpost.java     |   2 +-
 .../sets/speedvscunning/OgreBattledriver.java |   2 +-
 .../sets/speedvscunning/OniOfWildPlaces.java  |   2 +-
 .../src/mage/sets/speedvscunning/Repeal.java  |   2 +-
 .../sets/speedvscunning/ScourgeDevil.java     |   2 +-
 .../sets/speedvscunning/ShamblingRemains.java |   2 +-
 .../src/mage/sets/speedvscunning/Shock.java   |   2 +-
 .../speedvscunning/SparkmageApprentice.java   |   2 +-
 .../sets/speedvscunning/SphinxOfUthuun.java   |   2 +-
 .../mage/sets/speedvscunning/StaveOff.java    |   2 +-
 .../mage/sets/speedvscunning/SteamAugury.java |   2 +-
 .../sets/speedvscunning/Stonecloaker.java     |   2 +-
 .../sets/speedvscunning/SwiftJustice.java     |   2 +-
 .../speedvscunning/TerramorphicExpanse.java   |   2 +-
 .../sets/speedvscunning/ThousandWinds.java    |   2 +-
 .../sets/speedvscunning/TraumaticVisions.java |   2 +-
 .../sets/speedvscunning/WhiplashTrap.java     |   2 +-
 .../mage/sets/speedvscunning/Willbender.java  |   2 +-
 .../sets/speedvscunning/ZurgoHelmsmasher.java |   2 +-
 .../mage/sets/starter1999/AbyssalHorror.java  |   2 +-
 .../mage/sets/starter1999/AirElemental.java   |   2 +-
 .../mage/sets/starter1999/AlluringScent.java  |   2 +-
 .../mage/sets/starter1999/AngelOfMercy.java   |   2 +-
 .../sets/starter1999/AngelicBlessing.java     |   2 +-
 .../src/mage/sets/starter1999/Archangel.java  |   2 +-
 .../mage/sets/starter1999/ArdentMilitia.java  |   2 +-
 .../src/mage/sets/starter1999/Armageddon.java |   2 +-
 .../mage/sets/starter1999/BarbtoothWurm.java  |   2 +-
 .../mage/sets/starter1999/BlindingLight.java  |   2 +-
 .../src/mage/sets/starter1999/BogImp.java     |   2 +-
 .../src/mage/sets/starter1999/BogRaiders.java |   2 +-
 .../src/mage/sets/starter1999/BogWraith.java  |   2 +-
 .../mage/sets/starter1999/BorderGuard.java    |   2 +-
 .../mage/sets/starter1999/BreathOfLife.java   |   2 +-
 .../src/mage/sets/starter1999/BullHippo.java  |   2 +-
 .../sets/starter1999/ChargingPaladin.java     |   2 +-
 .../mage/sets/starter1999/ChorusOfWoe.java    |   2 +-
 .../src/mage/sets/starter1999/Coercion.java   |   2 +-
 .../src/mage/sets/starter1999/CoralEel.java   |   2 +-
 .../mage/sets/starter1999/Counterspell.java   |   2 +-
 .../mage/sets/starter1999/DakmorScorpion.java |   2 +-
 .../mage/sets/starter1999/DarkOffering.java   |   2 +-
 .../sets/starter1999/DenizenOfTheDeep.java    |   2 +-
 .../mage/sets/starter1999/Devastation.java    |   2 +-
 .../mage/sets/starter1999/DevotedHero.java    |   2 +-
 .../mage/sets/starter1999/DurkwoodBoars.java  |   2 +-
 .../src/mage/sets/starter1999/EagerCadet.java |   2 +-
 .../mage/sets/starter1999/EarthElemental.java |   2 +-
 .../src/mage/sets/starter1999/Exhaustion.java |   2 +-
 .../src/mage/sets/starter1999/Extinguish.java |   2 +-
 .../mage/sets/starter1999/FeralShadow.java    |   2 +-
 .../mage/sets/starter1999/FireElemental.java  |   2 +-
 .../mage/sets/starter1999/FireTempest.java    |   2 +-
 .../mage/sets/starter1999/FootSoldiers.java   |   2 +-
 .../mage/sets/starter1999/GiantOctopus.java   |   2 +-
 .../sets/starter1999/GoblinCavaliers.java     |   2 +-
 .../mage/sets/starter1999/GoblinChariot.java  |   2 +-
 .../mage/sets/starter1999/GoblinCommando.java |   2 +-
 .../mage/sets/starter1999/GoblinGeneral.java  |   2 +-
 .../mage/sets/starter1999/GoblinGlider.java   |   2 +-
 .../src/mage/sets/starter1999/GoblinHero.java |   2 +-
 .../src/mage/sets/starter1999/GoblinLore.java |   2 +-
 .../sets/starter1999/GoblinMountaineer.java   |   2 +-
 .../mage/sets/starter1999/GoblinSettler.java  |   2 +-
 .../mage/sets/starter1999/GorillaWarrior.java |   2 +-
 .../mage/sets/starter1999/Gravedigger.java    |   2 +-
 .../mage/sets/starter1999/GrizzlyBears.java   |   2 +-
 .../mage/sets/starter1999/HandOfDeath.java    |   2 +-
 .../src/mage/sets/starter1999/HollowDogs.java |   2 +-
 .../mage/sets/starter1999/HulkingGoblin.java  |   2 +-
 .../mage/sets/starter1999/IngeniousThief.java |   2 +-
 .../sets/starter1999/JaggedLightning.java     |   2 +-
 .../mage/sets/starter1999/KnightErrant.java   |   2 +-
 .../src/mage/sets/starter1999/LastChance.java |   2 +-
 .../src/mage/sets/starter1999/LavaAxe.java    |   2 +-
 .../src/mage/sets/starter1999/LoneWolf.java   |   2 +-
 .../mage/sets/starter1999/LoyalSentry.java    |   2 +-
 Mage.Sets/src/mage/sets/starter1999/Lynx.java |   2 +-
 .../src/mage/sets/starter1999/ManOWar.java    |   2 +-
 .../starter1999/MerfolkOfThePearlTrident.java |   2 +-
 .../src/mage/sets/starter1999/MindRot.java    |   2 +-
 .../sets/starter1999/MonssGoblinRaiders.java  |   2 +-
 .../sets/starter1999/MonstrousGrowth.java     |   2 +-
 .../src/mage/sets/starter1999/MoonSprite.java |   2 +-
 .../src/mage/sets/starter1999/MuckRats.java   |   2 +-
 .../mage/sets/starter1999/NaturalSpring.java  |   2 +-
 .../mage/sets/starter1999/NaturesLore.java    |   2 +-
 .../mage/sets/starter1999/NorwoodArchers.java |   2 +-
 .../mage/sets/starter1999/NorwoodRanger.java  |   2 +-
 .../mage/sets/starter1999/OgreWarrior.java    |   2 +-
 .../mage/sets/starter1999/PhantomWarrior.java |   2 +-
 .../sets/starter1999/PsychicTransfer.java     |   2 +-
 .../mage/sets/starter1999/RagingGoblin.java   |   2 +-
 .../src/mage/sets/starter1999/RaiseDead.java  |   2 +-
 .../mage/sets/starter1999/RavenousRats.java   |   2 +-
 .../src/mage/sets/starter1999/Relearn.java    |   2 +-
 .../sets/starter1999/RelentlessAssault.java   |   2 +-
 .../src/mage/sets/starter1999/RemoveSoul.java |   2 +-
 .../sets/starter1999/RighteousCharge.java     |   2 +-
 .../mage/sets/starter1999/RoyalFalcon.java    |   2 +-
 .../mage/sets/starter1999/SacredNectar.java   |   2 +-
 .../mage/sets/starter1999/ScatheZombies.java  |   2 +-
 .../src/mage/sets/starter1999/SeaEagle.java   |   2 +-
 .../mage/sets/starter1999/SerpentWarrior.java |   2 +-
 .../mage/sets/starter1999/SilverbackApe.java  |   2 +-
 .../mage/sets/starter1999/SleightOfHand.java  |   2 +-
 .../mage/sets/starter1999/SnappingDrake.java  |   2 +-
 .../src/mage/sets/starter1999/SoulFeast.java  |   2 +-
 .../sets/starter1999/SouthernElephant.java    |   2 +-
 .../mage/sets/starter1999/SpittingEarth.java  |   2 +-
 .../src/mage/sets/starter1999/StoneRain.java  |   2 +-
 .../src/mage/sets/starter1999/StormCrow.java  |   2 +-
 .../mage/sets/starter1999/SummerBloom.java    |   2 +-
 .../mage/sets/starter1999/SylvanBasilisk.java |   2 +-
 .../mage/sets/starter1999/ThornElemental.java |   2 +-
 .../src/mage/sets/starter1999/Tidings.java    |   2 +-
 .../src/mage/sets/starter1999/TimeEbb.java    |   2 +-
 .../src/mage/sets/starter1999/TimeWarp.java   |   2 +-
 .../sets/starter1999/TouchOfBrilliance.java   |   2 +-
 .../mage/sets/starter1999/TrainedOrgg.java    |   2 +-
 .../src/mage/sets/starter1999/Tremor.java     |   2 +-
 .../mage/sets/starter1999/UntamedWilds.java   |   2 +-
 .../mage/sets/starter1999/VenerableMonk.java  |   2 +-
 .../src/mage/sets/starter1999/Vengeance.java  |   2 +-
 .../sets/starter1999/VeteranCavalier.java     |   2 +-
 .../src/mage/sets/starter1999/Vizzerdrix.java |   2 +-
 .../mage/sets/starter1999/VolcanicDragon.java |   2 +-
 .../mage/sets/starter1999/VolcanicHammer.java |   2 +-
 .../mage/sets/starter1999/WaterElemental.java |   2 +-
 .../mage/sets/starter1999/WhiptailWurm.java   |   2 +-
 .../src/mage/sets/starter1999/Whirlwind.java  |   2 +-
 .../src/mage/sets/starter1999/WickedPact.java |   2 +-
 .../mage/sets/starter1999/WildGriffin.java    |   2 +-
 .../src/mage/sets/starter1999/WildOx.java     |   2 +-
 .../src/mage/sets/starter1999/WillowElf.java  |   2 +-
 .../src/mage/sets/starter1999/WindDrake.java  |   2 +-
 .../src/mage/sets/starter1999/WoodElves.java  |   2 +-
 .../sets/starter2000/AngelicBlessing.java     |   2 +-
 .../mage/sets/starter2000/ArmoredPegasus.java |   2 +-
 .../src/mage/sets/starter2000/BogImp.java     |   2 +-
 .../src/mage/sets/starter2000/Coercion.java   |   2 +-
 .../mage/sets/starter2000/Counterspell.java   |   2 +-
 .../src/mage/sets/starter2000/Disenchant.java |   2 +-
 .../mage/sets/starter2000/DurkwoodBoars.java  |   2 +-
 .../src/mage/sets/starter2000/EagerCadet.java |   2 +-
 .../mage/sets/starter2000/FlameSpirit.java    |   2 +-
 .../src/mage/sets/starter2000/Flight.java     |   2 +-
 .../mage/sets/starter2000/GiantGrowth.java    |   2 +-
 .../mage/sets/starter2000/GiantOctopus.java   |   2 +-
 .../src/mage/sets/starter2000/GoblinHero.java |   2 +-
 .../mage/sets/starter2000/HerosResolve.java   |   2 +-
 .../mage/sets/starter2000/Inspiration.java    |   2 +-
 .../mage/sets/starter2000/KnightErrant.java   |   2 +-
 .../src/mage/sets/starter2000/LavaAxe.java    |   2 +-
 .../mage/sets/starter2000/LlanowarElves.java  |   2 +-
 .../starter2000/MerfolkOfThePearlTrident.java |   2 +-
 .../sets/starter2000/MonssGoblinRaiders.java  |   2 +-
 .../sets/starter2000/MonstrousGrowth.java     |   2 +-
 .../src/mage/sets/starter2000/MoonSprite.java |   2 +-
 .../mage/sets/starter2000/ObsianusGolem.java  |   2 +-
 .../mage/sets/starter2000/OgreWarrior.java    |   2 +-
 .../sets/starter2000/OrcishOriflamme.java     |   2 +-
 .../sets/starter2000/ProdigalSorcerer.java    |   2 +-
 .../src/mage/sets/starter2000/Python.java     |   2 +-
 .../src/mage/sets/starter2000/RodOfRuin.java  |   2 +-
 .../mage/sets/starter2000/SamiteHealer.java   |   2 +-
 .../mage/sets/starter2000/ScatheZombies.java  |   2 +-
 .../src/mage/sets/starter2000/SeaEagle.java   |   2 +-
 .../src/mage/sets/starter2000/Shock.java      |   2 +-
 .../src/mage/sets/starter2000/SoulNet.java    |   2 +-
 .../src/mage/sets/starter2000/SpinedWurm.java |   2 +-
 .../src/mage/sets/starter2000/StoneRain.java  |   2 +-
 .../src/mage/sets/starter2000/Terror.java     |   2 +-
 .../src/mage/sets/starter2000/TimeEbb.java    |   2 +-
 .../mage/sets/starter2000/TrainedOrgg.java    |   2 +-
 .../mage/sets/starter2000/VenerableMonk.java  |   2 +-
 .../src/mage/sets/starter2000/Vizzerdrix.java |   2 +-
 .../mage/sets/starter2000/WildGriffin.java    |   2 +-
 .../src/mage/sets/starter2000/WindDrake.java  |   2 +-
 .../src/mage/sets/stronghold/Bandage.java     |   2 +-
 .../src/mage/sets/stronghold/Cannibalize.java |   2 +-
 .../mage/sets/stronghold/DreamProwler.java    |   2 +-
 .../sets/stronghold/EndangeredArmodon.java    |   2 +-
 .../src/mage/sets/stronghold/FlameWave.java   |   2 +-
 Mage.Sets/src/mage/sets/stronghold/Fling.java |   2 +-
 .../mage/sets/stronghold/FlowstoneBlade.java  |   2 +-
 .../sets/stronghold/FlowstoneShambler.java    |   2 +-
 .../src/mage/sets/stronghold/GravePact.java   |   2 +-
 .../mage/sets/stronghold/HammerheadShark.java |   2 +-
 .../src/mage/sets/stronghold/HonorGuard.java  |   2 +-
 .../mage/sets/stronghold/HornetCannon.java    |   2 +-
 .../mage/sets/stronghold/LowlandBasilisk.java |   2 +-
 .../src/mage/sets/stronghold/ManaLeak.java    |   2 +-
 .../src/mage/sets/stronghold/Megrim.java      |   2 +-
 .../mage/sets/stronghold/MoggFlunkies.java    |   2 +-
 .../src/mage/sets/stronghold/MoggManiac.java  |   2 +-
 Mage.Sets/src/mage/sets/stronghold/Mulch.java |   2 +-
 .../src/mage/sets/stronghold/PrimalRage.java  |   2 +-
 .../src/mage/sets/stronghold/Revenant.java    |   2 +-
 .../mage/sets/stronghold/SeethingAnger.java   |   2 +-
 .../mage/sets/stronghold/ShardPhoenix.java    |   2 +-
 Mage.Sets/src/mage/sets/stronghold/Shock.java |   2 +-
 Mage.Sets/src/mage/sets/stronghold/Sift.java  |   2 +-
 .../mage/sets/stronghold/SilverWyvern.java    |   2 +-
 Mage.Sets/src/mage/sets/stronghold/Smite.java |   2 +-
 .../mage/sets/stronghold/SpikeBreeder.java    |   2 +-
 .../src/mage/sets/stronghold/SpikeFeeder.java |   2 +-
 .../src/mage/sets/stronghold/SpinedWurm.java  |   2 +-
 .../src/mage/sets/stronghold/SpiritEnKor.java |   2 +-
 .../mage/sets/stronghold/SpittingHydra.java   |   2 +-
 .../mage/sets/stronghold/VenerableMonk.java   |   2 +-
 .../mage/sets/stronghold/VerdantTouch.java    |   2 +-
 .../sets/stronghold/VolrathsLaboratory.java   |   2 +-
 .../sets/stronghold/VolrathsShapeshifter.java |   2 +-
 .../src/mage/sets/stronghold/WallOfSouls.java |   2 +-
 .../mage/sets/stronghold/WarriorEnKor.java    |   2 +-
 .../mage/sets/stronghold/YouthfulKnight.java  |   2 +-
 .../mage/sets/superseries/CityOfBrass.java    |   2 +-
 .../src/mage/sets/superseries/Crusade.java    |   2 +-
 .../sets/superseries/ElvishChampion1.java     |   2 +-
 .../sets/superseries/ElvishChampion2.java     |   2 +-
 .../sets/superseries/ElvishChampion3.java     |   2 +-
 .../mage/sets/superseries/ElvishLyrist.java   |   2 +-
 .../mage/sets/superseries/GiantGrowth.java    |   2 +-
 .../sets/superseries/GloriousAnthem1.java     |   2 +-
 .../sets/superseries/GloriousAnthem2.java     |   2 +-
 .../sets/superseries/GloriousAnthem3.java     |   2 +-
 .../mage/sets/superseries/LordOfAtlantis.java |   2 +-
 .../src/mage/sets/superseries/MadAuntie.java  |   2 +-
 .../mage/sets/superseries/RoyalAssassin.java  |   2 +-
 .../sets/superseries/SakuraTribeElder1.java   |   2 +-
 .../sets/superseries/SakuraTribeElder2.java   |   2 +-
 .../sets/superseries/SakuraTribeElder3.java   |   2 +-
 .../mage/sets/superseries/SerraAvatar.java    |   2 +-
 .../mage/sets/superseries/ShardPhoenix1.java  |   2 +-
 .../mage/sets/superseries/ShardPhoenix2.java  |   2 +-
 .../mage/sets/superseries/ShardPhoenix3.java  |   2 +-
 .../sets/superseries/SlithFirewalker.java     |   2 +-
 .../mage/sets/superseries/SoltariPriest1.java |   2 +-
 .../mage/sets/superseries/SoltariPriest2.java |   2 +-
 .../mage/sets/superseries/SoltariPriest3.java |   2 +-
 .../mage/sets/superseries/ThranQuarry.java    |   2 +-
 .../sets/superseries/TwoHeadedDragon.java     |   2 +-
 .../mage/sets/superseries/VolcanicHammer.java |   2 +-
 .../sets/superseries/WhirlingDervish1.java    |   2 +-
 .../sets/superseries/WhirlingDervish2.java    |   2 +-
 .../sets/superseries/WhirlingDervish3.java    |   2 +-
 .../src/mage/sets/tempest/AvengingAngel.java  |   2 +-
 .../sets/tempest/CircleOfProtectionBlack.java |   2 +-
 .../sets/tempest/CircleOfProtectionBlue.java  |   2 +-
 .../sets/tempest/CircleOfProtectionGreen.java |   2 +-
 .../sets/tempest/CircleOfProtectionRed.java   |   2 +-
 .../sets/tempest/CircleOfProtectionWhite.java |   2 +-
 Mage.Sets/src/mage/sets/tempest/Coercion.java |   2 +-
 .../src/mage/sets/tempest/CoffinQueen.java    |   2 +-
 .../src/mage/sets/tempest/DarkRitual.java     |   2 +-
 Mage.Sets/src/mage/sets/tempest/Deadshot.java |   2 +-
 .../src/mage/sets/tempest/DirtcowlWurm.java   |   2 +-
 .../src/mage/sets/tempest/DregsOfSorrow.java  |   2 +-
 .../src/mage/sets/tempest/FieldOfSouls.java   |   2 +-
 .../mage/sets/tempest/FlowstoneSculpture.java |   2 +-
 .../src/mage/sets/tempest/Gravedigger.java    |   2 +-
 Mage.Sets/src/mage/sets/tempest/Harrow.java   |   2 +-
 .../src/mage/sets/tempest/HeartwoodDryad.java |   2 +-
 .../src/mage/sets/tempest/HornedTurtle.java   |   2 +-
 .../src/mage/sets/tempest/JinxedIdol.java     |   2 +-
 .../mage/sets/tempest/LightningElemental.java |   2 +-
 .../src/mage/sets/tempest/MountedArchers.java |   2 +-
 .../src/mage/sets/tempest/NaturesRevolt.java  |   2 +-
 Mage.Sets/src/mage/sets/tempest/Overrun.java  |   2 +-
 Mage.Sets/src/mage/sets/tempest/Pacifism.java |   2 +-
 .../src/mage/sets/tempest/PhyrexianHulk.java  |   2 +-
 .../src/mage/sets/tempest/PowerSink.java      |   2 +-
 .../src/mage/sets/tempest/RampantGrowth.java  |   2 +-
 .../src/mage/sets/tempest/RathiDragon.java    |   2 +-
 .../src/mage/sets/tempest/Repentance.java     |   2 +-
 .../src/mage/sets/tempest/RollingThunder.java |   2 +-
 Mage.Sets/src/mage/sets/tempest/Shatter.java  |   2 +-
 .../mage/sets/tempest/SkyshroudVampire.java   |   2 +-
 .../src/mage/sets/tempest/SoltariLancer.java  |   2 +-
 .../src/mage/sets/tempest/SpellBlast.java     |   2 +-
 .../src/mage/sets/tempest/SpinalGraft.java    |   2 +-
 .../src/mage/sets/tempest/SuddenImpact.java   |   2 +-
 .../src/mage/sets/tempest/ThalakosSeer.java   |   2 +-
 Mage.Sets/src/mage/sets/tempest/TimeWarp.java |   2 +-
 Mage.Sets/src/mage/sets/tempest/Twitch.java   |   2 +-
 .../src/mage/sets/tempest/WindDrake.java      |   2 +-
 .../src/mage/sets/tempest/WindsOfRath.java    |   2 +-
 .../sets/tempestremastered/AcidicSliver.java  |   2 +-
 .../sets/tempestremastered/Aftershock.java    |   2 +-
 .../mage/sets/tempestremastered/Aluren.java   |   2 +-
 .../sets/tempestremastered/Anarchist.java     |   2 +-
 .../tempestremastered/AngelicBlessing.java    |   2 +-
 .../tempestremastered/AngelicProtector.java   |   2 +-
 .../mage/sets/tempestremastered/Anoint.java   |   2 +-
 .../sets/tempestremastered/ArmorSliver.java   |   2 +-
 .../tempestremastered/ArmoredPegasus.java     |   2 +-
 .../mage/sets/tempestremastered/Bandage.java  |   2 +-
 .../sets/tempestremastered/BarbedSliver.java  |   2 +-
 .../sets/tempestremastered/BottleGnomes.java  |   2 +-
 .../sets/tempestremastered/CalderaLake.java   |   2 +-
 .../sets/tempestremastered/CanopySpider.java  |   2 +-
 .../sets/tempestremastered/CanyonWildcat.java |   2 +-
 .../mage/sets/tempestremastered/Capsize.java  |   2 +-
 .../sets/tempestremastered/Carnassid.java     |   2 +-
 .../sets/tempestremastered/Carnophage.java    |   2 +-
 .../sets/tempestremastered/Cataclysm.java     |   2 +-
 .../tempestremastered/ChargingPaladin.java    |   2 +-
 .../sets/tempestremastered/CinderMarsh.java   |   2 +-
 .../tempestremastered/CityOfTraitors.java     |   2 +-
 .../sets/tempestremastered/ClotSliver.java    |   2 +-
 .../sets/tempestremastered/CoatOfArms.java    |   2 +-
 .../mage/sets/tempestremastered/Coercion.java |   2 +-
 .../tempestremastered/CoiledTinviper.java     |   2 +-
 .../CommanderGrevenIlVec.java                 |   2 +-
 .../sets/tempestremastered/Conviction.java    |   2 +-
 .../sets/tempestremastered/CorpseDance.java   |   2 +-
 .../sets/tempestremastered/Counterspell.java  |   2 +-
 .../sets/tempestremastered/CravenGiant.java   |   2 +-
 .../tempestremastered/CrovaxTheCursed.java    |   2 +-
 .../tempestremastered/CrystallineSliver.java  |   2 +-
 .../sets/tempestremastered/Curiosity.java     |   2 +-
 .../sets/tempestremastered/CursedFlesh.java   |   2 +-
 .../sets/tempestremastered/CursedScroll.java  |   2 +-
 .../sets/tempestremastered/DarkBanishing.java |   2 +-
 .../sets/tempestremastered/DarkRitual.java    |   2 +-
 .../sets/tempestremastered/DauthiHorror.java  |   2 +-
 .../tempestremastered/DauthiMarauder.java     |   2 +-
 .../sets/tempestremastered/DauthiSlayer.java  |   2 +-
 .../tempestremastered/DeathPitsOfRath.java    |   2 +-
 .../sets/tempestremastered/DeathStroke.java   |   2 +-
 .../sets/tempestremastered/DiabolicEdict.java |   2 +-
 .../sets/tempestremastered/Disenchant.java    |   2 +-
 .../mage/sets/tempestremastered/Dismiss.java  |   2 +-
 .../sets/tempestremastered/Dracoplasm.java    |   2 +-
 .../sets/tempestremastered/DreamHalls.java    |   2 +-
 .../sets/tempestremastered/DungeonShade.java  |   2 +-
 .../sets/tempestremastered/ElvenRite.java     |   2 +-
 .../sets/tempestremastered/ElvishFury.java    |   2 +-
 .../sets/tempestremastered/EmmessiTome.java   |   2 +-
 .../sets/tempestremastered/Ephemeron.java     |   2 +-
 .../sets/tempestremastered/ErraticPortal.java |   2 +-
 .../tempestremastered/EvincarsJustice.java    |   2 +-
 .../sets/tempestremastered/ExaltedDragon.java |   2 +-
 .../tempestremastered/FanningTheFlames.java   |   2 +-
 .../sets/tempestremastered/FightingDrake.java |   2 +-
 .../sets/tempestremastered/FlameWave.java     |   2 +-
 .../tempestremastered/FlowstoneBlade.java     |   2 +-
 .../tempestremastered/FlowstoneMauler.java    |   2 +-
 .../tempestremastered/FlowstoneWyvern.java    |   2 +-
 .../mage/sets/tempestremastered/Forbid.java   |   2 +-
 .../mage/sets/tempestremastered/Fugue.java    |   2 +-
 .../sets/tempestremastered/Gallantry.java     |   2 +-
 .../sets/tempestremastered/GaseousForm.java   |   2 +-
 .../tempestremastered/GerrardsBattleCry.java  |   2 +-
 .../tempestremastered/GoblinBombardment.java  |   2 +-
 .../sets/tempestremastered/Gravedigger.java   |   2 +-
 .../sets/tempestremastered/Grindstone.java    |   2 +-
 .../mage/sets/tempestremastered/Harrow.java   |   2 +-
 .../tempestremastered/HeartwoodGiant.java     |   2 +-
 .../sets/tempestremastered/HermitDruid.java   |   2 +-
 .../tempestremastered/HibernationSliver.java  |   2 +-
 .../sets/tempestremastered/HornedSliver.java  |   2 +-
 .../sets/tempestremastered/HornedTurtle.java  |   2 +-
 .../mage/sets/tempestremastered/Humility.java |   2 +-
 .../sets/tempestremastered/Intuition.java     |   2 +-
 .../sets/tempestremastered/JinxedIdol.java    |   2 +-
 .../sets/tempestremastered/Kezzerdrix.java    |   2 +-
 .../mage/sets/tempestremastered/Kindle.java   |   2 +-
 .../mage/sets/tempestremastered/KorChant.java |   2 +-
 .../mage/sets/tempestremastered/Krakilin.java |   2 +-
 .../mage/sets/tempestremastered/LabRats.java  |   2 +-
 .../sets/tempestremastered/LegacysAllure.java |   2 +-
 .../sets/tempestremastered/Legerdemain.java   |   2 +-
 .../tempestremastered/LightningBlast.java     |   2 +-
 .../sets/tempestremastered/LivingDeath.java   |   2 +-
 .../sets/tempestremastered/LotusPetal.java    |   2 +-
 .../sets/tempestremastered/LowlandGiant.java  |   2 +-
 .../sets/tempestremastered/MageIlVec.java     |   2 +-
 .../sets/tempestremastered/Magmasaur.java     |   2 +-
 .../mage/sets/tempestremastered/ManaLeak.java |   2 +-
 .../mage/sets/tempestremastered/Manabond.java |   2 +-
 .../sets/tempestremastered/ManiacalRage.java  |   2 +-
 .../sets/tempestremastered/MasterDecoy.java   |   2 +-
 .../mage/sets/tempestremastered/Mawcor.java   |   2 +-
 .../sets/tempestremastered/MazeOfShadows.java |   2 +-
 .../mage/sets/tempestremastered/Meditate.java |   2 +-
 .../sets/tempestremastered/MerfolkLooter.java |   2 +-
 .../tempestremastered/MetallicSliver.java     |   2 +-
 .../tempestremastered/MindlessAutomaton.java  |   2 +-
 .../tempestremastered/MirriCatWarrior.java    |   2 +-
 .../tempestremastered/MnemonicSliver.java     |   2 +-
 .../tempestremastered/MoggConscripts.java     |   2 +-
 .../sets/tempestremastered/MoggFanatic.java   |   2 +-
 .../sets/tempestremastered/MoggFlunkies.java  |   2 +-
 .../sets/tempestremastered/MoggHollows.java   |   2 +-
 .../tempestremastered/MoggInfestation.java    |   2 +-
 .../sets/tempestremastered/MoxDiamond.java    |   2 +-
 .../mage/sets/tempestremastered/Mulch.java    |   2 +-
 .../sets/tempestremastered/MuscleSliver.java  |   2 +-
 .../sets/tempestremastered/NeedleStorm.java   |   2 +-
 .../sets/tempestremastered/NomadsEnKor.java   |   2 +-
 .../sets/tempestremastered/OathOfDruids.java  |   2 +-
 .../sets/tempestremastered/OgreShaman.java    |   2 +-
 .../tempestremastered/OrimSamiteHealer.java   |   2 +-
 .../mage/sets/tempestremastered/Overrun.java  |   2 +-
 .../mage/sets/tempestremastered/Pacifism.java |   2 +-
 .../sets/tempestremastered/PaladinEnVec.java  |   2 +-
 .../sets/tempestremastered/Pandemonium.java   |   2 +-
 .../tempestremastered/PatchworkGnomes.java    |   2 +-
 .../tempestremastered/PegasusStampede.java    |   2 +-
 .../sets/tempestremastered/PhyrexianHulk.java |   2 +-
 .../sets/tempestremastered/PineBarrens.java   |   2 +-
 .../mage/sets/tempestremastered/Provoke.java  |   2 +-
 .../sets/tempestremastered/RampantGrowth.java |   2 +-
 .../sets/tempestremastered/RathiDragon.java   |   2 +-
 .../sets/tempestremastered/RatsOfRath.java    |   2 +-
 .../sets/tempestremastered/RealityAnchor.java |   2 +-
 .../sets/tempestremastered/Reanimate.java     |   2 +-
 .../tempestremastered/RecurringNightmare.java |   2 +-
 .../mage/sets/tempestremastered/Recycle.java  |   2 +-
 .../tempestremastered/RenegadeWarlord.java    |   2 +-
 .../tempestremastered/RootbreakerWurm.java    |   2 +-
 .../sets/tempestremastered/Rootwalla.java     |   2 +-
 .../tempestremastered/RootwaterDepths.java    |   2 +-
 .../tempestremastered/RootwaterHunter.java    |   2 +-
 .../tempestremastered/SabertoothWyvern.java   |   2 +-
 .../sets/tempestremastered/SaltFlats.java     |   2 +-
 .../tempestremastered/SandstoneWarrior.java   |   2 +-
 .../sets/tempestremastered/Sarcomancy.java    |   2 +-
 .../mage/sets/tempestremastered/Scabland.java |   2 +-
 .../tempestremastered/ScreechingHarpy.java    |   2 +-
 .../sets/tempestremastered/Scrivener.java     |   2 +-
 .../sets/tempestremastered/SeaMonster.java    |   2 +-
 .../sets/tempestremastered/SearingTouch.java  |   2 +-
 .../tempestremastered/SeleniaDarkAngel.java   |   2 +-
 .../tempestremastered/SerpentWarrior.java     |   2 +-
 .../mage/sets/tempestremastered/Shackles.java |   2 +-
 .../sets/tempestremastered/ShadowRift.java    |   2 +-
 .../sets/tempestremastered/Shadowstorm.java   |   2 +-
 .../sets/tempestremastered/ShamanEnKor.java   |   2 +-
 .../mage/sets/tempestremastered/Shatter.java  |   2 +-
 .../src/mage/sets/tempestremastered/Sift.java |   2 +-
 .../sets/tempestremastered/SkyshroudElf.java  |   2 +-
 .../tempestremastered/SkyshroudForest.java    |   2 +-
 .../tempestremastered/SkyshroudTroll.java     |   2 +-
 .../sets/tempestremastered/SliverQueen.java   |   2 +-
 .../mage/sets/tempestremastered/Smite.java    |   2 +-
 .../tempestremastered/SoltariChampion.java    |   2 +-
 .../tempestremastered/SoltariGuerrillas.java  |   2 +-
 .../sets/tempestremastered/SoltariMonk.java   |   2 +-
 .../sets/tempestremastered/SoltariPriest.java |   2 +-
 .../tempestremastered/SoltariTrooper.java     |   2 +-
 .../sets/tempestremastered/SpellBlast.java    |   2 +-
 .../sets/tempestremastered/SpikeColony.java   |   2 +-
 .../sets/tempestremastered/SpikeFeeder.java   |   2 +-
 .../sets/tempestremastered/SpinalGraft.java   |   2 +-
 .../sets/tempestremastered/SpinedSliver.java  |   2 +-
 .../sets/tempestremastered/SpinedWurm.java    |   2 +-
 .../sets/tempestremastered/SpiritMirror.java  |   2 +-
 .../tempestremastered/StalkingStones.java     |   2 +-
 .../tempestremastered/StandingTroops.java     |   2 +-
 .../sets/tempestremastered/StarkeOfRath.java  |   2 +-
 .../tempestremastered/StaunchDefenders.java   |   2 +-
 .../tempestremastered/StrongholdAssassin.java |   2 +-
 .../src/mage/sets/tempestremastered/Stun.java |   2 +-
 .../SurvivalOfTheFittest.java                 |   2 +-
 .../sets/tempestremastered/Telethopter.java   |   2 +-
 .../tempestremastered/ThalakosLowlands.java   |   2 +-
 .../tempestremastered/ThopterSquadron.java    |   2 +-
 .../sets/tempestremastered/ThrullSurgeon.java |   2 +-
 .../mage/sets/tempestremastered/TimeEbb.java  |   2 +-
 .../mage/sets/tempestremastered/TimeWarp.java |   2 +-
 .../tempestremastered/TradewindRider.java     |   2 +-
 .../tempestremastered/TrainedArmodon.java     |   2 +-
 .../sets/tempestremastered/Tranquility.java   |   2 +-
 .../mage/sets/tempestremastered/Twitch.java   |   2 +-
 .../sets/tempestremastered/VampireHounds.java |   2 +-
 .../sets/tempestremastered/VecTownships.java  |   2 +-
 .../sets/tempestremastered/VerdantForce.java  |   2 +-
 .../sets/tempestremastered/Verdigris.java     |   2 +-
 .../sets/tempestremastered/VhatiIlDal.java    |   2 +-
 .../sets/tempestremastered/VictualSliver.java |   2 +-
 .../sets/tempestremastered/VolrathsCurse.java |   2 +-
 .../tempestremastered/VolrathsStronghold.java |   2 +-
 .../tempestremastered/WallOfBlossoms.java     |   2 +-
 .../tempestremastered/WallOfDiffusion.java    |   2 +-
 .../sets/tempestremastered/WallOfEssence.java |   2 +-
 .../sets/tempestremastered/Wasteland.java     |   2 +-
 .../tempestremastered/WhispersOfTheMuse.java  |   2 +-
 .../sets/tempestremastered/WindDancer.java    |   2 +-
 .../sets/tempestremastered/WindDrake.java     |   2 +-
 .../sets/tempestremastered/WindsOfRath.java   |   2 +-
 .../sets/tempestremastered/WingedSliver.java  |   2 +-
 .../mage/sets/tempestremastered/WoodSage.java |   2 +-
 .../tempestremastered/YouthfulKnight.java     |   2 +-
 .../sets/tenthedition/AgonizingMemories.java  |   2 +-
 .../mage/sets/tenthedition/AirElemental.java  |   2 +-
 .../mage/sets/tenthedition/AngelicChorus.java |   2 +-
 .../sets/tenthedition/AscendantEvincar.java   |   2 +-
 .../mage/sets/tenthedition/AuraOfSilence.java |   2 +-
 .../mage/sets/tenthedition/AvatarOfMight.java |   2 +-
 .../sets/tenthedition/AvenWindreader.java     |   2 +-
 .../mage/sets/tenthedition/BallistaSquad.java |   2 +-
 .../sets/tenthedition/BattlefieldForge.java   |   2 +-
 .../sets/tenthedition/BeaconOfUnrest.java     |   2 +-
 .../src/mage/sets/tenthedition/Blaze.java     |   2 +-
 .../sets/tenthedition/BloodfireColossus.java  |   2 +-
 .../src/mage/sets/tenthedition/BogWraith.java |   2 +-
 .../sets/tenthedition/BogardanFirefiend.java  |   2 +-
 .../mage/sets/tenthedition/BottleGnomes.java  |   2 +-
 .../mage/sets/tenthedition/CanopySpider.java  |   2 +-
 .../mage/sets/tenthedition/CavesOfKoilos.java |   2 +-
 .../sets/tenthedition/CephalidConstable.java  |   2 +-
 .../mage/sets/tenthedition/ChimericStaff.java |   2 +-
 .../mage/sets/tenthedition/CitanulFlute.java  |   2 +-
 .../mage/sets/tenthedition/CoatOfArms.java    |   2 +-
 .../sets/tenthedition/ColossusOfSardia.java   |   2 +-
 .../sets/tenthedition/CommuneWithNature.java  |   2 +-
 .../mage/sets/tenthedition/ConeOfFlame.java   |   2 +-
 .../mage/sets/tenthedition/ConsumeSpirit.java |   2 +-
 .../sets/tenthedition/ContaminatedBond.java   |   2 +-
 .../tenthedition/CounselOfTheSoratami.java    |   2 +-
 .../mage/sets/tenthedition/DreambornMuse.java |   2 +-
 .../sets/tenthedition/DrudgeSkeletons.java    |   2 +-
 .../mage/sets/tenthedition/DuctCrawler.java   |   2 +-
 .../mage/sets/tenthedition/ElvenRiders.java   |   2 +-
 .../sets/tenthedition/ElvishBerserker.java    |   2 +-
 .../mage/sets/tenthedition/ElvishPiper.java   |   2 +-
 .../sets/tenthedition/EnormousBaloth.java     |   2 +-
 .../mage/sets/tenthedition/EssenceDrain.java  |   2 +-
 .../mage/sets/tenthedition/Evacuation.java    |   2 +-
 .../sets/tenthedition/FesteringGoblin.java    |   2 +-
 .../mage/sets/tenthedition/Firebreathing.java |   2 +-
 .../mage/sets/tenthedition/FurnaceOfRath.java |   2 +-
 .../src/mage/sets/tenthedition/GravePact.java |   2 +-
 .../sets/tenthedition/GuerrillaTactics.java   |   2 +-
 .../mage/sets/tenthedition/HailOfArrows.java  |   2 +-
 .../mage/sets/tenthedition/HeartOfLight.java  |   2 +-
 .../mage/sets/tenthedition/HighGround.java    |   2 +-
 .../src/mage/sets/tenthedition/HolyDay.java   |   2 +-
 .../mage/sets/tenthedition/HowlingMine.java   |   2 +-
 .../mage/sets/tenthedition/HuntedWumpus.java  |   2 +-
 .../mage/sets/tenthedition/HurkylsRecall.java |   2 +-
 .../src/mage/sets/tenthedition/Hurricane.java |   2 +-
 .../sets/tenthedition/HypnoticSpecter.java    |   2 +-
 .../sets/tenthedition/KarplusanStrider.java   |   2 +-
 .../tenthedition/KjeldoranRoyalGuard.java     |   2 +-
 .../mage/sets/tenthedition/KnightOfDusk.java  |   2 +-
 .../mage/sets/tenthedition/LavabornMuse.java  |   2 +-
 .../mage/sets/tenthedition/LegacyWeapon.java  |   2 +-
 .../sets/tenthedition/LlanowarSentinel.java   |   2 +-
 .../sets/tenthedition/LlanowarWastes.java     |   2 +-
 .../mage/sets/tenthedition/LoomingShade.java  |   2 +-
 .../mage/sets/tenthedition/LordOfThePit.java  |   2 +-
 .../mage/sets/tenthedition/LoxodonMystic.java |   2 +-
 .../sets/tenthedition/LoxodonWarhammer.java   |   2 +-
 .../src/mage/sets/tenthedition/Lure.java      |   2 +-
 .../mage/sets/tenthedition/MerfolkLooter.java |   2 +-
 .../sets/tenthedition/MidnightRitual.java     |   2 +-
 .../mage/sets/tenthedition/MightOfOaks.java   |   2 +-
 .../src/mage/sets/tenthedition/Millstone.java |   2 +-
 .../mage/sets/tenthedition/MoggFanatic.java   |   2 +-
 .../mage/sets/tenthedition/NaturalSpring.java |   2 +-
 .../src/mage/sets/tenthedition/Nekrataal.java |   2 +-
 .../sets/tenthedition/NoRestForTheWicked.java |   2 +-
 .../sets/tenthedition/NomadMythmaker.java     |   2 +-
 .../sets/tenthedition/OrcishArtillery.java    |   2 +-
 .../mage/sets/tenthedition/Overgrowth.java    |   2 +-
 .../src/mage/sets/tenthedition/Overrun.java   |   2 +-
 .../mage/sets/tenthedition/PaladinEnVec.java  |   2 +-
 .../src/mage/sets/tenthedition/Pariah.java    |   2 +-
 .../sets/tenthedition/PhantomWarrior.java     |   2 +-
 .../sets/tenthedition/PincherBeetles.java     |   2 +-
 .../mage/sets/tenthedition/PithingNeedle.java |   2 +-
 .../mage/sets/tenthedition/Plagiarize.java    |   2 +-
 .../mage/sets/tenthedition/PlagueWind.java    |   2 +-
 .../mage/sets/tenthedition/RainOfTears.java   |   2 +-
 .../mage/sets/tenthedition/RampantGrowth.java |   2 +-
 .../src/mage/sets/tenthedition/Recover.java   |   2 +-
 .../mage/sets/tenthedition/Regeneration.java  |   2 +-
 .../sets/tenthedition/RelentlessAssault.java  |   2 +-
 .../src/mage/sets/tenthedition/Reminisce.java |   2 +-
 .../src/mage/sets/tenthedition/RootMaze.java  |   2 +-
 .../src/mage/sets/tenthedition/Rootwalla.java |   2 +-
 .../sets/tenthedition/RootwaterMatriarch.java |   2 +-
 .../src/mage/sets/tenthedition/SageOwl.java   |   2 +-
 .../mage/sets/tenthedition/SeaMonster.java    |   2 +-
 .../mage/sets/tenthedition/SeedbornMuse.java  |   2 +-
 .../sets/tenthedition/SeismicAssault.java     |   2 +-
 .../mage/sets/tenthedition/Shatterstorm.java  |   2 +-
 .../sets/tenthedition/ShimmeringWings.java    |   2 +-
 .../mage/sets/tenthedition/ShivanReef.java    |   2 +-
 .../sets/tenthedition/SiegeGangCommander.java |   2 +-
 .../sets/tenthedition/SkyshroudRanger.java    |   2 +-
 .../mage/sets/tenthedition/SleeperAgent.java  |   2 +-
 .../src/mage/sets/tenthedition/Smash.java     |   2 +-
 .../mage/sets/tenthedition/SnappingDrake.java |   2 +-
 .../mage/sets/tenthedition/SoulWarden.java    |   2 +-
 .../src/mage/sets/tenthedition/Spellbook.java |   2 +-
 .../mage/sets/tenthedition/SpiritLink.java    |   2 +-
 .../mage/sets/tenthedition/StoryCircle.java   |   2 +-
 .../tenthedition/StrongholdDiscipline.java    |   2 +-
 .../src/mage/sets/tenthedition/Stun.java      |   2 +-
 .../mage/sets/tenthedition/SuddenImpact.java  |   2 +-
 .../mage/sets/tenthedition/SunkenHope.java    |   2 +-
 .../sets/tenthedition/SylvanBasilisk.java     |   2 +-
 .../mage/sets/tenthedition/TangleSpider.java  |   2 +-
 .../src/mage/sets/tenthedition/Telepathy.java |   2 +-
 .../sets/tenthedition/TempestOfLight.java     |   2 +-
 .../sets/tenthedition/ThievingMagpie.java     |   2 +-
 .../sets/tenthedition/TreetopBracers.java     |   2 +-
 .../mage/sets/tenthedition/TrollAscetic.java  |   2 +-
 .../mage/sets/tenthedition/TrueBeliever.java  |   2 +-
 .../src/mage/sets/tenthedition/Twincast.java  |   2 +-
 .../src/mage/sets/tenthedition/Twitch.java    |   2 +-
 .../tenthedition/UncontrollableAnger.java     |   2 +-
 .../sets/tenthedition/UnderworldDreams.java   |   2 +-
 .../mage/sets/tenthedition/VampireBats.java   |   2 +-
 .../mage/sets/tenthedition/VerdantForce.java  |   2 +-
 .../sets/tenthedition/ViashinoSandscout.java  |   2 +-
 .../mage/sets/tenthedition/VoiceOfAll.java    |   2 +-
 .../src/mage/sets/tenthedition/WarpWorld.java |   2 +-
 .../mage/sets/tenthedition/YavimayaCoast.java |   2 +-
 .../mage/sets/thedark/ApprenticeWizard.java   |   2 +-
 .../src/mage/sets/thedark/AshesToAshes.java   |   2 +-
 .../src/mage/sets/thedark/BallLightning.java  |   2 +-
 .../src/mage/sets/thedark/BloodMoon.java      |   2 +-
 Mage.Sets/src/mage/sets/thedark/BogImp.java   |   2 +-
 .../src/mage/sets/thedark/BoneFlute.java      |   2 +-
 .../src/mage/sets/thedark/BrothersOfFire.java |   2 +-
 .../mage/sets/thedark/CarnivorousPlant.java   |   2 +-
 .../src/mage/sets/thedark/CoalGolem.java      |   2 +-
 .../mage/sets/thedark/DarkHeartOfTheWood.java |   2 +-
 .../mage/sets/thedark/DiabolicMachine.java    |   2 +-
 .../src/mage/sets/thedark/EaterOfTheDead.java |   2 +-
 .../mage/sets/thedark/ElvesOfDeepShadow.java  |   2 +-
 Mage.Sets/src/mage/sets/thedark/Exorcist.java |   2 +-
 .../src/mage/sets/thedark/FellwarStone.java   |   2 +-
 .../src/mage/sets/thedark/FireDrake.java      |   2 +-
 Mage.Sets/src/mage/sets/thedark/Flood.java    |   2 +-
 .../mage/sets/thedark/FountainOfYouth.java    |   2 +-
 .../src/mage/sets/thedark/GhostShip.java      |   2 +-
 .../src/mage/sets/thedark/GoblinHero.java     |   2 +-
 .../src/mage/sets/thedark/LandLeeches.java    |   2 +-
 .../src/mage/sets/thedark/ManaClash.java      |   2 +-
 .../src/mage/sets/thedark/ManaVortex.java     |   2 +-
 .../src/mage/sets/thedark/MurkDwellers.java   |   2 +-
 Mage.Sets/src/mage/sets/thedark/Preacher.java |   2 +-
 .../src/mage/sets/thedark/ScavengerFolk.java  |   2 +-
 .../mage/sets/thedark/SistersOfTheFlame.java  |   2 +-
 Mage.Sets/src/mage/sets/thedark/Squire.java   |   2 +-
 .../src/mage/sets/thedark/StoneCalendar.java  |   2 +-
 .../src/mage/sets/thedark/SunkenCity.java     |   2 +-
 .../src/mage/sets/thedark/TormodsCrypt.java   |   2 +-
 Mage.Sets/src/mage/sets/thedark/Tracker.java  |   2 +-
 .../src/mage/sets/thedark/WordOfBinding.java  |   2 +-
 Mage.Sets/src/mage/sets/theros/Annul.java     |   2 +-
 Mage.Sets/src/mage/sets/theros/Demolish.java  |   2 +-
 .../src/mage/sets/theros/DivineVerdict.java   |   2 +-
 Mage.Sets/src/mage/sets/theros/Griptide.java  |   2 +-
 .../src/mage/sets/theros/LastBreath.java      |   2 +-
 Mage.Sets/src/mage/sets/theros/MagmaJet.java  |   2 +-
 .../src/mage/sets/theros/MnemonicWall.java    |   2 +-
 .../src/mage/sets/theros/NessianCourser.java  |   2 +-
 .../src/mage/sets/theros/SavageSurge.java     |   2 +-
 .../src/mage/sets/theros/Thoughtseize.java    |   2 +-
 .../src/mage/sets/theros/TravelersAmulet.java |   2 +-
 .../src/mage/sets/timeshifted/Auratog.java    |   2 +-
 .../sets/timeshifted/AvalancheRiders.java     |   2 +-
 .../mage/sets/timeshifted/AvatarOfWoe.java    |   2 +-
 .../src/mage/sets/timeshifted/AvoidFate.java  |   2 +-
 .../src/mage/sets/timeshifted/BadMoon.java    |   2 +-
 .../src/mage/sets/timeshifted/Browbeat.java   |   2 +-
 .../src/mage/sets/timeshifted/ClawsOfGix.java |   2 +-
 .../src/mage/sets/timeshifted/Cockatrice.java |   2 +-
 .../src/mage/sets/timeshifted/CrawGiant.java  |   2 +-
 .../src/mage/sets/timeshifted/Dandan.java     |   2 +-
 .../mage/sets/timeshifted/DauthiSlayer.java   |   2 +-
 .../sets/timeshifted/DesolationGiant.java     |   2 +-
 .../src/mage/sets/timeshifted/Disenchant.java |   2 +-
 .../mage/sets/timeshifted/Disintegrate.java   |   2 +-
 .../src/mage/sets/timeshifted/Dodecapod.java  |   2 +-
 .../mage/sets/timeshifted/DragonWhelp.java    |   2 +-
 .../sets/timeshifted/EnduringRenewal.java     |   2 +-
 .../sets/timeshifted/EronTheRelentless.java   |   2 +-
 .../sets/timeshifted/EvilEyeOfOrmsByGore.java |   2 +-
 .../mage/sets/timeshifted/FieryJustice.java   |   2 +-
 .../mage/sets/timeshifted/GoblinSnowman.java  |   2 +-
 .../src/mage/sets/timeshifted/HuntingMoa.java |   2 +-
 .../sets/timeshifted/IcatianJavelineers.java  |   2 +-
 .../timeshifted/JolraelEmpressOfBeasts.java   |   2 +-
 .../mage/sets/timeshifted/LightningAngel.java |   2 +-
 .../mage/sets/timeshifted/LordOfAtlantis.java |   2 +-
 .../sets/timeshifted/MerfolkAssassin.java     |   2 +-
 .../mage/sets/timeshifted/MeriekeRiBerit.java |   2 +-
 .../sets/timeshifted/MindlessAutomaton.java   |   2 +-
 .../src/mage/sets/timeshifted/Mirari.java     |   2 +-
 .../mage/sets/timeshifted/MysticSnake.java    |   2 +-
 .../src/mage/sets/timeshifted/NicolBolas.java |   2 +-
 .../sets/timeshifted/OrcishLibrarian.java     |   2 +-
 .../src/mage/sets/timeshifted/PirateShip.java |   2 +-
 .../mage/sets/timeshifted/Resurrection.java   |   2 +-
 .../src/mage/sets/timeshifted/SacredMesa.java |   2 +-
 .../src/mage/sets/timeshifted/SafeHaven.java  |   2 +-
 .../src/mage/sets/timeshifted/Scragnoth.java  |   2 +-
 .../mage/sets/timeshifted/SengirAutocrat.java |   2 +-
 .../mage/sets/timeshifted/SerratedArrows.java |   2 +-
 .../sets/timeshifted/ShadowGuildmage.java     |   2 +-
 .../src/mage/sets/timeshifted/Sindbad.java    |   2 +-
 .../mage/sets/timeshifted/SoltariPriest.java  |   2 +-
 .../mage/sets/timeshifted/SpinedSliver.java   |   2 +-
 .../src/mage/sets/timeshifted/Stormbind.java  |   2 +-
 .../mage/sets/timeshifted/SwampMosquito.java  |   2 +-
 .../src/mage/sets/timeshifted/TheRack.java    |   2 +-
 .../timeshifted/ThornscapeBattlemage.java     |   2 +-
 .../mage/sets/timeshifted/TribalFlames.java   |   2 +-
 .../mage/sets/timeshifted/UncleIstvan.java    |   2 +-
 .../mage/sets/timeshifted/UndeadWarchief.java |   2 +-
 .../sets/timeshifted/UnstableMutation.java    |   2 +-
 .../mage/sets/timeshifted/UthdenTroll.java    |   2 +-
 .../src/mage/sets/timeshifted/Valor.java      |   2 +-
 .../sets/timeshifted/VerdelothTheAncient.java |   2 +-
 .../src/mage/sets/timeshifted/VhatiIlDal.java |   2 +-
 Mage.Sets/src/mage/sets/timeshifted/Void.java |   2 +-
 .../sets/timeshifted/VoidmageProdigy.java     |   2 +-
 .../sets/timeshifted/WhispersOfTheMuse.java   |   2 +-
 .../sets/timeshifted/WildfireEmissary.java    |   2 +-
 .../src/mage/sets/timeshifted/Willbender.java |   2 +-
 .../mage/sets/timeshifted/WitchHunter.java    |   2 +-
 .../mage/sets/timeshifted/WitheredWretch.java |   2 +-
 .../mage/sets/timespiral/AncientGrudge.java   |   2 +-
 .../src/mage/sets/timespiral/Assassinate.java |   2 +-
 .../mage/sets/timespiral/BarbedShocker.java   |   2 +-
 .../sets/timespiral/BogardanHellkite.java     |   2 +-
 .../mage/sets/timespiral/BogardanRager.java   |   2 +-
 .../mage/sets/timespiral/BrineElemental.java  |   2 +-
 .../src/mage/sets/timespiral/Cancel.java      |   2 +-
 .../sets/timespiral/CelestialCrusader.java    |   2 +-
 .../mage/sets/timespiral/ChromaticStar.java   |   2 +-
 .../src/mage/sets/timespiral/CoalStoker.java  |   2 +-
 .../mage/sets/timespiral/CoralTrickster.java  |   2 +-
 .../mage/sets/timespiral/DreadshipReef.java   |   2 +-
 .../mage/sets/timespiral/DreamStalker.java    |   2 +-
 .../timespiral/EndrekSahrMasterBreeder.java   |   2 +-
 .../src/mage/sets/timespiral/FathomSeer.java  |   2 +-
 .../mage/sets/timespiral/FledglingMawcor.java |   2 +-
 .../src/mage/sets/timespiral/FoolsDemise.java |   2 +-
 .../mage/sets/timespiral/FungalReaches.java   |   2 +-
 .../IbHalfheartGoblinTactician.java           |   2 +-
 .../src/mage/sets/timespiral/Ixidron.java     |   2 +-
 .../src/mage/sets/timespiral/KherKeep.java    |   2 +-
 .../sets/timespiral/MagusOfTheMirror.java     |   2 +-
 .../mage/sets/timespiral/MoltenSlagheap.java  |   2 +-
 .../mage/sets/timespiral/OrcishCannonade.java |   2 +-
 .../mage/sets/timespiral/PenumbraSpider.java  |   2 +-
 .../mage/sets/timespiral/PhyrexianTotem.java  |   2 +-
 .../mage/sets/timespiral/ReturnToDust.java    |   2 +-
 .../sets/timespiral/SaltcrustedSteppe.java    |   2 +-
 .../src/mage/sets/timespiral/Smallpox.java    |   2 +-
 .../mage/sets/timespiral/StranglingSoot.java  |   2 +-
 .../sets/timespiral/TendrilsOfCorruption.java |   2 +-
 .../sets/timespiral/TerramorphicExpanse.java  |   2 +-
 .../src/mage/sets/timespiral/ThinkTwice.java  |   2 +-
 .../src/mage/sets/timespiral/UndyingRage.java |   2 +-
 .../mage/sets/timespiral/VoidmageHusher.java  |   2 +-
 .../mage/sets/timespiral/WordOfSeizing.java   |   2 +-
 .../mage/sets/timespiral/YavimayaDryad.java   |   2 +-
 .../mage/sets/torment/AmbassadorLaquatus.java |   2 +-
 .../src/mage/sets/torment/Breakthrough.java   |   2 +-
 .../src/mage/sets/torment/CabalCoffers.java   |   2 +-
 .../src/mage/sets/torment/ChainersEdict.java  |   2 +-
 .../mage/sets/torment/FacelessButcher.java    |   2 +-
 .../src/mage/sets/torment/FieryTemper.java    |   2 +-
 .../src/mage/sets/torment/GhostlyWings.java   |   2 +-
 .../src/mage/sets/torment/GrimLavamancer.java |   2 +-
 .../src/mage/sets/torment/MindSludge.java     |   2 +-
 .../src/mage/sets/torment/MortalCombat.java   |   2 +-
 Mage.Sets/src/mage/sets/torment/Mutilate.java |   2 +-
 .../src/mage/sets/torment/NantukoShade.java   |   2 +-
 .../src/mage/sets/torment/PayNoHeed.java      |   2 +-
 .../src/mage/sets/torment/Plagiarize.java     |   2 +-
 .../src/mage/sets/torment/SengirVampire.java  |   2 +-
 .../mage/sets/torment/SickeningDreams.java    |   2 +-
 .../src/mage/sets/torment/TaintedIsle.java    |   2 +-
 .../src/mage/sets/torment/TerohsFaithful.java |   2 +-
 .../src/mage/sets/uginsfate/AinokTracker.java |   2 +-
 .../mage/sets/uginsfate/AltarOfTheBrood.java  |   2 +-
 .../mage/sets/uginsfate/ArashinWarBeast.java  |   2 +-
 .../src/mage/sets/uginsfate/ArcLightning.java |   2 +-
 .../src/mage/sets/uginsfate/BribersPurse.java |   2 +-
 .../sets/uginsfate/DebilitatingInjury.java    |   2 +-
 .../mage/sets/uginsfate/DragonscaleBoon.java  |   2 +-
 .../mage/sets/uginsfate/FierceInvocation.java |   2 +-
 .../sets/uginsfate/FormlessNurturing.java     |   2 +-
 .../mage/sets/uginsfate/GhostfireBlade.java   |   2 +-
 .../src/mage/sets/uginsfate/GrimHaruspex.java |   2 +-
 .../sets/uginsfate/HewedStoneRetainers.java   |   2 +-
 .../sets/uginsfate/JeeringInstigator.java     |   2 +-
 .../sets/uginsfate/JeskaiInfiltrator.java     |   2 +-
 .../sets/uginsfate/MasteryOfTheUnseen.java    |   2 +-
 .../sets/uginsfate/MysticOfTheHiddenWay.java  |   2 +-
 .../src/mage/sets/uginsfate/RealityShift.java |   2 +-
 .../mage/sets/uginsfate/RuthlessRipper.java   |   2 +-
 .../sets/uginsfate/SmiteTheMonstrous.java     |   2 +-
 .../src/mage/sets/uginsfate/SoulSummons.java  |   2 +-
 .../mage/sets/uginsfate/SultaiEmissary.java   |   2 +-
 .../sets/uginsfate/UginTheSpiritDragon.java   |   2 +-
 .../mage/sets/uginsfate/UginsConstruct.java   |   2 +-
 .../sets/uginsfate/WatcherOfTheRoost.java     |   2 +-
 .../src/mage/sets/uginsfate/Wildcall.java     |   2 +-
 .../mage/sets/uginsfate/WriteIntoBeing.java   |   2 +-
 .../sets/unlimitededition/AirElemental.java   |   2 +-
 .../unlimitededition/AncestralRecall.java     |   2 +-
 .../sets/unlimitededition/AnimateDead.java    |   2 +-
 .../sets/unlimitededition/AnimateWall.java    |   2 +-
 .../sets/unlimitededition/AnkhOfMishra.java   |   2 +-
 .../sets/unlimitededition/Armageddon.java     |   2 +-
 .../sets/unlimitededition/AspectOfWolf.java   |   2 +-
 .../mage/sets/unlimitededition/BadMoon.java   |   2 +-
 .../mage/sets/unlimitededition/Badlands.java  |   2 +-
 .../mage/sets/unlimitededition/Balance.java   |   2 +-
 .../sets/unlimitededition/BasaltMonolith.java |   2 +-
 .../src/mage/sets/unlimitededition/Bayou.java |   2 +-
 .../mage/sets/unlimitededition/Berserk.java   |   2 +-
 .../unlimitededition/BirdsOfParadise.java     |   2 +-
 .../sets/unlimitededition/BlackKnight.java    |   2 +-
 .../sets/unlimitededition/BlackLotus.java     |   2 +-
 .../mage/sets/unlimitededition/BlackVise.java |   2 +-
 .../mage/sets/unlimitededition/BlackWard.java |   2 +-
 .../mage/sets/unlimitededition/Blessing.java  |   2 +-
 .../unlimitededition/BlueElementalBlast.java  |   2 +-
 .../mage/sets/unlimitededition/BogWraith.java |   2 +-
 .../sets/unlimitededition/Braingeyser.java    |   2 +-
 .../mage/sets/unlimitededition/Burrowing.java |   2 +-
 .../mage/sets/unlimitededition/Castle.java    |   2 +-
 .../sets/unlimitededition/CelestialPrism.java |   2 +-
 .../mage/sets/unlimitededition/Channel.java   |   2 +-
 .../mage/sets/unlimitededition/Chaoslace.java |   2 +-
 .../CircleOfProtectionBlack.java              |   2 +-
 .../CircleOfProtectionBlue.java               |   2 +-
 .../CircleOfProtectionGreen.java              |   2 +-
 .../CircleOfProtectionRed.java                |   2 +-
 .../CircleOfProtectionWhite.java              |   2 +-
 .../sets/unlimitededition/ClockworkBeast.java |   2 +-
 .../src/mage/sets/unlimitededition/Clone.java |   2 +-
 .../sets/unlimitededition/Cockatrice.java     |   2 +-
 .../sets/unlimitededition/Conservator.java    |   2 +-
 .../sets/unlimitededition/ControlMagic.java   |   2 +-
 .../sets/unlimitededition/Conversion.java     |   2 +-
 .../sets/unlimitededition/CopperTablet.java   |   2 +-
 .../sets/unlimitededition/CopyArtifact.java   |   2 +-
 .../sets/unlimitededition/Counterspell.java   |   2 +-
 .../mage/sets/unlimitededition/CrawWurm.java  |   2 +-
 .../mage/sets/unlimitededition/Crusade.java   |   2 +-
 .../sets/unlimitededition/CrystalRod.java     |   2 +-
 .../sets/unlimitededition/CursedLand.java     |   2 +-
 .../sets/unlimitededition/DarkRitual.java     |   2 +-
 .../mage/sets/unlimitededition/DeathWard.java |   2 +-
 .../mage/sets/unlimitededition/Deathgrip.java |   2 +-
 .../mage/sets/unlimitededition/Deathlace.java |   2 +-
 .../sets/unlimitededition/DemonicHordes.java  |   2 +-
 .../sets/unlimitededition/DemonicTutor.java   |   2 +-
 .../mage/sets/unlimitededition/DingusEgg.java |   2 +-
 .../sets/unlimitededition/Disenchant.java     |   2 +-
 .../sets/unlimitededition/Disintegrate.java   |   2 +-
 .../unlimitededition/DisruptingScepter.java   |   2 +-
 .../sets/unlimitededition/DragonWhelp.java    |   2 +-
 .../mage/sets/unlimitededition/DrainLife.java |   2 +-
 .../unlimitededition/DrudgeSkeletons.java     |   2 +-
 .../DwarvenDemolitionTeam.java                |   2 +-
 .../unlimitededition/DwarvenWarriors.java     |   2 +-
 .../sets/unlimitededition/EarthElemental.java |   2 +-
 .../mage/sets/unlimitededition/Earthbind.java |   2 +-
 .../sets/unlimitededition/Earthquake.java     |   2 +-
 .../sets/unlimitededition/ElvishArchers.java  |   2 +-
 .../sets/unlimitededition/EvilPresence.java   |   2 +-
 .../mage/sets/unlimitededition/Fastbond.java  |   2 +-
 .../src/mage/sets/unlimitededition/Fear.java  |   2 +-
 .../mage/sets/unlimitededition/Feedback.java  |   2 +-
 .../sets/unlimitededition/FireElemental.java  |   2 +-
 .../mage/sets/unlimitededition/Fireball.java  |   2 +-
 .../sets/unlimitededition/Firebreathing.java  |   2 +-
 .../sets/unlimitededition/Flashfires.java     |   2 +-
 .../mage/sets/unlimitededition/Flight.java    |   2 +-
 .../src/mage/sets/unlimitededition/Fog.java   |   2 +-
 .../sets/unlimitededition/ForceOfNature.java  |   2 +-
 .../sets/unlimitededition/Forcefield.java     |   2 +-
 .../src/mage/sets/unlimitededition/Fork.java  |   2 +-
 .../sets/unlimitededition/FrozenShade.java    |   2 +-
 .../mage/sets/unlimitededition/Fungusaur.java |   2 +-
 .../unlimitededition/GauntletOfMight.java     |   2 +-
 .../sets/unlimitededition/GiantGrowth.java    |   2 +-
 .../sets/unlimitededition/GiantSpider.java    |   2 +-
 .../sets/unlimitededition/GlassesOfUrza.java  |   2 +-
 .../src/mage/sets/unlimitededition/Gloom.java |   2 +-
 .../GoblinBalloonBrigade.java                 |   2 +-
 .../sets/unlimitededition/GoblinKing.java     |   2 +-
 .../unlimitededition/GraniteGargoyle.java     |   2 +-
 .../mage/sets/unlimitededition/GrayOgre.java  |   2 +-
 .../sets/unlimitededition/GrizzlyBears.java   |   2 +-
 .../sets/unlimitededition/HealingSalve.java   |   2 +-
 .../mage/sets/unlimitededition/HillGiant.java |   2 +-
 .../mage/sets/unlimitededition/HolyArmor.java |   2 +-
 .../sets/unlimitededition/HolyStrength.java   |   2 +-
 .../sets/unlimitededition/HowlFromBeyond.java |   2 +-
 .../sets/unlimitededition/HowlingMine.java    |   2 +-
 .../unlimitededition/HurloonMinotaur.java     |   2 +-
 .../mage/sets/unlimitededition/Hurricane.java |   2 +-
 .../unlimitededition/HypnoticSpecter.java     |   2 +-
 .../mage/sets/unlimitededition/IceStorm.java  |   2 +-
 .../sets/unlimitededition/IcyManipulator.java |   2 +-
 .../sets/unlimitededition/InstillEnergy.java  |   2 +-
 .../sets/unlimitededition/Invisibility.java   |   2 +-
 .../mage/sets/unlimitededition/IronStar.java  |   2 +-
 .../sets/unlimitededition/IronclawOrcs.java   |   2 +-
 .../unlimitededition/IronrootTreefolk.java    |   2 +-
 .../unlimitededition/IslandSanctuary.java     |   2 +-
 .../mage/sets/unlimitededition/IvoryCup.java  |   2 +-
 .../sets/unlimitededition/JadeMonolith.java   |   2 +-
 .../sets/unlimitededition/JayemdaeTome.java   |   2 +-
 .../sets/unlimitededition/Juggernaut.java     |   2 +-
 .../src/mage/sets/unlimitededition/Jump.java  |   2 +-
 .../src/mage/sets/unlimitededition/Karma.java |   2 +-
 .../sets/unlimitededition/KormusBell.java     |   2 +-
 .../src/mage/sets/unlimitededition/Lance.java |   2 +-
 .../mage/sets/unlimitededition/LeyDruid.java  |   2 +-
 .../sets/unlimitededition/LibraryOfLeng.java  |   2 +-
 .../src/mage/sets/unlimitededition/Lich.java  |   2 +-
 .../mage/sets/unlimitededition/Lifeforce.java |   2 +-
 .../mage/sets/unlimitededition/Lifelace.java  |   2 +-
 .../mage/sets/unlimitededition/Lifetap.java   |   2 +-
 .../sets/unlimitededition/LightningBolt.java  |   2 +-
 .../sets/unlimitededition/LivingArtifact.java |   2 +-
 .../sets/unlimitededition/LivingLands.java    |   2 +-
 .../sets/unlimitededition/LlanowarElves.java  |   2 +-
 .../sets/unlimitededition/LordOfAtlantis.java |   2 +-
 .../sets/unlimitededition/LordOfThePit.java   |   2 +-
 .../src/mage/sets/unlimitededition/Lure.java  |   2 +-
 .../sets/unlimitededition/MahamotiDjinn.java  |   2 +-
 .../mage/sets/unlimitededition/ManaFlare.java |   2 +-
 .../mage/sets/unlimitededition/ManaShort.java |   2 +-
 .../mage/sets/unlimitededition/ManaVault.java |   2 +-
 .../mage/sets/unlimitededition/Manabarbs.java |   2 +-
 .../mage/sets/unlimitededition/Meekstone.java |   2 +-
 .../MerfolkOfThePearlTrident.java             |   2 +-
 .../mage/sets/unlimitededition/MindTwist.java |   2 +-
 .../unlimitededition/MonssGoblinRaiders.java  |   2 +-
 .../sets/unlimitededition/MoxEmerald.java     |   2 +-
 .../mage/sets/unlimitededition/MoxJet.java    |   2 +-
 .../mage/sets/unlimitededition/MoxPearl.java  |   2 +-
 .../mage/sets/unlimitededition/MoxRuby.java   |   2 +-
 .../sets/unlimitededition/MoxSapphire.java    |   2 +-
 .../unlimitededition/NaturalSelection.java    |   2 +-
 .../sets/unlimitededition/NetherShadow.java   |   2 +-
 .../unlimitededition/NevinyrralsDisk.java     |   2 +-
 .../mage/sets/unlimitededition/Nightmare.java |   2 +-
 .../unlimitededition/NorthernPaladin.java     |   2 +-
 .../sets/unlimitededition/ObsianusGolem.java  |   2 +-
 .../unlimitededition/OrcishArtillery.java     |   2 +-
 .../unlimitededition/OrcishOriflamme.java     |   2 +-
 .../mage/sets/unlimitededition/Paralyze.java  |   2 +-
 .../sets/unlimitededition/PearledUnicorn.java |   2 +-
 .../sets/unlimitededition/Pestilence.java     |   2 +-
 .../unlimitededition/PhantasmalForces.java    |   2 +-
 .../unlimitededition/PhantasmalTerrain.java   |   2 +-
 .../sets/unlimitededition/PhantomMonster.java |   2 +-
 .../sets/unlimitededition/PirateShip.java     |   2 +-
 .../mage/sets/unlimitededition/Plateau.java   |   2 +-
 .../mage/sets/unlimitededition/PowerSink.java |   2 +-
 .../unlimitededition/ProdigalSorcerer.java    |   2 +-
 .../sets/unlimitededition/PsionicBlast.java   |   2 +-
 .../sets/unlimitededition/PsychicVenom.java   |   2 +-
 .../mage/sets/unlimitededition/RaiseDead.java |   2 +-
 .../unlimitededition/RedElementalBlast.java   |   2 +-
 .../mage/sets/unlimitededition/RedWard.java   |   2 +-
 .../sets/unlimitededition/Regeneration.java   |   2 +-
 .../mage/sets/unlimitededition/Regrowth.java  |   2 +-
 .../sets/unlimitededition/Resurrection.java   |   2 +-
 .../sets/unlimitededition/ReverseDamage.java  |   2 +-
 .../sets/unlimitededition/Righteousness.java  |   2 +-
 .../unlimitededition/RocOfKherRidges.java     |   2 +-
 .../mage/sets/unlimitededition/RodOfRuin.java |   2 +-
 .../sets/unlimitededition/RoyalAssassin.java  |   2 +-
 .../sets/unlimitededition/SamiteHealer.java   |   2 +-
 .../mage/sets/unlimitededition/Savannah.java  |   2 +-
 .../sets/unlimitededition/SavannahLions.java  |   2 +-
 .../sets/unlimitededition/ScatheZombies.java  |   2 +-
 .../unlimitededition/ScavengingGhoul.java     |   2 +-
 .../mage/sets/unlimitededition/Scrubland.java |   2 +-
 .../sets/unlimitededition/ScrybSprites.java   |   2 +-
 .../sets/unlimitededition/SeaSerpent.java     |   2 +-
 .../sets/unlimitededition/SedgeTroll.java     |   2 +-
 .../sets/unlimitededition/SengirVampire.java  |   2 +-
 .../sets/unlimitededition/SerraAngel.java     |   2 +-
 .../sets/unlimitededition/ShanodinDryads.java |   2 +-
 .../mage/sets/unlimitededition/Shatter.java   |   2 +-
 .../sets/unlimitededition/ShivanDragon.java   |   2 +-
 .../mage/sets/unlimitededition/Sinkhole.java  |   2 +-
 .../sets/unlimitededition/SirensCall.java     |   2 +-
 .../src/mage/sets/unlimitededition/Smoke.java |   2 +-
 .../mage/sets/unlimitededition/SolRing.java   |   2 +-
 .../mage/sets/unlimitededition/SoulNet.java   |   2 +-
 .../sets/unlimitededition/SpellBlast.java     |   2 +-
 .../mage/sets/unlimitededition/Stasis.java    |   2 +-
 .../sets/unlimitededition/StealArtifact.java  |   2 +-
 .../sets/unlimitededition/StoneGiant.java     |   2 +-
 .../mage/sets/unlimitededition/StoneRain.java |   2 +-
 .../sets/unlimitededition/StreamOfLife.java   |   2 +-
 .../unlimitededition/SunglassesOfUrza.java    |   2 +-
 .../unlimitededition/SwordsToPlowshares.java  |   2 +-
 .../src/mage/sets/unlimitededition/Taiga.java |   2 +-
 .../mage/sets/unlimitededition/Terror.java    |   2 +-
 .../mage/sets/unlimitededition/TheHive.java   |   2 +-
 .../unlimitededition/ThicketBasilisk.java     |   2 +-
 .../sets/unlimitededition/Thoughtlace.java    |   2 +-
 .../sets/unlimitededition/ThroneOfBone.java   |   2 +-
 .../mage/sets/unlimitededition/TimeWalk.java  |   2 +-
 .../sets/unlimitededition/Timetwister.java    |   2 +-
 .../sets/unlimitededition/Tranquility.java    |   2 +-
 .../sets/unlimitededition/TropicalIsland.java |   2 +-
 .../mage/sets/unlimitededition/Tsunami.java   |   2 +-
 .../mage/sets/unlimitededition/Tundra.java    |   2 +-
 .../mage/sets/unlimitededition/Tunnel.java    |   2 +-
 .../TwoHeadedGiantOfForiys.java               |   2 +-
 .../sets/unlimitededition/UndergroundSea.java |   2 +-
 .../sets/unlimitededition/UnholyStrength.java |   2 +-
 .../mage/sets/unlimitededition/Unsummon.java  |   2 +-
 .../sets/unlimitededition/UthdenTroll.java    |   2 +-
 .../unlimitededition/VerduranEnchantress.java |   2 +-
 .../mage/sets/unlimitededition/WallOfAir.java |   2 +-
 .../sets/unlimitededition/WallOfBone.java     |   2 +-
 .../sets/unlimitededition/WallOfBrambles.java |   2 +-
 .../sets/unlimitededition/WallOfFire.java     |   2 +-
 .../mage/sets/unlimitededition/WallOfIce.java |   2 +-
 .../sets/unlimitededition/WallOfStone.java    |   2 +-
 .../sets/unlimitededition/WallOfSwords.java   |   2 +-
 .../sets/unlimitededition/WallOfWater.java    |   2 +-
 .../sets/unlimitededition/WallOfWood.java     |   2 +-
 .../sets/unlimitededition/WarMammoth.java     |   2 +-
 .../sets/unlimitededition/WarpArtifact.java   |   2 +-
 .../sets/unlimitededition/WaterElemental.java |   2 +-
 .../mage/sets/unlimitededition/Weakness.java  |   2 +-
 .../src/mage/sets/unlimitededition/Web.java   |   2 +-
 .../sets/unlimitededition/WheelOfFortune.java |   2 +-
 .../sets/unlimitededition/WhiteKnight.java    |   2 +-
 .../mage/sets/unlimitededition/WhiteWard.java |   2 +-
 .../sets/unlimitededition/WildGrowth.java     |   2 +-
 .../sets/unlimitededition/WillOTheWisp.java   |   2 +-
 .../mage/sets/unlimitededition/WinterOrb.java |   2 +-
 .../sets/unlimitededition/WoodenSphere.java   |   2 +-
 .../sets/unlimitededition/WrathOfGod.java     |   2 +-
 .../sets/unlimitededition/ZombieMaster.java   |   2 +-
 .../src/mage/sets/urzasdestiny/Compost.java   |   2 +-
 .../mage/sets/urzasdestiny/ElvishPiper.java   |   2 +-
 .../sets/urzasdestiny/EmperorCrocodile.java   |   2 +-
 .../src/mage/sets/urzasdestiny/Eradicate.java |   2 +-
 .../mage/sets/urzasdestiny/HulkingOgre.java   |   2 +-
 .../mage/sets/urzasdestiny/Impatience.java    |   2 +-
 .../src/mage/sets/urzasdestiny/JunkDiver.java |   2 +-
 .../sets/urzasdestiny/KeldonChampion.java     |   2 +-
 .../mage/sets/urzasdestiny/MantisEngine.java  |   2 +-
 .../mage/sets/urzasdestiny/MasterHealer.java  |   2 +-
 .../mage/sets/urzasdestiny/Opposition.java    |   2 +-
 .../src/mage/sets/urzasdestiny/PowderKeg.java |   2 +-
 .../src/mage/sets/urzasdestiny/Quash.java     |   2 +-
 .../mage/sets/urzasdestiny/RavenousRats.java  |   2 +-
 .../sets/urzasdestiny/RecklessAbandon.java    |   2 +-
 .../mage/sets/urzasdestiny/Sanctimony.java    |   2 +-
 .../src/mage/sets/urzasdestiny/Scour.java     |   2 +-
 .../src/mage/sets/urzasdestiny/SoulFeast.java |   2 +-
 .../mage/sets/urzasdestiny/SowingSalt.java    |   2 +-
 .../src/mage/sets/urzasdestiny/Splinter.java  |   2 +-
 .../mage/sets/urzasdestiny/StorageMatrix.java |   2 +-
 .../mage/sets/urzasdestiny/TauntingElf.java   |   2 +-
 .../mage/sets/urzasdestiny/TemporalAdept.java |   2 +-
 .../sets/urzasdestiny/ThievingMagpie.java     |   2 +-
 .../mage/sets/urzasdestiny/ThranGolem.java    |   2 +-
 .../mage/sets/urzasdestiny/TrumpetBlast.java  |   2 +-
 .../mage/sets/urzasdestiny/YavimayaElder.java |   2 +-
 .../urzasdestiny/YavimayaEnchantress.java     |   2 +-
 .../sets/urzasdestiny/YawgmothsBargain.java   |   2 +-
 .../mage/sets/urzaslegacy/BeastOfBurden.java  |   2 +-
 .../src/mage/sets/urzaslegacy/Crawlspace.java |   2 +-
 .../mage/sets/urzaslegacy/DefenseGrid.java    |   2 +-
 .../mage/sets/urzaslegacy/FaerieConclave.java |   2 +-
 .../mage/sets/urzaslegacy/FleetingImage.java  |   2 +-
 .../urzaslegacy/ForbiddingWatchtower.java     |   2 +-
 .../sets/urzaslegacy/GhituEncampment.java     |   2 +-
 .../mage/sets/urzaslegacy/GhituFireEater.java |   2 +-
 .../mage/sets/urzaslegacy/GiantCockroach.java |   2 +-
 .../src/mage/sets/urzaslegacy/LavaAxe.java    |   2 +-
 .../src/mage/sets/urzaslegacy/Levitation.java |   2 +-
 .../mage/sets/urzaslegacy/MightOfOaks.java    |   2 +-
 .../mage/sets/urzaslegacy/PlagueBeetle.java   |   2 +-
 .../sets/urzaslegacy/QuicksilverAmulet.java   |   2 +-
 .../mage/sets/urzaslegacy/SpawningPool.java   |   2 +-
 Mage.Sets/src/mage/sets/urzaslegacy/Swat.java |   2 +-
 .../mage/sets/urzaslegacy/TreetopVillage.java |   2 +-
 .../mage/sets/urzaslegacy/YavimayaWurm.java   |   2 +-
 .../src/mage/sets/urzassaga/Abundance.java    |   2 +-
 .../sets/urzassaga/AcademyResearchers.java    |   2 +-
 Mage.Sets/src/mage/sets/urzassaga/Annul.java  |   2 +-
 Mage.Sets/src/mage/sets/urzassaga/Befoul.java |   2 +-
 .../mage/sets/urzassaga/BlanchwoodArmor.java  |   2 +-
 .../src/mage/sets/urzassaga/BogRaiders.java   |   2 +-
 .../src/mage/sets/urzassaga/Cathodion.java    |   2 +-
 .../src/mage/sets/urzassaga/CoralMerfolk.java |   2 +-
 .../src/mage/sets/urzassaga/Corrupt.java      |   2 +-
 .../mage/sets/urzassaga/CrystalChimes.java    |   2 +-
 .../src/mage/sets/urzassaga/DarkRitual.java   |   2 +-
 .../src/mage/sets/urzassaga/DarkestHour.java  |   2 +-
 .../src/mage/sets/urzassaga/Disenchant.java   |   2 +-
 .../src/mage/sets/urzassaga/Disorder.java     |   2 +-
 .../src/mage/sets/urzassaga/DragonBlood.java  |   2 +-
 Mage.Sets/src/mage/sets/urzassaga/Duress.java |   2 +-
 .../src/mage/sets/urzassaga/Exhaustion.java   |   2 +-
 .../mage/sets/urzassaga/GloriousAnthem.java   |   2 +-
 .../mage/sets/urzassaga/GoblinSpelunkers.java |   2 +-
 .../src/mage/sets/urzassaga/GreaterGood.java  |   2 +-
 .../src/mage/sets/urzassaga/HealingSalve.java |   2 +-
 .../src/mage/sets/urzassaga/HeatRay.java      |   2 +-
 .../mage/sets/urzassaga/HorseshoeCrab.java    |   2 +-
 .../src/mage/sets/urzassaga/LoomingShade.java |   2 +-
 .../src/mage/sets/urzassaga/Pacifism.java     |   2 +-
 .../sets/urzassaga/PhyrexianColossus.java     |   2 +-
 .../mage/sets/urzassaga/PhyrexianGhoul.java   |   2 +-
 .../src/mage/sets/urzassaga/PowerSink.java    |   2 +-
 .../sets/urzassaga/PresenceOfTheMaster.java   |   2 +-
 .../src/mage/sets/urzassaga/Reprocess.java    |   2 +-
 .../mage/sets/urzassaga/SanctumGuardian.java  |   2 +-
 .../src/mage/sets/urzassaga/ScoriaWurm.java   |   2 +-
 .../mage/sets/urzassaga/SeasonedMarshal.java  |   2 +-
 .../mage/sets/urzassaga/SerrasEmbrace.java    |   2 +-
 .../mage/sets/urzassaga/ShivanHellkite.java   |   2 +-
 .../src/mage/sets/urzassaga/ShivsEmbrace.java |   2 +-
 .../mage/sets/urzassaga/ShowerOfSparks.java   |   2 +-
 .../mage/sets/urzassaga/SkirgeFamiliar.java   |   2 +-
 .../mage/sets/urzassaga/ThunderingGiant.java  |   2 +-
 .../mage/sets/urzassaga/ViashinoRunner.java   |   2 +-
 .../src/mage/sets/urzassaga/Victimize.java    |   2 +-
 .../src/mage/sets/urzassaga/VoltaicKey.java   |   2 +-
 .../src/mage/sets/urzassaga/Whirlwind.java    |   2 +-
 .../src/mage/sets/venservskoth/Anger.java     |   2 +-
 .../sets/venservskoth/ArmillarySphere.java    |   2 +-
 .../src/mage/sets/venservskoth/AuguryOwl.java |   2 +-
 .../sets/venservskoth/AzoriusChancery.java    |   2 +-
 .../sets/venservskoth/BloodfireColossus.java  |   2 +-
 .../mage/sets/venservskoth/BloodfireKavu.java |   2 +-
 .../mage/sets/venservskoth/CacheRaiders.java  |   2 +-
 .../sets/venservskoth/ChartoothCougar.java    |   2 +-
 .../src/mage/sets/venservskoth/Clone.java     |   2 +-
 .../mage/sets/venservskoth/CosisRavager.java  |   2 +-
 .../sets/venservskoth/CrypticAnnelid.java     |   2 +-
 .../sets/venservskoth/DownhillCharge.java     |   2 +-
 .../mage/sets/venservskoth/EarthServant.java  |   2 +-
 .../sets/venservskoth/FieryHellhound.java     |   2 +-
 .../mage/sets/venservskoth/GeyserGlider.java  |   2 +-
 .../mage/sets/venservskoth/JawsOfStone.java   |   2 +-
 .../sets/venservskoth/JeditsDragoons.java     |   2 +-
 .../sets/venservskoth/JourneyersKite.java     |   2 +-
 .../sets/venservskoth/KorCartographer.java    |   2 +-
 .../sets/venservskoth/KothOfTheHammer.java    |   2 +-
 .../mage/sets/venservskoth/Lithophage.java    |   2 +-
 .../sets/venservskoth/MinamoSightbender.java  |   2 +-
 .../sets/venservskoth/MistmeadowWitch.java    |   2 +-
 .../sets/venservskoth/NeurokInvisimancer.java |   2 +-
 .../mage/sets/venservskoth/NewBenalia.java    |   2 +-
 .../mage/sets/venservskoth/OblivionRing.java  |   2 +-
 .../mage/sets/venservskoth/PathToExile.java   |   2 +-
 .../mage/sets/venservskoth/PilgrimsEye.java   |   2 +-
 .../mage/sets/venservskoth/PlatedGeopede.java |   2 +-
 .../src/mage/sets/venservskoth/Preordain.java |   2 +-
 .../mage/sets/venservskoth/PrimalPlasma.java  |   2 +-
 .../mage/sets/venservskoth/PygmyPyrosaur.java |   2 +-
 .../sets/venservskoth/RevokeExistence.java    |   2 +-
 .../mage/sets/venservskoth/SafePassage.java   |   2 +-
 .../mage/sets/venservskoth/ScrollThief.java   |   2 +-
 .../mage/sets/venservskoth/SearingBlaze.java  |   2 +-
 .../mage/sets/venservskoth/SeismicStrike.java |   2 +-
 .../mage/sets/venservskoth/SejiriRefuge.java  |   2 +-
 .../mage/sets/venservskoth/SigilOfSleep.java  |   2 +-
 .../src/mage/sets/venservskoth/SkySpirit.java |   2 +-
 .../mage/sets/venservskoth/SlithStrider.java  |   2 +-
 .../sets/venservskoth/SoaringSeacliff.java    |   2 +-
 .../sets/venservskoth/SphinxOfUthuun.java     |   2 +-
 .../mage/sets/venservskoth/SpireBarrage.java  |   2 +-
 .../sets/venservskoth/SteelOfTheGodhead.java  |   2 +-
 .../mage/sets/venservskoth/StoneGiant.java    |   2 +-
 .../mage/sets/venservskoth/SunblastAngel.java |   2 +-
 .../sets/venservskoth/VenserTheSojourner.java |   2 +-
 .../sets/venservskoth/VolleyOfBoulders.java   |   2 +-
 .../sets/venservskoth/VulshokBattlegear.java  |   2 +-
 .../sets/venservskoth/VulshokBerserker.java   |   2 +-
 .../sets/venservskoth/VulshokMorningstar.java |   2 +-
 .../sets/venservskoth/VulshokSorcerer.java    |   2 +-
 .../mage/sets/venservskoth/WallOfDenial.java  |   2 +-
 .../sets/venservskoth/WayfarersBauble.java    |   2 +-
 .../mage/sets/venservskoth/WhitemaneLion.java |   2 +-
 .../mage/sets/venservskoth/Windreaver.java    |   2 +-
 .../sets/vintagemasters/AEtherMutation.java   |   2 +-
 .../mage/sets/vintagemasters/Afterlife.java   |   2 +-
 .../mage/sets/vintagemasters/Aftershock.java  |   2 +-
 .../sets/vintagemasters/AkromasBlessing.java  |   2 +-
 .../sets/vintagemasters/AncestralRecall.java  |   2 +-
 .../mage/sets/vintagemasters/AncientTomb.java |   2 +-
 .../mage/sets/vintagemasters/AnimateDead.java |   2 +-
 .../sets/vintagemasters/AnkhOfMishra.java     |   2 +-
 .../mage/sets/vintagemasters/Aquamoeba.java   |   2 +-
 .../sets/vintagemasters/ArmadilloCloak.java   |   2 +-
 .../mage/sets/vintagemasters/Armageddon.java  |   2 +-
 .../sets/vintagemasters/ArmorOfThorns.java    |   2 +-
 .../sets/vintagemasters/ArrogantWurm.java     |   2 +-
 .../mage/sets/vintagemasters/AstralSlide.java |   2 +-
 .../mage/sets/vintagemasters/BadRiver.java    |   2 +-
 .../mage/sets/vintagemasters/Badlands.java    |   2 +-
 .../src/mage/sets/vintagemasters/Balance.java |   2 +-
 .../sets/vintagemasters/BalefulForce.java     |   2 +-
 .../sets/vintagemasters/BalefulStrix.java     |   2 +-
 .../mage/sets/vintagemasters/BarrenMoor.java  |   2 +-
 .../vintagemasters/BasandraBattleSeraph.java  |   2 +-
 .../sets/vintagemasters/BaskingRootwalla.java |   2 +-
 .../sets/vintagemasters/BattleScreech.java    |   2 +-
 .../src/mage/sets/vintagemasters/Bayou.java   |   2 +-
 .../sets/vintagemasters/BazaarOfBaghdad.java  |   2 +-
 .../sets/vintagemasters/BeetlebackChief.java  |   2 +-
 .../sets/vintagemasters/BenalishTrapper.java  |   2 +-
 .../src/mage/sets/vintagemasters/Berserk.java |   2 +-
 .../mage/sets/vintagemasters/BlackLotus.java  |   2 +-
 .../mage/sets/vintagemasters/Blastoderm.java  |   2 +-
 .../sets/vintagemasters/BlazingSpecter.java   |   2 +-
 .../mage/sets/vintagemasters/BrainFreeze.java |   2 +-
 .../mage/sets/vintagemasters/Brainstorm.java  |   2 +-
 .../sets/vintagemasters/BreathOfLife.java     |   2 +-
 .../sets/vintagemasters/BrilliantHalo.java    |   2 +-
 .../sets/vintagemasters/BrindleShoat.java     |   2 +-
 .../sets/vintagemasters/BurningOfXinye.java   |   2 +-
 .../mage/sets/vintagemasters/BurningWish.java |   2 +-
 .../mage/sets/vintagemasters/CabalRitual.java |   2 +-
 .../mage/sets/vintagemasters/CalderaLake.java |   2 +-
 .../mage/sets/vintagemasters/Carnophage.java  |   2 +-
 .../sets/vintagemasters/ChainLightning.java   |   2 +-
 .../src/mage/sets/vintagemasters/Channel.java |   2 +-
 .../sets/vintagemasters/ChartoothCougar.java  |   2 +-
 .../sets/vintagemasters/ChimericIdol.java     |   2 +-
 .../sets/vintagemasters/ChokingTethers.java   |   2 +-
 .../sets/vintagemasters/CircularLogic.java    |   2 +-
 .../sets/vintagemasters/Clickslither.java     |   2 +-
 .../mage/sets/vintagemasters/CloudDjinn.java  |   2 +-
 .../sets/vintagemasters/CloudOfFaeries.java   |   2 +-
 .../sets/vintagemasters/CoercivePortal.java   |   2 +-
 .../sets/vintagemasters/ControlMagic.java     |   2 +-
 .../sets/vintagemasters/Counterspell.java     |   2 +-
 .../sets/vintagemasters/CrovaxTheCursed.java  |   2 +-
 .../sets/vintagemasters/CursedScroll.java     |   2 +-
 .../mage/sets/vintagemasters/DackFayden.java  |   2 +-
 .../sets/vintagemasters/DarkHatchling.java    |   2 +-
 .../mage/sets/vintagemasters/DarkRitual.java  |   2 +-
 .../sets/vintagemasters/DauthiMercenary.java  |   2 +-
 .../mage/sets/vintagemasters/DeathGrasp.java  |   2 +-
 .../sets/vintagemasters/DeathreapRitual.java  |   2 +-
 .../vintagemasters/DeathsHeadBuzzard.java     |   2 +-
 .../sets/vintagemasters/DeepAnalysis.java     |   2 +-
 .../sets/vintagemasters/DemonicTutor.java     |   2 +-
 .../sets/vintagemasters/DerangedHermit.java   |   2 +-
 .../sets/vintagemasters/DesertTwister.java    |   2 +-
 .../vintagemasters/DrakestownForgotten.java   |   2 +-
 .../sets/vintagemasters/DreampodDruid.java    |   2 +-
 .../vintagemasters/EdricSpymasterOfTrest.java |   2 +-
 .../sets/vintagemasters/ElephantGuide.java    |   2 +-
 .../sets/vintagemasters/ElvishAberration.java |   2 +-
 .../mage/sets/vintagemasters/Ephemeron.java   |   2 +-
 .../mage/sets/vintagemasters/ErhnamDjinn.java |   2 +-
 .../sets/vintagemasters/EternalDragon.java    |   2 +-
 .../src/mage/sets/vintagemasters/Exile.java   |   2 +-
 .../src/mage/sets/vintagemasters/Expunge.java |   2 +-
 .../sets/vintagemasters/FactOrFiction.java    |   2 +-
 .../sets/vintagemasters/FallenAskari.java     |   2 +-
 .../src/mage/sets/vintagemasters/Falter.java  |   2 +-
 .../src/mage/sets/vintagemasters/Famine.java  |   2 +-
 .../mage/sets/vintagemasters/Fastbond.java    |   2 +-
 .../mage/sets/vintagemasters/Fireblast.java   |   2 +-
 .../sets/vintagemasters/FiresOfYavimaya.java  |   2 +-
 .../sets/vintagemasters/FlametongueKavu.java  |   2 +-
 .../sets/vintagemasters/FledglingDjinn.java   |   2 +-
 .../mage/sets/vintagemasters/FloodPlain.java  |   2 +-
 .../sets/vintagemasters/FlowstoneHellion.java |   2 +-
 .../sets/vintagemasters/Flusterstorm.java     |   2 +-
 .../mage/sets/vintagemasters/ForceOfWill.java |   2 +-
 .../sets/vintagemasters/ForgottenCave.java    |   2 +-
 .../sets/vintagemasters/FranticSearch.java    |   2 +-
 .../mage/sets/vintagemasters/FutureSight.java |   2 +-
 .../sets/vintagemasters/FyndhornElves.java    |   2 +-
 .../sets/vintagemasters/GaeasEmbrace.java     |   2 +-
 .../src/mage/sets/vintagemasters/Gamble.java  |   2 +-
 .../src/mage/sets/vintagemasters/Genesis.java |   2 +-
 .../vintagemasters/GerrardsBattleCry.java     |   2 +-
 .../mage/sets/vintagemasters/GiantMantis.java |   2 +-
 .../sets/vintagemasters/GiantStrength.java    |   2 +-
 .../mage/sets/vintagemasters/Gigapede.java    |   2 +-
 .../mage/sets/vintagemasters/GoblinGoon.java  |   2 +-
 .../sets/vintagemasters/GoblinLackey.java     |   2 +-
 .../sets/vintagemasters/GoblinMatron.java     |   2 +-
 .../sets/vintagemasters/GoblinPiledriver.java |   2 +-
 .../sets/vintagemasters/GoblinRingleader.java |   2 +-
 .../sets/vintagemasters/GoblinTrenches.java   |   2 +-
 .../sets/vintagemasters/GoblinWarchief.java   |   2 +-
 .../sets/vintagemasters/GrandColiseum.java    |   2 +-
 .../mage/sets/vintagemasters/Grasslands.java  |   2 +-
 .../vintagemasters/GrenzoDungeonWarden.java   |   2 +-
 .../mage/sets/vintagemasters/GrizzlyFate.java |   2 +-
 .../src/mage/sets/vintagemasters/Gush.java    |   2 +-
 .../mage/sets/vintagemasters/HermitDruid.java |   2 +-
 .../mage/sets/vintagemasters/HighTide.java    |   2 +-
 .../sets/vintagemasters/HymnToTourach.java    |   2 +-
 .../src/mage/sets/vintagemasters/Ichorid.java |   2 +-
 .../mage/sets/vintagemasters/IvoryTower.java  |   2 +-
 .../vintagemasters/JaceTheMindSculptor.java   |   2 +-
 .../vintagemasters/JarethLeonineTitan.java    |   2 +-
 .../mage/sets/vintagemasters/JungleWurm.java  |   2 +-
 .../mage/sets/vintagemasters/KarmicGuide.java |   2 +-
 .../sets/vintagemasters/KarnSilverGolem.java  |   2 +-
 .../mage/sets/vintagemasters/KeeneyeAven.java |   2 +-
 .../sets/vintagemasters/KeldonNecropolis.java |   2 +-
 .../mage/sets/vintagemasters/Kezzerdrix.java  |   2 +-
 .../mage/sets/vintagemasters/KillerWhale.java |   2 +-
 .../src/mage/sets/vintagemasters/Kindle.java  |   2 +-
 .../KongmingSleepingDragon.java               |   2 +-
 .../sets/vintagemasters/KrosanTusker.java     |   2 +-
 .../vintagemasters/LaquatussChampion.java     |   2 +-
 .../sets/vintagemasters/LightningRift.java    |   2 +-
 .../sets/vintagemasters/LionsEyeDiamond.java  |   2 +-
 .../mage/sets/vintagemasters/LivingDeath.java |   2 +-
 .../sets/vintagemasters/LonelySandbar.java    |   2 +-
 .../mage/sets/vintagemasters/LurkingEvil.java |   2 +-
 .../sets/vintagemasters/MagisterOfWorth.java  |   2 +-
 .../src/mage/sets/vintagemasters/ManOWar.java |   2 +-
 .../mage/sets/vintagemasters/ManaPrism.java   |   2 +-
 .../mage/sets/vintagemasters/ManaVault.java   |   2 +-
 .../mage/sets/vintagemasters/Masticore.java   |   2 +-
 .../mage/sets/vintagemasters/MemoryJar.java   |   2 +-
 .../sets/vintagemasters/MesmericFiend.java    |   2 +-
 .../mage/sets/vintagemasters/Morphling.java   |   2 +-
 .../sets/vintagemasters/MountainValley.java   |   2 +-
 .../mage/sets/vintagemasters/MoxEmerald.java  |   2 +-
 .../src/mage/sets/vintagemasters/MoxJet.java  |   2 +-
 .../mage/sets/vintagemasters/MoxPearl.java    |   2 +-
 .../src/mage/sets/vintagemasters/MoxRuby.java |   2 +-
 .../mage/sets/vintagemasters/MoxSapphire.java |   2 +-
 .../MuzzioVisionaryArchitect.java             |   2 +-
 .../sets/vintagemasters/MysticZealot.java     |   2 +-
 .../mage/sets/vintagemasters/NaturesLore.java |   2 +-
 .../sets/vintagemasters/Necropotence.java     |   2 +-
 .../sets/vintagemasters/NevinyrralsDisk.java  |   2 +-
 .../vintagemasters/NightscapeFamiliar.java    |   2 +-
 .../sets/vintagemasters/NobleTemplar.java     |   2 +-
 .../sets/vintagemasters/NostalgicDreams.java  |   2 +-
 .../src/mage/sets/vintagemasters/NullRod.java |   2 +-
 .../sets/vintagemasters/OathOfDruids.java     |   2 +-
 .../sets/vintagemasters/ObsessiveSearch.java  |   2 +-
 .../sets/vintagemasters/OrcishLumberjack.java |   2 +-
 .../mage/sets/vintagemasters/Palinchron.java  |   2 +-
 .../sets/vintagemasters/ParallaxWave.java     |   2 +-
 .../mage/sets/vintagemasters/Paralyze.java    |   2 +-
 .../sets/vintagemasters/PenumbraWurm.java     |   2 +-
 .../sets/vintagemasters/PhantomNomad.java     |   2 +-
 .../sets/vintagemasters/PhyrexianDefiler.java |   2 +-
 .../vintagemasters/PiannaNomadCaptain.java    |   2 +-
 .../mage/sets/vintagemasters/PineBarrens.java |   2 +-
 .../src/mage/sets/vintagemasters/Plateau.java |   2 +-
 .../mage/sets/vintagemasters/PowerSink.java   |   2 +-
 .../sets/vintagemasters/PredatorFlagship.java |   2 +-
 .../sets/vintagemasters/PropheticBolt.java    |   2 +-
 .../src/mage/sets/vintagemasters/Provoke.java |   2 +-
 .../mage/sets/vintagemasters/PutridImp.java   |   2 +-
 .../sets/vintagemasters/RadiantArchangel.java |   2 +-
 .../sets/vintagemasters/RadiantsJudgment.java |   2 +-
 .../sets/vintagemasters/RealmSeekers.java     |   2 +-
 .../mage/sets/vintagemasters/Reanimate.java   |   2 +-
 .../sets/vintagemasters/RecklessCharge.java   |   2 +-
 .../vintagemasters/RecurringNightmare.java    |   2 +-
 .../mage/sets/vintagemasters/Regrowth.java    |   2 +-
 .../sets/vintagemasters/RenewedFaith.java     |   2 +-
 .../src/mage/sets/vintagemasters/Repel.java   |   2 +-
 .../src/mage/sets/vintagemasters/Rescind.java |   2 +-
 .../sets/vintagemasters/RevivingVapors.java   |   2 +-
 .../mage/sets/vintagemasters/RingOfGix.java   |   2 +-
 .../vintagemasters/RitesOfInitiation.java     |   2 +-
 .../sets/vintagemasters/RoarOfTheWurm.java    |   2 +-
 .../mage/sets/vintagemasters/RockyTarPit.java |   2 +-
 .../RofellosLlanowarEmissary.java             |   2 +-
 .../sets/vintagemasters/RorixBladewing.java   |   2 +-
 .../mage/sets/vintagemasters/SaltFlats.java   |   2 +-
 .../mage/sets/vintagemasters/Sarcomancy.java  |   2 +-
 .../mage/sets/vintagemasters/Savannah.java    |   2 +-
 .../mage/sets/vintagemasters/Scabland.java    |   2 +-
 .../mage/sets/vintagemasters/Scrivener.java   |   2 +-
 .../mage/sets/vintagemasters/Scrubland.java   |   2 +-
 .../mage/sets/vintagemasters/SeaDrake.java    |   2 +-
 .../sets/vintagemasters/SealOfCleansing.java  |   2 +-
 .../sets/vintagemasters/SecludedSteppe.java   |   2 +-
 .../src/mage/sets/vintagemasters/Shelter.java |   2 +-
 .../mage/sets/vintagemasters/SidarJabari.java |   2 +-
 .../vintagemasters/SilvosRogueElemental.java  |   2 +-
 .../sets/vintagemasters/SimianGrunts.java     |   2 +-
 .../vintagemasters/SkirkDrillSergeant.java    |   2 +-
 .../sets/vintagemasters/SkirkProspector.java  |   2 +-
 .../mage/sets/vintagemasters/Skullclamp.java  |   2 +-
 .../sets/vintagemasters/SkyshroudForest.java  |   2 +-
 .../mage/sets/vintagemasters/SkywingAven.java |   2 +-
 .../mage/sets/vintagemasters/Smokestack.java  |   2 +-
 .../src/mage/sets/vintagemasters/SolRing.java |   2 +-
 .../mage/sets/vintagemasters/SolarBlast.java  |   2 +-
 .../sets/vintagemasters/SoltariEmissary.java  |   2 +-
 .../sets/vintagemasters/SoltariTrooper.java   |   2 +-
 .../vintagemasters/SphereOfResistance.java    |   2 +-
 .../sets/vintagemasters/SpiritMirror.java     |   2 +-
 .../sets/vintagemasters/Spiritmonger.java     |   2 +-
 .../mage/sets/vintagemasters/Starstorm.java   |   2 +-
 .../mage/sets/vintagemasters/StripMine.java   |   2 +-
 .../sets/vintagemasters/StrokeOfGenius.java   |   2 +-
 .../sets/vintagemasters/SuddenStrength.java   |   2 +-
 .../sets/vintagemasters/SulfuricVortex.java   |   2 +-
 .../vintagemasters/SurvivalOfTheFittest.java  |   2 +-
 .../vintagemasters/SwordsToPlowshares.java    |   2 +-
 .../sets/vintagemasters/SylvanLibrary.java    |   2 +-
 .../sets/vintagemasters/SymbioticWurm.java    |   2 +-
 .../src/mage/sets/vintagemasters/Taiga.java   |   2 +-
 .../src/mage/sets/vintagemasters/Tangle.java  |   2 +-
 .../sets/vintagemasters/TemporalFissure.java  |   2 +-
 .../sets/vintagemasters/TendrilsOfAgony.java  |   2 +-
 .../sets/vintagemasters/ThalakosDrifters.java |   2 +-
 .../mage/sets/vintagemasters/TimeVault.java   |   2 +-
 .../mage/sets/vintagemasters/TimeWalk.java    |   2 +-
 .../mage/sets/vintagemasters/Timetwister.java |   2 +-
 .../sets/vintagemasters/TolarianAcademy.java  |   2 +-
 .../sets/vintagemasters/TradewindRider.java   |   2 +-
 .../sets/vintagemasters/TranquilThicket.java  |   2 +-
 .../sets/vintagemasters/TributeToTheWild.java |   2 +-
 .../sets/vintagemasters/TropicalIsland.java   |   2 +-
 .../src/mage/sets/vintagemasters/Tundra.java  |   2 +-
 .../mage/sets/vintagemasters/Turnabout.java   |   2 +-
 .../sets/vintagemasters/TyrantsChoice.java    |   2 +-
 .../sets/vintagemasters/UndergroundSea.java   |   2 +-
 .../mage/sets/vintagemasters/Upheaval.java    |   2 +-
 .../sets/vintagemasters/UrborgUprising.java   |   2 +-
 .../sets/vintagemasters/VampiricTutor.java    |   2 +-
 .../vintagemasters/VisaraTheDreadful.java     |   2 +-
 .../sets/vintagemasters/VolcanicIsland.java   |   2 +-
 .../sets/vintagemasters/WallOfDiffusion.java  |   2 +-
 .../vintagemasters/WaterfrontBouncer.java     |   2 +-
 .../sets/vintagemasters/WheelOfFortune.java   |   2 +-
 .../mage/sets/vintagemasters/WildMongrel.java |   2 +-
 .../mage/sets/vintagemasters/WindsOfRath.java |   2 +-
 .../vintagemasters/WorldgorgerDragon.java     |   2 +-
 .../sets/vintagemasters/YavimayaElder.java    |   2 +-
 .../sets/vintagemasters/YavimayaHollow.java   |   2 +-
 .../sets/vintagemasters/YawgmothsWill.java    |   2 +-
 .../vintagemasters/ZhalfirinCrusader.java     |   2 +-
 .../src/mage/sets/visions/Archangel.java      |   2 +-
 .../src/mage/sets/visions/CloudElemental.java |   2 +-
 .../src/mage/sets/visions/CoralAtoll.java     |   2 +-
 .../src/mage/sets/visions/CreepingMold.java   |   2 +-
 .../src/mage/sets/visions/DormantVolcano.java |   2 +-
 .../src/mage/sets/visions/Everglades.java     |   2 +-
 .../src/mage/sets/visions/FuneralCharm.java   |   2 +-
 .../mage/sets/visions/GiantCaterpillar.java   |   2 +-
 .../mage/sets/visions/InfantryVeteran.java    |   2 +-
 .../src/mage/sets/visions/Inspiration.java    |   2 +-
 .../src/mage/sets/visions/JungleBasin.java    |   2 +-
 Mage.Sets/src/mage/sets/visions/Karoo.java    |   2 +-
 .../src/mage/sets/visions/KingCheetah.java    |   2 +-
 .../src/mage/sets/visions/LongbowArcher.java  |   2 +-
 .../src/mage/sets/visions/Nekrataal.java      |   2 +-
 .../src/mage/sets/visions/Prosperity.java     |   2 +-
 .../src/mage/sets/visions/Quicksand.java      |   2 +-
 .../mage/sets/visions/RelentlessAssault.java  |   2 +-
 Mage.Sets/src/mage/sets/visions/RiverBoa.java |   2 +-
 Mage.Sets/src/mage/sets/visions/Rowen.java    |   2 +-
 .../src/mage/sets/visions/SisaysRing.java     |   2 +-
 .../sets/visions/StampedingWildebeests.java   |   2 +-
 .../src/mage/sets/visions/SummerBloom.java    |   2 +-
 .../src/mage/sets/visions/SuqAtaLancer.java   |   2 +-
 .../mage/sets/visions/TeferisPuzzleBox.java   |   2 +-
 Mage.Sets/src/mage/sets/visions/Tremor.java   |   2 +-
 .../src/mage/sets/visions/TriangleOfWar.java  |   2 +-
 Mage.Sets/src/mage/sets/visions/Undo.java     |   2 +-
 .../sets/visions/ViashinoSandstalker.java     |   2 +-
 .../src/mage/sets/visions/WarriorsHonor.java  |   2 +-
 .../mage/sets/visions/WaterspoutDjinn.java    |   2 +-
 .../mage/sets/weatherlight/AEtherFlash.java   |   2 +-
 .../sets/weatherlight/AbyssalGatekeeper.java  |   2 +-
 .../sets/weatherlight/AgonizingMemories.java  |   2 +-
 .../sets/weatherlight/AlabasterDragon.java    |   2 +-
 .../mage/sets/weatherlight/ArdentMilitia.java |   2 +-
 .../weatherlight/ArgivianRestoration.java     |   2 +-
 .../sets/weatherlight/BenalishKnight.java     |   2 +-
 .../sets/weatherlight/BloodrockCyclops.java   |   2 +-
 .../sets/weatherlight/BogardanFirefiend.java  |   2 +-
 .../mage/sets/weatherlight/BuriedAlive.java   |   2 +-
 .../mage/sets/weatherlight/CinderWall.java    |   2 +-
 .../mage/sets/weatherlight/ConeOfFlame.java   |   2 +-
 .../src/mage/sets/weatherlight/Disrupt.java   |   2 +-
 .../mage/sets/weatherlight/EmpyrialArmor.java |   2 +-
 .../sets/weatherlight/FamiliarGround.java     |   2 +-
 .../src/mage/sets/weatherlight/Fervor.java    |   2 +-
 .../src/mage/sets/weatherlight/FireWhip.java  |   2 +-
 .../mage/sets/weatherlight/FogElemental.java  |   2 +-
 .../mage/sets/weatherlight/GaeasBlessing.java |   2 +-
 .../mage/sets/weatherlight/GemstoneMine.java  |   2 +-
 .../sets/weatherlight/GerrardsWisdom.java     |   2 +-
 .../mage/sets/weatherlight/HeavyBallista.java |   2 +-
 .../mage/sets/weatherlight/HiddenHorror.java  |   2 +-
 .../sets/weatherlight/LlanowarBehemoth.java   |   2 +-
 .../src/mage/sets/weatherlight/MindStone.java |   2 +-
 .../sets/weatherlight/MistmoonGriffin.java    |   2 +-
 .../sets/weatherlight/NaturesResurgence.java  |   2 +-
 .../src/mage/sets/weatherlight/Ophidian.java  |   2 +-
 .../sets/weatherlight/PhantomWarrior.java     |   2 +-
 .../mage/sets/weatherlight/PhantomWings.java  |   2 +-
 .../sets/weatherlight/RazortoothRats.java     |   2 +-
 .../src/mage/sets/weatherlight/SageOwl.java   |   2 +-
 .../sets/weatherlight/SerrasBlessing.java     |   2 +-
 .../sets/weatherlight/SerratedBiskelion.java  |   2 +-
 .../sets/weatherlight/SouthernPaladin.java    |   2 +-
 .../mage/sets/weatherlight/SteelGolem.java    |   2 +-
 .../sets/weatherlight/StrandsOfNight.java     |   2 +-
 .../mage/sets/weatherlight/Thunderbolt.java   |   2 +-
 .../mage/sets/weatherlight/Thundermare.java   |   2 +-
 .../sets/weatherlight/VeteranExplorer.java    |   2 +-
 .../mage/sets/welcomedeck2016/AegisAngel.java |   2 +-
 .../mage/sets/welcomedeck2016/AirServant.java |   2 +-
 .../welcomedeck2016/BorderlandMarauder.java   |   2 +-
 .../sets/welcomedeck2016/ConeOfFlame.java     |   2 +-
 .../mage/sets/welcomedeck2016/Disperse.java   |   2 +-
 .../welcomedeck2016/IncrementalGrowth.java    |   2 +-
 .../sets/welcomedeck2016/MarkedByHonor.java   |   2 +-
 .../mage/sets/welcomedeck2016/MindRot.java    |   2 +-
 .../mage/sets/welcomedeck2016/Nightmare.java  |   2 +-
 .../mage/sets/welcomedeck2016/Oakenform.java  |   2 +-
 .../sets/welcomedeck2016/SengirVampire.java   |   2 +-
 .../mage/sets/welcomedeck2016/SerraAngel.java |   2 +-
 .../sets/welcomedeck2016/ShivanDragon.java    |   2 +-
 .../welcomedeck2016/SoulOfTheHarvest.java     |   2 +-
 .../sets/welcomedeck2016/SphinxOfMagosi.java  |   2 +-
 .../sets/welcomedeck2016/WalkingCorpse.java   |   2 +-
 .../worldmagiccupqualifier/AbruptDecay.java   |   2 +-
 .../GeistOfSaintTraft.java                    |   2 +-
 .../LilianaOfTheVeil.java                     |   2 +-
 .../SnapcasterMage.java                       |   2 +-
 .../ThaliaGuardianOfThraben.java              |   2 +-
 .../worldmagiccupqualifier/Vengevine.java     |   2 +-
 .../src/mage/sets/worldwake/Quicksand.java    |   2 +-
 .../src/mage/sets/wpngateway/Auramancer.java  |   2 +-
 .../sets/wpngateway/BloodcrazedNeonate.java   |   2 +-
 .../mage/sets/wpngateway/BoggartRamGang.java  |   2 +-
 .../mage/sets/wpngateway/BoneyardWurm.java    |   2 +-
 .../src/mage/sets/wpngateway/Boomerang.java   |   2 +-
 .../src/mage/sets/wpngateway/Calciderm.java   |   2 +-
 .../mage/sets/wpngateway/CennsTactician.java  |   2 +-
 .../mage/sets/wpngateway/CircleOfFlame.java   |   2 +-
 .../sets/wpngateway/CurseOfTheBloodyTome.java |   2 +-
 .../mage/sets/wpngateway/CurseOfThirst.java   |   2 +-
 .../mage/sets/wpngateway/CurseOfWizardry.java |   2 +-
 .../sets/wpngateway/DauntlessDourbark.java    |   2 +-
 .../mage/sets/wpngateway/DeathlessAngel.java  |   2 +-
 .../sets/wpngateway/DuergarHedgeMage.java     |   2 +-
 .../src/mage/sets/wpngateway/EmeriaAngel.java |   2 +-
 .../src/mage/sets/wpngateway/FieryTemper.java |   2 +-
 Mage.Sets/src/mage/sets/wpngateway/Fling.java |   2 +-
 .../sets/wpngateway/GatherTheTownsfolk.java   |   2 +-
 .../src/mage/sets/wpngateway/GolemsHeart.java |   2 +-
 .../src/mage/sets/wpngateway/Gravedigger.java |   2 +-
 .../mage/sets/wpngateway/HadaFreeblade.java   |   2 +-
 .../sets/wpngateway/HellsparkElemental.java   |   2 +-
 .../sets/wpngateway/IcatianJavelineers.java   |   2 +-
 .../sets/wpngateway/KalastriaHighborn.java    |   2 +-
 .../src/mage/sets/wpngateway/KorDuelist.java  |   2 +-
 .../mage/sets/wpngateway/KorFirewalker.java   |   2 +-
 .../src/mage/sets/wpngateway/LavaAxe.java     |   2 +-
 .../sets/wpngateway/LeatherbackBaloth.java    |   2 +-
 .../mage/sets/wpngateway/LlanowarElves.java   |   2 +-
 .../sets/wpngateway/MarisisTwinclaws.java     |   2 +-
 .../src/mage/sets/wpngateway/MastersCall.java |   2 +-
 .../src/mage/sets/wpngateway/MaulSplicer.java |   2 +-
 .../src/mage/sets/wpngateway/MindControl.java |   2 +-
 .../src/mage/sets/wpngateway/MindStone.java   |   2 +-
 .../src/mage/sets/wpngateway/MoggFanatic.java |   2 +-
 .../mage/sets/wpngateway/MycoidShepherd.java  |   2 +-
 .../mage/sets/wpngateway/NayaSojourners.java  |   2 +-
 .../sets/wpngateway/NearheathStalker.java     |   2 +-
 .../mage/sets/wpngateway/NissasChosen.java    |   2 +-
 .../mage/sets/wpngateway/OonasBlackguard.java |   2 +-
 .../src/mage/sets/wpngateway/PathToExile.java |   2 +-
 .../sets/wpngateway/PathrazerOfUlamog.java    |   2 +-
 .../src/mage/sets/wpngateway/PlagueMyr.java   |   2 +-
 .../mage/sets/wpngateway/PlagueStinger.java   |   2 +-
 .../mage/sets/wpngateway/RecklessWurm.java    |   2 +-
 .../sets/wpngateway/RiseFromTheGrave.java     |   2 +-
 .../mage/sets/wpngateway/SelkieHedgeMage.java |   2 +-
 .../sets/wpngateway/ShrineOfBurningRage.java  |   2 +-
 .../src/mage/sets/wpngateway/SignalPest.java  |   2 +-
 .../src/mage/sets/wpngateway/Skinrender.java  |   2 +-
 .../mage/sets/wpngateway/SlaveOfBolas.java    |   2 +-
 .../sets/wpngateway/SproutingThrinax.java     |   2 +-
 .../mage/sets/wpngateway/Staggershock.java    |   2 +-
 .../mage/sets/wpngateway/SylvanRanger.java    |   2 +-
 .../src/mage/sets/wpngateway/SyphonMind.java  |   2 +-
 .../mage/sets/wpngateway/TormentedSoul.java   |   2 +-
 .../sets/wpngateway/VampireNighthawk.java     |   2 +-
 .../src/mage/sets/wpngateway/VaultSkirge.java |   2 +-
 .../sets/wpngateway/WiltLeafCavaliers.java    |   2 +-
 .../src/mage/sets/wpngateway/WoodElves.java   |   2 +-
 .../mage/sets/wpngateway/WoollyThoctar.java   |   2 +-
 .../mage/sets/wpngateway/YixlidJailer.java    |   2 +-
 .../mage/sets/wpngateway/ZoeticCavern.java    |   2 +-
 Mage.Sets/src/mage/sets/zendikar/Cancel.java  |   2 +-
 .../src/mage/sets/zendikar/Demolish.java      |   2 +-
 .../sets/zendikarexpeditions/AncientTomb.java |   2 +-
 .../sets/zendikarexpeditions/AridMesa.java    |   2 +-
 .../sets/zendikarexpeditions/BloodCrypt.java  |   2 +-
 .../zendikarexpeditions/BloodstainedMire.java |   2 +-
 .../zendikarexpeditions/BreedingPool.java     |   2 +-
 .../sets/zendikarexpeditions/CanopyVista.java |   2 +-
 .../zendikarexpeditions/CascadeBluffs.java    |   2 +-
 .../sets/zendikarexpeditions/CinderGlade.java |   2 +-
 .../sets/zendikarexpeditions/DustBowl.java    |   2 +-
 .../sets/zendikarexpeditions/EyeOfUgin.java   |   2 +-
 .../sets/zendikarexpeditions/FetidHeath.java  |   2 +-
 .../zendikarexpeditions/FireLitThicket.java   |   2 +-
 .../zendikarexpeditions/FloodedGrove.java     |   2 +-
 .../zendikarexpeditions/FloodedStrand.java    |   2 +-
 .../zendikarexpeditions/ForbiddenOrchard.java |   2 +-
 .../zendikarexpeditions/GodlessShrine.java    |   2 +-
 .../zendikarexpeditions/GravenCairns.java     |   2 +-
 .../zendikarexpeditions/HallowedFountain.java |   2 +-
 .../zendikarexpeditions/HorizonCanopy.java    |   2 +-
 .../sets/zendikarexpeditions/KorHaven.java    |   2 +-
 .../zendikarexpeditions/ManaConfluence.java   |   2 +-
 .../sets/zendikarexpeditions/MarshFlats.java  |   2 +-
 .../zendikarexpeditions/MistyRainforest.java  |   2 +-
 .../sets/zendikarexpeditions/MysticGate.java  |   2 +-
 .../zendikarexpeditions/OvergrownTomb.java    |   2 +-
 .../zendikarexpeditions/PollutedDelta.java    |   2 +-
 .../zendikarexpeditions/PrairieStream.java    |   2 +-
 .../zendikarexpeditions/RuggedPrairie.java    |   2 +-
 .../zendikarexpeditions/SacredFoundry.java    |   2 +-
 .../zendikarexpeditions/ScaldingTarn.java     |   2 +-
 .../zendikarexpeditions/SmolderingMarsh.java  |   2 +-
 .../sets/zendikarexpeditions/SteamVents.java  |   2 +-
 .../zendikarexpeditions/StompingGround.java   |   2 +-
 .../sets/zendikarexpeditions/StripMine.java   |   2 +-
 .../zendikarexpeditions/SunkenHollow.java     |   2 +-
 .../sets/zendikarexpeditions/SunkenRuins.java |   2 +-
 .../zendikarexpeditions/TectonicEdge.java     |   2 +-
 .../zendikarexpeditions/TempleGarden.java     |   2 +-
 .../zendikarexpeditions/TwilightMire.java     |   2 +-
 .../zendikarexpeditions/VerdantCatacombs.java |   2 +-
 .../sets/zendikarexpeditions/Wasteland.java   |   2 +-
 .../sets/zendikarexpeditions/WateryGrave.java |   2 +-
 .../zendikarexpeditions/WindsweptHeath.java   |   2 +-
 .../zendikarexpeditions/WoodedBastion.java    |   2 +-
 .../zendikarexpeditions/WoodedFoothills.java  |   2 +-
 .../zendikarvseldrazi/AffaGuardHound.java     |   2 +-
 .../sets/zendikarvseldrazi/AkoumRefuge.java   |   2 +-
 .../zendikarvseldrazi/ArtisanOfKozilek.java   |   2 +-
 .../zendikarvseldrazi/AvengerOfZendikar.java  |   2 +-
 .../BeastbreakerOfBalaGed.java                |   2 +-
 .../zendikarvseldrazi/BloodriteInvoker.java   |   2 +-
 .../zendikarvseldrazi/BloodthroneVampire.java |   2 +-
 .../zendikarvseldrazi/ButcherOfMalakir.java   |   2 +-
 .../sets/zendikarvseldrazi/CadaverImp.java    |   2 +-
 .../sets/zendikarvseldrazi/CaravanEscort.java |   2 +-
 .../zendikarvseldrazi/ConsumeTheMeek.java     |   2 +-
 .../sets/zendikarvseldrazi/Corpsehatch.java   |   2 +-
 .../zendikarvseldrazi/DaggerbackBasilisk.java |   2 +-
 .../zendikarvseldrazi/DominatorDrone.java     |   2 +-
 .../sets/zendikarvseldrazi/EldraziTemple.java |   2 +-
 .../zendikarvseldrazi/EmrakulsHatcher.java    |   2 +-
 .../sets/zendikarvseldrazi/EvolvingWilds.java |   2 +-
 .../zendikarvseldrazi/ExplorersScope.java     |   2 +-
 .../sets/zendikarvseldrazi/ForkedBolt.java    |   2 +-
 .../sets/zendikarvseldrazi/FrontierGuide.java |   2 +-
 .../zendikarvseldrazi/GraypeltHunter.java     |   2 +-
 .../zendikarvseldrazi/GraypeltRefuge.java     |   2 +-
 .../zendikarvseldrazi/GrazingGladehart.java   |   2 +-
 .../sets/zendikarvseldrazi/Groundswell.java   |   2 +-
 .../mage/sets/zendikarvseldrazi/Harrow.java   |   2 +-
 .../HeartstabberMosquito.java                 |   2 +-
 .../zendikarvseldrazi/HellionEruption.java    |   2 +-
 .../sets/zendikarvseldrazi/InduceDespair.java |   2 +-
 .../sets/zendikarvseldrazi/ItThatBetrays.java |   2 +-
 .../sets/zendikarvseldrazi/JoragaBard.java    |   2 +-
 .../zendikarvseldrazi/KabiraVindicator.java   |   2 +-
 .../KhalniHeartExpedition.java                |   2 +-
 .../zendikarvseldrazi/KnightOfCliffhaven.java |   2 +-
 .../mage/sets/zendikarvseldrazi/Magmaw.java   |   2 +-
 .../zendikarvseldrazi/MakindiGriffin.java     |   2 +-
 .../zendikarvseldrazi/MarshCasualties.java    |   2 +-
 .../sets/zendikarvseldrazi/MindStone.java     |   2 +-
 .../sets/zendikarvseldrazi/OblivionSower.java |   2 +-
 .../sets/zendikarvseldrazi/OnduGiant.java     |   2 +-
 .../src/mage/sets/zendikarvseldrazi/Oust.java |   2 +-
 .../sets/zendikarvseldrazi/PawnOfUlamog.java  |   2 +-
 .../sets/zendikarvseldrazi/PrimalCommand.java |   2 +-
 .../sets/zendikarvseldrazi/ReadTheBones.java  |   2 +-
 .../zendikarvseldrazi/RepelTheDarkness.java   |   2 +-
 .../sets/zendikarvseldrazi/RockyTarPit.java   |   2 +-
 .../sets/zendikarvseldrazi/RunedServitor.java |   2 +-
 .../mage/sets/zendikarvseldrazi/ScuteMob.java |   2 +-
 .../sets/zendikarvseldrazi/SeersSundial.java  |   2 +-
 .../mage/sets/zendikarvseldrazi/Smother.java  |   2 +-
 .../zendikarvseldrazi/StirringWildwood.java   |   2 +-
 .../sets/zendikarvseldrazi/StoneworkPuma.java |   2 +-
 .../sets/zendikarvseldrazi/TajuruArcher.java  |   2 +-
 .../zendikarvseldrazi/TerritorialBaloth.java  |   2 +-
 .../sets/zendikarvseldrazi/TorchSlinger.java  |   2 +-
 .../zendikarvseldrazi/TurntimberBasilisk.java |   2 +-
 .../zendikarvseldrazi/TurntimberGrove.java    |   2 +-
 .../zendikarvseldrazi/UlamogsCrusher.java     |   2 +-
 .../zendikarvseldrazi/VampireNighthawk.java   |   2 +-
 .../zendikarvseldrazi/WildheartInvoker.java   |   2 +-
 .../serverside/deck/DeckValidatorTest.java    |   6 +-
 Mage/src/main/java/mage/cards/Card.java       |   2 +-
 Mage/src/main/java/mage/cards/CardImpl.java   |  10 +-
 Mage/src/main/java/mage/cards/Sets.java       |   4 +-
 Mage/src/main/java/mage/cards/SplitCard.java  |   4 +
 .../java/mage/cards/SplitCardHalfImpl.java    |   4 +-
 .../java/mage/cards/basiclands/BasicLand.java |   4 +
 .../java/mage/cards/basiclands/Forest.java    |   4 +
 .../java/mage/cards/basiclands/Island.java    |   4 +
 .../java/mage/cards/basiclands/Mountain.java  |   4 +
 .../java/mage/cards/basiclands/Plains.java    |   4 +
 .../java/mage/cards/basiclands/Swamp.java     |   4 +
 .../java/mage/cards/decks/DeckCardInfo.java   |   8 +-
 .../cards/decks/importer/DckDeckImporter.java |   4 +-
 .../java/mage/cards/repository/CardInfo.java  |   4 +-
 .../mage/cards/repository/CardRepository.java |   6 +-
 .../java/mage/game/permanent/Permanent.java   |   2 +-
 .../mage/game/permanent/PermanentImpl.java    |   2 +-
 .../java/mage/game/permanent/token/Token.java |   6 +-
 Mage/src/main/java/mage/game/stack/Spell.java |   2 +-
 11423 files changed, 13190 insertions(+), 11454 deletions(-)
 create mode 100644 Mage.Client/src/main/java/mage/client/util/NaturalOrderCardNumberComparator.java
 create mode 100644 Mage.Client/src/main/java/mage/client/util/NaturalOrderComparator.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Island10.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Island6.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Island7.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Island8.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Island9.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java
 create mode 100644 Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java
 rename Mage.Sets/src/mage/sets/championsofkamigawa/{BrothersYamazaki.java => BrothersYamazaki1.java} (93%)
 create mode 100644 Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki2.java
 rename Mage.Sets/src/mage/sets/planeshift/{ErtaiTheCorrupted.java => ErtaiTheCorrupted1.java} (90%)
 create mode 100644 Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted2.java
 rename Mage.Sets/src/mage/sets/planeshift/{SkyshipWeatherlight.java => SkyshipWeatherlight1.java} (93%)
 create mode 100644 Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight2.java
 rename Mage.Sets/src/mage/sets/planeshift/{TahngarthTalruumHero.java => TahngarthTalruumHero1.java} (88%)
 create mode 100644 Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero2.java

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index 1690d0bbe7..f7c6a68f5c 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -43,6 +43,7 @@ import mage.client.util.audio.AudioManager;
 import mage.client.util.Command;
 import mage.client.util.Config;
 import mage.client.util.ImageHelper;
+import mage.client.util.NaturalOrderCardNumberComparator;
 import mage.client.util.sets.ConstructedFormats;
 import mage.components.ImagePanel;
 import mage.constants.Rarity;
@@ -267,13 +268,18 @@ public class MageBook extends JComponent {
 
     private List<CardInfo> getCards(int page, String set) {
         CardCriteria criteria = new CardCriteria();
-        criteria.setCodes(set).start((long) page * conf.CARDS_PER_PAGE).count((long) conf.CARDS_PER_PAGE + 1);
-        criteria.setOrderBy("cardNumber");
+        criteria.setCodes(set);
         List<CardInfo> cards = CardRepository.instance.findCards(criteria);
-        if (cards.size() > conf.CARDS_PER_PAGE) {
+        cards.sort(new NaturalOrderCardNumberComparator());
+        int start = page * conf.CARDS_PER_PAGE;
+        int end = page * conf.CARDS_PER_PAGE + conf.CARDS_PER_PAGE;
+        if (end > cards.size()) {
+            end = cards.size();
+        }
+        if (cards.size() > end) {
             pageRight.setVisible(true);
         }
-        return cards;
+        return cards.subList(start, end);
     }
 
     private ImagePanel getImagePanel(String filename, int type) {
diff --git a/Mage.Client/src/main/java/mage/client/util/NaturalOrderCardNumberComparator.java b/Mage.Client/src/main/java/mage/client/util/NaturalOrderCardNumberComparator.java
new file mode 100644
index 0000000000..90495bb734
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/util/NaturalOrderCardNumberComparator.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.client.util;
+
+import mage.cards.repository.CardInfo;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class NaturalOrderCardNumberComparator extends NaturalOrderComparator {
+    @Override
+    public int compare(Object o1, Object o2) {
+        CardInfo cardInfo1 = (CardInfo) o1;
+        CardInfo cardInfo2 = (CardInfo) o2;
+
+        return super.compare(cardInfo1.getCardNumber(), cardInfo2.getCardNumber());
+    }
+}
diff --git a/Mage.Client/src/main/java/mage/client/util/NaturalOrderComparator.java b/Mage.Client/src/main/java/mage/client/util/NaturalOrderComparator.java
new file mode 100644
index 0000000000..120df238c0
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/util/NaturalOrderComparator.java
@@ -0,0 +1,188 @@
+/*
+ NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.
+ Copyright (C) 2003 by Pierre-Luc Paour <natorder@paour.com>
+
+ Based on the C version by Martin Pool, of which this is more or less a straight conversion.
+ Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
+
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+package mage.client.util;
+
+import java.util.*;
+
+public class NaturalOrderComparator implements Comparator
+{
+    int compareRight(String a, String b)
+    {
+        int bias = 0;
+        int ia = 0;
+        int ib = 0;
+
+        // The longest run of digits wins. That aside, the greatest
+        // value wins, but we can't know that it will until we've scanned
+        // both numbers to know that they have the same magnitude, so we
+        // remember it in BIAS.
+        for (;; ia++, ib++)
+        {
+            char ca = charAt(a, ia);
+            char cb = charAt(b, ib);
+
+            if (!Character.isDigit(ca) && !Character.isDigit(cb))
+            {
+                return bias;
+            }
+            else if (!Character.isDigit(ca))
+            {
+                return -1;
+            }
+            else if (!Character.isDigit(cb))
+            {
+                return +1;
+            }
+            else if (ca < cb)
+            {
+                if (bias == 0)
+                {
+                    bias = -1;
+                }
+            }
+            else if (ca > cb)
+            {
+                if (bias == 0)
+                    bias = +1;
+            }
+            else if (ca == 0 && cb == 0)
+            {
+                return bias;
+            }
+        }
+    }
+
+    @Override
+    public int compare(Object o1, Object o2)
+    {
+        String a = o1.toString();
+        String b = o2.toString();
+
+        int ia = 0, ib = 0;
+        int nza = 0, nzb = 0;
+        char ca, cb;
+        int result;
+
+        while (true)
+        {
+            // only count the number of zeroes leading the last number compared
+            nza = nzb = 0;
+
+            ca = charAt(a, ia);
+            cb = charAt(b, ib);
+
+            // skip over leading spaces or zeros
+            while (Character.isSpaceChar(ca) || ca == '0')
+            {
+                if (ca == '0')
+                {
+                    nza++;
+                }
+                else
+                {
+                    // only count consecutive zeroes
+                    nza = 0;
+                }
+
+                ca = charAt(a, ++ia);
+            }
+
+            while (Character.isSpaceChar(cb) || cb == '0')
+            {
+                if (cb == '0')
+                {
+                    nzb++;
+                }
+                else
+                {
+                    // only count consecutive zeroes
+                    nzb = 0;
+                }
+
+                cb = charAt(b, ++ib);
+            }
+
+            // process run of digits
+            if (Character.isDigit(ca) && Character.isDigit(cb))
+            {
+                if ((result = compareRight(a.substring(ia), b.substring(ib))) != 0)
+                {
+                    return result;
+                }
+            }
+
+            if (ca == 0 && cb == 0)
+            {
+                // The strings compare the same. Perhaps the caller
+                // will want to call strcmp to break the tie.
+                return nza - nzb;
+            }
+
+            if (ca < cb)
+            {
+                return -1;
+            }
+            else if (ca > cb)
+            {
+                return +1;
+            }
+
+            ++ia;
+            ++ib;
+        }
+    }
+
+    static char charAt(String s, int i)
+    {
+        if (i >= s.length())
+        {
+            return 0;
+        }
+        else
+        {
+            return s.charAt(i);
+        }
+    }
+
+    public static void main(String[] args)
+    {
+        String[] strings = new String[] { "1-2", "1-02", "1-20", "10-20", "fred", "jane", "pic01",
+            "pic2", "pic02", "pic02a", "pic3", "pic4", "pic 4 else", "pic 5", "pic05", "pic 5",
+            "pic 5 something", "pic 6", "pic   7", "pic100", "pic100a", "pic120", "pic121",
+            "pic02000", "tom", "x2-g8", "x2-y7", "x2-y08", "x8-y8" };
+
+        List orig = Arrays.asList(strings);
+
+        System.out.println("Original: " + orig);
+
+        List scrambled = Arrays.asList(strings);
+        Collections.shuffle(scrambled);
+
+        System.out.println("Scrambled: " + scrambled);
+
+        Collections.sort(scrambled, new NaturalOrderComparator());
+
+        System.out.println("Sorted: " + scrambled);
+    }
+}
\ No newline at end of file
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
index fa7f5bfc87..9b5f589a08 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
@@ -148,7 +148,7 @@ public class MagicCardsImageSource implements CardImageSource {
 
     @Override
     public String generateURL(CardDownloadData card) throws Exception {
-        Integer collectorId = card.getCollectorId();
+        String collectorId = card.getCollectorId();
         String cardSet = card.getSet();
         if (collectorId == null || cardSet == null) {
             throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgImageSource.java
index cc7a8016c3..1ff1f21c03 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgImageSource.java
@@ -57,7 +57,7 @@ public class MtgImageSource implements CardImageSource {
 
     @Override
     public String generateURL(CardDownloadData card) throws Exception {
-        Integer collectorId = card.getCollectorId();
+        String collectorId = card.getCollectorId();
         String cardSet = card.getSet();
         if (collectorId == null || cardSet == null) {
             throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java
index 19ceb1ee34..7883eaecce 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java
@@ -202,7 +202,7 @@ public class MythicspoilerComSource implements CardImageSource {
 
     @Override
     public String generateURL(CardDownloadData card) throws Exception {
-        Integer collectorId = card.getCollectorId();
+        String collectorId = card.getCollectorId();
         String cardSet = card.getSet();
         if (collectorId == null || cardSet == null) {
             throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
index fc837786ee..b00d7b5621 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
@@ -413,7 +413,7 @@ public class WizardCardsImageSource implements CardImageSource {
 
     @Override
     public String generateURL(CardDownloadData card) throws Exception {
-        Integer collectorId = card.getCollectorId();
+        String collectorId = card.getCollectorId();
         String cardSet = card.getSet();
         if (collectorId == null || cardSet == null) {
             throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet);
@@ -430,12 +430,20 @@ public class WizardCardsImageSource implements CardImageSource {
             }
             String link = setLinks.get(card.getDownloadName().toLowerCase());
             if (link == null) {
-                if (setLinks.size() >= collectorId) {
-                    link = setLinks.get(Integer.toString(collectorId - 1));
+                int length = collectorId.length();
+
+                if (Character.isLetter(collectorId.charAt(length -1))) {
+                    length -= 1;
+                }
+
+                int number = Integer.parseInt(collectorId.substring(0, length));
+
+                if (setLinks.size() >= number) {
+                    link = setLinks.get(Integer.toString(number - 1));
                 } else {
-                    link = setLinks.get(Integer.toString(collectorId - 21));
+                    link = setLinks.get(Integer.toString(number - 21));
                     if (link != null) {
-                        link = link.replace(Integer.toString(collectorId - 20), (Integer.toString(collectorId - 20) + "a"));
+                        link = link.replace(Integer.toString(number - 20), (Integer.toString(number - 20) + "a"));
                     }
                 }
             }
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
index a0ef190fcd..7155869366 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
@@ -12,7 +12,7 @@ public class CardDownloadData {
     private String downloadName;
     private String set;
     private String tokenSetCode;
-    private Integer collectorId;
+    private String collectorId;
     private Integer type;
     private boolean token;
     private boolean twoFacedCard;
@@ -23,15 +23,15 @@ public class CardDownloadData {
     private boolean usesVariousArt;
     private boolean isType2;
 
-    public CardDownloadData(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, String tokenSetCode) {
+    public CardDownloadData(String name, String set, String collectorId, boolean usesVariousArt, Integer type, String tokenSetCode) {
         this(name, set, collectorId, usesVariousArt, type, tokenSetCode, false);
     }
 
-    public CardDownloadData(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, String tokenSetCode, boolean token) {
+    public CardDownloadData(String name, String set, String collectorId, boolean usesVariousArt, Integer type, String tokenSetCode, boolean token) {
         this(name, set, collectorId, usesVariousArt, type, tokenSetCode, token, false, false);
     }
 
-    public CardDownloadData(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, String tokenSetCode, boolean token, boolean twoFacedCard, boolean secondSide) {
+    public CardDownloadData(String name, String set, String collectorId, boolean usesVariousArt, Integer type, String tokenSetCode, boolean token, boolean twoFacedCard, boolean secondSide) {
         this.name = name;
         this.set = set;
         this.collectorId = collectorId;
@@ -102,7 +102,7 @@ public class CardDownloadData {
         return hash;
     }
 
-    public Integer getCollectorId() {
+    public String getCollectorId() {
         return collectorId;
     }
 
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
index cb97811f71..fd45594345 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
@@ -238,7 +238,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
     public static boolean checkForNewCards(List<CardInfo> allCards) {
         TFile file;
         for (CardInfo card : allCards) {
-            if (card.getCardNumber() > 0 && !card.getSetCode().isEmpty()) {
+            if (!card.getCardNumber().isEmpty() && !"0".equals(card.getCardNumber()) && !card.getSetCode().isEmpty()) {
                 CardDownloadData url = new CardDownloadData(card.getName(), card.getSetCode(), card.getCardNumber(), card.usesVariousArt(), 0, "", false, card.isDoubleFaced(), card.isNightCard());
                 file = new TFile(CardImageUtils.generateImagePath(url));
                 if (!file.exists()) {
@@ -281,7 +281,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
             offlineMode = true;
 
             for (CardInfo card : allCards) {
-                if (card.getCardNumber() > 0 && !card.getSetCode().isEmpty()
+                if (!card.getCardNumber().isEmpty() && !"0".equals(card.getCardNumber()) && !card.getSetCode().isEmpty()
                         && !ignoreUrls.contains(card.getSetCode())) {
                     String cardName = card.getName();
                     boolean isType2 = type2SetsFilter.contains(card.getSetCode());
@@ -313,7 +313,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                         url.setType2(isType2);
                         allCardsUrls.add(url);
                     }
-                } else if (card.getCardNumber() < 1) {
+                } else if (card.getCardNumber().isEmpty() || "0".equals(card.getCardNumber())) {
                     System.err.println("There was a critical error!");
                     logger.error("Card has no collector ID and won't be sent to client: " + card);
                 } else if (card.getSetCode().isEmpty()) {
@@ -385,19 +385,19 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                         }
                         if (params[1].toLowerCase().equals("generate") && params[2].startsWith("TOK:")) {
                             String set = params[2].substring(4);
-                            CardDownloadData card = new CardDownloadData(params[3], set, 0, false, type, "", true);
+                            CardDownloadData card = new CardDownloadData(params[3], set, "0", false, type, "", true);
                             list.add(card);
                         } else if (params[1].toLowerCase().equals("generate") && params[2].startsWith("EMBLEM:")) {
                             String set = params[2].substring(7);
-                            CardDownloadData card = new CardDownloadData("Emblem " + params[3], set, 0, false, type, "", true);
+                            CardDownloadData card = new CardDownloadData("Emblem " + params[3], set, "0", false, type, "", true);
                             list.add(card);
                         } else if (params[1].toLowerCase().equals("generate") && params[2].startsWith("EMBLEM-:")) {
                             String set = params[2].substring(8);
-                            CardDownloadData card = new CardDownloadData(params[3] + " Emblem", set, 0, false, type, "", true);
+                            CardDownloadData card = new CardDownloadData(params[3] + " Emblem", set, "0", false, type, "", true);
                             list.add(card);
                         } else if (params[1].toLowerCase().equals("generate") && params[2].startsWith("EMBLEM!:")) {
                             String set = params[2].substring(8);
-                            CardDownloadData card = new CardDownloadData(params[3], set, 0, false, type, "", true);
+                            CardDownloadData card = new CardDownloadData(params[3], set, "0", false, type, "", true);
                             list.add(card);
                         }
                     } else {
@@ -483,7 +483,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
 
                     String url;
                     if (ignoreUrls.contains(card.getSet()) || card.isToken()) {
-                        if (card.getCollectorId() != 0) {
+                        if (!"0".equals(card.getCollectorId())) {
                             continue;
                         }
                         url = cardImageSource.generateTokenUrl(card);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
index b5fdc3aea0..8bc126f8de 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -73,13 +73,13 @@ public class ImageCache {
                         String name = m.group(1);
                         String set = m.group(2);
                         Integer type = Integer.parseInt(m.group(3));
-                        Integer collectorId = Integer.parseInt(m.group(4));
+                        String collectorId = m.group(4);
                         String tokenSetCode = m.group(5);
 
                         CardDownloadData info = new CardDownloadData(name, set, collectorId, usesVariousArt, type, tokenSetCode);
 
                         String path;
-                        if (collectorId == 0) {
+                        if (collectorId.isEmpty() || "0".equals(collectorId)) {
                             info.setToken(true);
                             path = CardImageUtils.generateTokenImagePath(info);
                             if (path == null) {
@@ -153,7 +153,7 @@ public class ImageCache {
     }
 
     public static BufferedImage getMorphImage() {
-        CardDownloadData info = new CardDownloadData("Morph", "KTK", 0, false, 0, "KTK");
+        CardDownloadData info = new CardDownloadData("Morph", "KTK", "0", false, 0, "KTK");
         info.setToken(true);
         String path = CardImageUtils.generateTokenImagePath(info);
         if (path == null) {
@@ -164,7 +164,7 @@ public class ImageCache {
     }
 
     public static BufferedImage getManifestImage() {
-        CardDownloadData info = new CardDownloadData("Manifest", "FRF", 0, false, 0, "FRF");
+        CardDownloadData info = new CardDownloadData("Manifest", "FRF", "0", false, 0, "FRF");
         info.setToken(true);
         String path = CardImageUtils.generateTokenImagePath(info);
         if (path == null) {
diff --git a/Mage.Client/src/test/java/mage/client/game/TokensMtgImageSourceTest.java b/Mage.Client/src/test/java/mage/client/game/TokensMtgImageSourceTest.java
index b33b81d0b9..dd09951d8d 100644
--- a/Mage.Client/src/test/java/mage/client/game/TokensMtgImageSourceTest.java
+++ b/Mage.Client/src/test/java/mage/client/game/TokensMtgImageSourceTest.java
@@ -18,15 +18,15 @@ public class TokensMtgImageSourceTest {
     public void generateTokenUrlTest() throws Exception {
         CardImageSource imageSource = TokensMtgImageSource.getInstance();
 
-        String url = imageSource.generateTokenUrl(new CardDownloadData("Thopter", "ORI", 0, false, 1, "ORI"));
+        String url = imageSource.generateTokenUrl(new CardDownloadData("Thopter", "ORI", "0", false, 1, "ORI"));
         Assert.assertEquals("http://tokens.mtg.onl/tokens/ORI_010-Thopter.jpg", url);
-        url = imageSource.generateTokenUrl(new CardDownloadData("Thopter", "ORI", 0, false, 2, "ORI"));
+        url = imageSource.generateTokenUrl(new CardDownloadData("Thopter", "ORI", "0", false, 2, "ORI"));
         Assert.assertEquals("http://tokens.mtg.onl/tokens/ORI_011-Thopter.jpg", url);
 
-        url = imageSource.generateTokenUrl(new CardDownloadData("Ashaya, the Awoken World", "ORI", 0, false, 0, "ORI"));
+        url = imageSource.generateTokenUrl(new CardDownloadData("Ashaya, the Awoken World", "ORI", "0", false, 0, "ORI"));
         Assert.assertEquals("http://tokens.mtg.onl/tokens/ORI_007-Ashaya,-the-Awoken-World.jpg", url);
 
-        url = imageSource.generateTokenUrl(new CardDownloadData("Emblem Gideon, Ally of Zendikar", "BFZ", 0, false, 0, null));
+        url = imageSource.generateTokenUrl(new CardDownloadData("Emblem Gideon, Ally of Zendikar", "BFZ", "0", false, 0, null));
         Assert.assertEquals("http://tokens.mtg.onl/tokens/BFZ_012-Gideon-Emblem.jpg", url);
     }
 }
diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java
index 885d75593f..7a6745c533 100644
--- a/Mage.Common/src/mage/view/CardView.java
+++ b/Mage.Common/src/mage/view/CardView.java
@@ -152,7 +152,7 @@ public class CardView extends SimpleCardView {
      * @param controlled is the card view created for the card controller - used
      * for morph / face down cards to know which player may see information for
      * the card
-     * @param showFaceDownCard if true and the card is not on the battelfield,
+     * @param showFaceDownCard if true and the card is not on the battlefield,
      * also a face down card is shown in the view, face down cards will be shown
      */
     public CardView(Card card, Game game, boolean controlled, boolean showFaceDownCard) {
@@ -275,7 +275,7 @@ public class CardView extends SimpleCardView {
             this.isToken = true;
             this.mageObjectType = MageObjectType.TOKEN;
             this.rarity = Rarity.COMMON;
-            if (((PermanentToken) card).getToken().getOriginalCardNumber() > 0) {
+            if (!((PermanentToken) card).getToken().getOriginalCardNumber().isEmpty() && !"0".equals(((PermanentToken) card).getToken().getOriginalCardNumber())) {
                 // a token copied from permanent
                 this.expansionSetCode = ((PermanentToken) card).getToken().getOriginalExpansionSetCode();
                 this.cardNumber = ((PermanentToken) card).getToken().getOriginalCardNumber();
@@ -323,7 +323,7 @@ public class CardView extends SimpleCardView {
     }
 
     public CardView(MageObject object) {
-        super(object.getId(), "", 0, false, "", true);
+        super(object.getId(), "", "0", false, "", true);
         this.name = object.getName();
         this.displayName = object.getName();
         if (object instanceof Permanent) {
@@ -367,7 +367,7 @@ public class CardView extends SimpleCardView {
     }
 
     protected CardView() {
-        super(null, "", 0, false, "", true);
+        super(null, "", "0", false, "", true);
     }
 
     public CardView(EmblemView emblem) {
@@ -384,7 +384,7 @@ public class CardView extends SimpleCardView {
     }
 
     public CardView(boolean empty) {
-        super(null, "", 0, false, "");
+        super(null, "", "0", false, "");
         if (!empty) {
             throw new IllegalArgumentException("Not supported.");
         }
@@ -409,7 +409,7 @@ public class CardView extends SimpleCardView {
         if (!controlled) {
             this.rarity = Rarity.COMMON;
             this.expansionSetCode = "";
-            this.cardNumber = 0;
+            this.cardNumber = "0";
         } else {
             this.rarity = card.getRarity();
         }
@@ -433,7 +433,7 @@ public class CardView extends SimpleCardView {
     }
 
     CardView(Token token) {
-        super(token.getId(), "", 0, false, "");
+        super(token.getId(), "", "0", false, "");
         this.isToken = true;
         this.id = token.getId();
         this.name = token.getName();
@@ -552,7 +552,7 @@ public class CardView extends SimpleCardView {
     }
 
     @Override
-    public int getCardNumber() {
+    public String getCardNumber() {
         return cardNumber;
     }
 
diff --git a/Mage.Common/src/mage/view/SimpleCardView.java b/Mage.Common/src/mage/view/SimpleCardView.java
index fd8abe538c..2a4c4d5e67 100644
--- a/Mage.Common/src/mage/view/SimpleCardView.java
+++ b/Mage.Common/src/mage/view/SimpleCardView.java
@@ -39,14 +39,14 @@ public class SimpleCardView implements Serializable {
     protected UUID id;
     protected String expansionSetCode;
     protected String tokenSetCode;
-    protected int cardNumber;
+    protected String cardNumber;
     protected boolean usesVariousArt;
     protected boolean gameObject;
 
-    public SimpleCardView(UUID id, String expansionSetCode, int cardNumber, boolean usesVariousArt, String tokenSetCode) {
+    public SimpleCardView(UUID id, String expansionSetCode, String cardNumber, boolean usesVariousArt, String tokenSetCode) {
         this(id, expansionSetCode, cardNumber, usesVariousArt, tokenSetCode, false);
     }
-    public SimpleCardView(UUID id, String expansionSetCode, int cardNumber, boolean usesVariousArt, String tokenSetCode, boolean isGameObject) {
+    public SimpleCardView(UUID id, String expansionSetCode, String cardNumber, boolean usesVariousArt, String tokenSetCode, boolean isGameObject) {
         this.id = id;
         this.expansionSetCode = expansionSetCode;
         this.cardNumber = cardNumber;
@@ -63,7 +63,7 @@ public class SimpleCardView implements Serializable {
         return expansionSetCode;
     }
 
-    public int getCardNumber() {
+    public String getCardNumber() {
         return cardNumber;
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjaniVengeant.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjaniVengeant.java
index 30a91fca1b..2953b71054 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjaniVengeant.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjaniVengeant.java
@@ -37,7 +37,7 @@ public class AjaniVengeant extends mage.sets.shardsofalara.AjaniVengeant {
 
     public AjaniVengeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisMantra.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisMantra.java
index c518ba9daf..d1c08c2661 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisMantra.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisMantra.java
@@ -37,7 +37,7 @@ public class AjanisMantra extends mage.sets.magic2011.AjanisMantra {
 
     public AjanisMantra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisPridemate.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisPridemate.java
index ba6a814ae4..24dfcd0ebc 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisPridemate.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/AjanisPridemate.java
@@ -37,7 +37,7 @@ public class AjanisPridemate extends mage.sets.magic2011.AjanisPridemate {
 
     public AjanisPridemate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BehemothSledge.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BehemothSledge.java
index 34606d914e..99696a3d88 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BehemothSledge.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BehemothSledge.java
@@ -37,7 +37,7 @@ public class BehemothSledge extends mage.sets.alarareborn.BehemothSledge {
 
     public BehemothSledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BlazingSpecter.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BlazingSpecter.java
index 70a38b28d0..bb6e7ad009 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BlazingSpecter.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BlazingSpecter.java
@@ -37,7 +37,7 @@ public class BlazingSpecter extends mage.sets.invasion.BlazingSpecter {
 
     public BlazingSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BrackwaterElemental.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BrackwaterElemental.java
index 947cf6df84..a49f3420f9 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BrackwaterElemental.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/BrackwaterElemental.java
@@ -37,7 +37,7 @@ public class BrackwaterElemental extends mage.sets.conflux.BrackwaterElemental {
 
     public BrackwaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Briarhorn.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Briarhorn.java
index a1e630681a..e23b0274e3 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Briarhorn.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Briarhorn.java
@@ -37,7 +37,7 @@ public class Briarhorn extends mage.sets.planechase.Briarhorn {
 
     public Briarhorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CanyonWildcat.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CanyonWildcat.java
index 0000f2c102..dc3dd458ba 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CanyonWildcat.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CanyonWildcat.java
@@ -37,7 +37,7 @@ public class CanyonWildcat extends mage.sets.tempest.CanyonWildcat {
 
     public CanyonWildcat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Countersquall.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Countersquall.java
index 6ffb0b5e6f..58e9756e30 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Countersquall.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Countersquall.java
@@ -37,7 +37,7 @@ public class Countersquall extends mage.sets.conflux.Countersquall {
 
     public Countersquall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CruelUltimatum.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CruelUltimatum.java
index 9a5d9c28f4..4caa6da68e 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CruelUltimatum.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CruelUltimatum.java
@@ -37,7 +37,7 @@ public class CruelUltimatum extends mage.sets.shardsofalara.CruelUltimatum {
 
     public CruelUltimatum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CrumblingNecropolis.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CrumblingNecropolis.java
index a99be2dd43..57f7d99873 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CrumblingNecropolis.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/CrumblingNecropolis.java
@@ -37,7 +37,7 @@ public class CrumblingNecropolis extends mage.sets.shardsofalara.CrumblingNecrop
 
     public CrumblingNecropolis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DeepAnalysis.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DeepAnalysis.java
index 7f85d7ac9b..54da53c149 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DeepAnalysis.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DeepAnalysis.java
@@ -38,7 +38,7 @@ public class DeepAnalysis extends mage.sets.torment.DeepAnalysis {
 
     public DeepAnalysis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDH";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DimirCutpurse.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DimirCutpurse.java
index f378c05d3a..b64e2fbc35 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DimirCutpurse.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/DimirCutpurse.java
@@ -38,7 +38,7 @@ public class DimirCutpurse extends mage.sets.ravnica.DimirCutpurse {
 
     public DimirCutpurse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ElderMastery.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ElderMastery.java
index 2fb308c460..188ef3cebf 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ElderMastery.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ElderMastery.java
@@ -37,7 +37,7 @@ public class ElderMastery extends mage.sets.conflux.ElderMastery {
 
     public ElderMastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EssenceWarden.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EssenceWarden.java
index 37072f55d1..10112b2a0f 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EssenceWarden.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EssenceWarden.java
@@ -37,7 +37,7 @@ public class EssenceWarden extends mage.sets.planarchaos.EssenceWarden {
 
     public EssenceWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EvolvingWilds.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EvolvingWilds.java
index 418b8ea49e..b22746c4e1 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FireFieldOgre.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FireFieldOgre.java
index d08b2337ea..cc28ddf733 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FireFieldOgre.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FireFieldOgre.java
@@ -37,7 +37,7 @@ public class FireFieldOgre extends mage.sets.shardsofalara.FireFieldOgre {
 
     public FireFieldOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FiremaneAngel.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FiremaneAngel.java
index 935f638cdd..6f437d048f 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FiremaneAngel.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FiremaneAngel.java
@@ -37,7 +37,7 @@ public class FiremaneAngel extends mage.sets.ravnica.FiremaneAngel {
 
     public FiremaneAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FleetfootPanther.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FleetfootPanther.java
index ea2f8ad2ea..286c53136f 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FleetfootPanther.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/FleetfootPanther.java
@@ -37,7 +37,7 @@ public class FleetfootPanther extends mage.sets.planeshift.FleetfootPanther {
 
     public FleetfootPanther(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GraypeltRefuge.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GraypeltRefuge.java
index 6b82f2ce3a..eecea826c5 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GraypeltRefuge.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GraypeltRefuge.java
@@ -37,7 +37,7 @@ public class GraypeltRefuge extends mage.sets.zendikar.GraypeltRefuge {
 
     public GraypeltRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrazingGladehart.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrazingGladehart.java
index 99c35b26a1..68f7ffe97d 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrazingGladehart.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrazingGladehart.java
@@ -37,7 +37,7 @@ public class GrazingGladehart extends mage.sets.zendikar.GrazingGladehart {
 
     public GrazingGladehart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GriffinGuide.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GriffinGuide.java
index 24552853ad..afb9e0b24f 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GriffinGuide.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GriffinGuide.java
@@ -37,7 +37,7 @@ public class GriffinGuide extends mage.sets.timespiral.GriffinGuide {
 
     public GriffinGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrixisCharm.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrixisCharm.java
index d1f7e8f9bd..0f2f4493a1 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrixisCharm.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/GrixisCharm.java
@@ -37,7 +37,7 @@ public class GrixisCharm extends mage.sets.shardsofalara.GrixisCharm {
 
     public GrixisCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/HellfireMongrel.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/HellfireMongrel.java
index 9ce15854fa..66bd477aac 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/HellfireMongrel.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/HellfireMongrel.java
@@ -37,7 +37,7 @@ public class HellfireMongrel extends mage.sets.zendikar.HellfireMongrel {
 
     public HellfireMongrel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IcyManipulator.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IcyManipulator.java
index 611f4f6133..82cd29217b 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IgneousPouncer.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IgneousPouncer.java
index ffab0ce662..1ef2c72109 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IgneousPouncer.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/IgneousPouncer.java
@@ -37,7 +37,7 @@ public class IgneousPouncer extends mage.sets.alarareborn.IgneousPouncer {
 
     public IgneousPouncer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JadeMage.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JadeMage.java
index ff54600ef1..54bda57abb 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JadeMage.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JadeMage.java
@@ -37,7 +37,7 @@ public class JadeMage extends mage.sets.magic2012.JadeMage {
 
     public JadeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JhessianZombies.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JhessianZombies.java
index f00eda93b7..5dcee92503 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JhessianZombies.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JhessianZombies.java
@@ -37,7 +37,7 @@ public class JhessianZombies extends mage.sets.alarareborn.JhessianZombies {
 
     public JhessianZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JungleShrine.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JungleShrine.java
index b52063db6f..3ceb8e6bed 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JungleShrine.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/JungleShrine.java
@@ -37,7 +37,7 @@ public class JungleShrine extends mage.sets.shardsofalara.JungleShrine {
 
     public JungleShrine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KazanduRefuge.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KazanduRefuge.java
index 8f085fd596..0f5f00c98b 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KazanduRefuge.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KazanduRefuge.java
@@ -37,7 +37,7 @@ public class KazanduRefuge extends mage.sets.zendikar.KazanduRefuge {
 
     public KazanduRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KirdApe.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KirdApe.java
index 8d70b18531..c86db83a65 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KirdApe.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/KirdApe.java
@@ -37,7 +37,7 @@ public class KirdApe extends mage.sets.ninthedition.KirdApe {
 
     public KirdApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LeadTheStampede.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LeadTheStampede.java
index 39aac14a70..c8568807a9 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LeadTheStampede.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LeadTheStampede.java
@@ -37,7 +37,7 @@ public class LeadTheStampede extends mage.sets.mirrodinbesieged.LeadTheStampede
 
     public LeadTheStampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LightningHelix.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LightningHelix.java
index 42e0a25252..32e890e9d5 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LightningHelix.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LightningHelix.java
@@ -37,7 +37,7 @@ public class LightningHelix extends mage.sets.ravnica.LightningHelix {
 
     public LightningHelix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoamLion.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoamLion.java
index b6032c024b..d03261abe1 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoamLion.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoamLion.java
@@ -37,7 +37,7 @@ public class LoamLion extends mage.sets.worldwake.LoamLion {
 
     public LoamLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoxodonHierarch.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoxodonHierarch.java
index 874eef2449..ef96fdbdb2 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoxodonHierarch.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoxodonHierarch.java
@@ -37,7 +37,7 @@ public class LoxodonHierarch extends mage.sets.ravnica.LoxodonHierarch {
 
     public LoxodonHierarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MarisisTwinclaws.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MarisisTwinclaws.java
index e42c68ed23..6827fa3ac0 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MarisisTwinclaws.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MarisisTwinclaws.java
@@ -37,7 +37,7 @@ public class MarisisTwinclaws extends mage.sets.alarareborn.MarisisTwinclaws {
 
     public MarisisTwinclaws(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MorgueToad.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MorgueToad.java
index deda1a6ced..279c7949b5 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MorgueToad.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/MorgueToad.java
@@ -37,7 +37,7 @@ public class MorgueToad extends mage.sets.planeshift.MorgueToad {
 
     public MorgueToad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Moroii.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Moroii.java
index 0f2b451cdc..d2efcfd1f3 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Moroii.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Moroii.java
@@ -37,7 +37,7 @@ public class Moroii extends mage.sets.ravnica.Moroii {
 
     public Moroii(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NacatlHuntPride.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NacatlHuntPride.java
index 676d6b3933..be1332da20 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NacatlHuntPride.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NacatlHuntPride.java
@@ -37,7 +37,7 @@ public class NacatlHuntPride extends mage.sets.conflux.NacatlHuntPride {
 
     public NacatlHuntPride(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NayaCharm.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NayaCharm.java
index c6075946a9..26bee2136f 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NayaCharm.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NayaCharm.java
@@ -37,7 +37,7 @@ public class NayaCharm extends mage.sets.shardsofalara.NayaCharm {
 
     public NayaCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NicolBolasPlaneswalker.java
index 24407cf83a..0514df34e5 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NicolBolasPlaneswalker.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NicolBolasPlaneswalker.java
@@ -37,7 +37,7 @@ public class NicolBolasPlaneswalker extends mage.sets.conflux.NicolBolasPlaneswa
 
     public NicolBolasPlaneswalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NightscapeFamiliar.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NightscapeFamiliar.java
index 5744d0eb3c..9a3598544e 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NightscapeFamiliar.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/NightscapeFamiliar.java
@@ -37,7 +37,7 @@ public class NightscapeFamiliar extends mage.sets.planeshift.NightscapeFamiliar
 
     public NightscapeFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ObeliskOfGrixis.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ObeliskOfGrixis.java
index bb85f15071..2ac79cc33a 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ObeliskOfGrixis.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ObeliskOfGrixis.java
@@ -37,7 +37,7 @@ public class ObeliskOfGrixis extends mage.sets.shardsofalara.ObeliskOfGrixis {
 
     public ObeliskOfGrixis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PainSuffering.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PainSuffering.java
index 3870b891a4..f059f37dcd 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PainSuffering.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PainSuffering.java
@@ -37,7 +37,7 @@ public class PainSuffering extends mage.sets.invasion.PainSuffering {
 
     public PainSuffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java
index fee71ccd43..1d44cf247a 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java
@@ -37,7 +37,7 @@ public class PrideOfLions extends mage.sets.starter1999.PrideOfLions {
 
     public PrideOfLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ProfaneCommand.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ProfaneCommand.java
index b45fc27a11..619f2c9b75 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ProfaneCommand.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/ProfaneCommand.java
@@ -37,7 +37,7 @@ public class ProfaneCommand extends mage.sets.commander2014.ProfaneCommand {
 
     public ProfaneCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/QasaliPridemage.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/QasaliPridemage.java
index 709d1aae7f..f927a8e808 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/QasaliPridemage.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/QasaliPridemage.java
@@ -37,7 +37,7 @@ public class QasaliPridemage extends mage.sets.alarareborn.QasaliPridemage {
 
     public QasaliPridemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Recoil.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Recoil.java
index 7414a8a09b..713a1a8fab 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Recoil.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Recoil.java
@@ -37,7 +37,7 @@ public class Recoil extends mage.sets.invasion.Recoil {
 
     public Recoil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RecumbentBliss.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RecumbentBliss.java
index 66faf29152..6036c8b408 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RecumbentBliss.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RecumbentBliss.java
@@ -37,7 +37,7 @@ public class RecumbentBliss extends mage.sets.eventide.RecumbentBliss {
 
     public RecumbentBliss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RiseFall.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RiseFall.java
index a3dcda0feb..ca0a127dda 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RiseFall.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RiseFall.java
@@ -37,7 +37,7 @@ public class RiseFall extends mage.sets.dissension.RiseFall {
 
     public RiseFall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDH";
         
     }
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RuptureSpire.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RuptureSpire.java
index 34c7191006..cf7821f4bc 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RuptureSpire.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/RuptureSpire.java
@@ -37,7 +37,7 @@ public class RuptureSpire extends mage.sets.conflux.RuptureSpire {
 
     public RuptureSpire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SapseepForest.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SapseepForest.java
index 5f52c8192f..366f295310 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SapseepForest.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SapseepForest.java
@@ -37,7 +37,7 @@ public class SapseepForest extends mage.sets.shadowmoor.SapseepForest {
 
     public SapseepForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SearingMeditation.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SearingMeditation.java
index 8471cdab1d..ff6998c83e 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SearingMeditation.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SearingMeditation.java
@@ -37,7 +37,7 @@ public class SearingMeditation extends mage.sets.ravnica.SearingMeditation {
 
     public SearingMeditation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Shriekmaw.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Shriekmaw.java
index 0939ca0b36..8afc019899 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Shriekmaw.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Shriekmaw.java
@@ -37,7 +37,7 @@ public class Shriekmaw extends mage.sets.commander.Shriekmaw {
 
     public Shriekmaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveOfBolas.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveOfBolas.java
index 731a3f14ca..e18721e784 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveOfBolas.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveOfBolas.java
@@ -37,7 +37,7 @@ public class SlaveOfBolas extends mage.sets.alarareborn.SlaveOfBolas {
 
     public SlaveOfBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveringNulls.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveringNulls.java
index b1e2932096..e8c8c9bce3 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveringNulls.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SlaveringNulls.java
@@ -37,7 +37,7 @@ public class SlaveringNulls extends mage.sets.worldwake.SlaveringNulls {
 
     public SlaveringNulls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SpiteMalice.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SpiteMalice.java
index 6866de90cf..ab97024e6e 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SpiteMalice.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SpiteMalice.java
@@ -37,7 +37,7 @@ public class SpiteMalice extends mage.sets.invasion.SpiteMalice {
 
     public SpiteMalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Spitemare.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Spitemare.java
index 4663918cc7..dea59630ab 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Spitemare.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Spitemare.java
@@ -37,7 +37,7 @@ public class Spitemare extends mage.sets.eventide.Spitemare {
 
     public Spitemare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SteamcoreWeird.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SteamcoreWeird.java
index 34a44cf20c..3e7e593e8e 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SteamcoreWeird.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SteamcoreWeird.java
@@ -37,7 +37,7 @@ public class SteamcoreWeird extends mage.sets.izzetvsgolgari.SteamcoreWeird {
 
     public SteamcoreWeird(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SurveillingSprite.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SurveillingSprite.java
index 97316e4c4c..ce7f025e41 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SurveillingSprite.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SurveillingSprite.java
@@ -37,7 +37,7 @@ public class SurveillingSprite extends mage.sets.ravnica.SurveillingSprite {
 
     public SurveillingSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanBounty.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanBounty.java
index 0c783e59cb..d856829299 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanBounty.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanBounty.java
@@ -37,7 +37,7 @@ public class SylvanBounty extends mage.sets.conflux.SylvanBounty {
 
     public SylvanBounty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanRanger.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanRanger.java
index 0e9a86176c..24299fcf75 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanRanger.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/SylvanRanger.java
@@ -37,7 +37,7 @@ public class SylvanRanger extends mage.sets.magic2011.SylvanRanger {
 
     public SylvanRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TerramorphicExpanse.java
index 2de990e290..4564b49b71 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TitanicUltimatum.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TitanicUltimatum.java
index 76587b0101..ab6ff6430a 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TitanicUltimatum.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/TitanicUltimatum.java
@@ -37,7 +37,7 @@ public class TitanicUltimatum extends mage.sets.shardsofalara.TitanicUltimatum {
 
     public TitanicUltimatum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Undermine.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Undermine.java
index 7da9d9b59c..ae474a5eae 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Undermine.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Undermine.java
@@ -37,7 +37,7 @@ public class Undermine extends mage.sets.invasion.Undermine {
 
     public Undermine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VaporSnag.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VaporSnag.java
index 36d0d38fc0..50de8e7e61 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VaporSnag.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VaporSnag.java
@@ -37,7 +37,7 @@ public class VaporSnag extends mage.sets.newphyrexia.VaporSnag {
 
     public VaporSnag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VituGhaziTheCityTree.java
index 7352b1ff6e..34e0c40935 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VituGhaziTheCityTree.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/VituGhaziTheCityTree.java
@@ -37,7 +37,7 @@ public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree
 
     public VituGhaziTheCityTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WildNacatl.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WildNacatl.java
index f70ab8c3de..63e2239e44 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WildNacatl.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WildNacatl.java
@@ -37,7 +37,7 @@ public class WildNacatl extends mage.sets.shardsofalara.WildNacatl {
 
     public WildNacatl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WoollyThoctar.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WoollyThoctar.java
index d3ca006a31..6585842779 100644
--- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WoollyThoctar.java
+++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/WoollyThoctar.java
@@ -37,7 +37,7 @@ public class WoollyThoctar extends mage.sets.shardsofalara.WoollyThoctar {
 
     public WoollyThoctar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java b/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java
index 4436d4a430..fce3390ee1 100644
--- a/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java
+++ b/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java
@@ -37,7 +37,7 @@ public class AesthirGlider2 extends mage.sets.alliances.AesthirGlider1 {
 
     public AesthirGlider2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/AgentOfStromgald2.java b/Mage.Sets/src/mage/sets/alliances/AgentOfStromgald2.java
index d3885ca2bc..421f9084be 100644
--- a/Mage.Sets/src/mage/sets/alliances/AgentOfStromgald2.java
+++ b/Mage.Sets/src/mage/sets/alliances/AgentOfStromgald2.java
@@ -37,7 +37,7 @@ public class AgentOfStromgald2 extends AgentOfStromgald1 {
 
     public AgentOfStromgald2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
     }
 
     public AgentOfStromgald2(final AgentOfStromgald2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java
index 8201b657b0..9cbc543b99 100644
--- a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java
+++ b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java
@@ -37,7 +37,7 @@ public class ArcaneDenial1 extends mage.sets.commander2013.ArcaneDenial {
 
     public ArcaneDenial1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java
index 77611fda7a..88bb305810 100644
--- a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java
+++ b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java
@@ -37,7 +37,7 @@ public class ArcaneDenial2 extends mage.sets.commander2013.ArcaneDenial {
 
     public ArcaneDenial2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/Astrolabe1.java b/Mage.Sets/src/mage/sets/alliances/Astrolabe1.java
index ec59b50b40..679066b252 100644
--- a/Mage.Sets/src/mage/sets/alliances/Astrolabe1.java
+++ b/Mage.Sets/src/mage/sets/alliances/Astrolabe1.java
@@ -37,7 +37,7 @@ public class Astrolabe1 extends mage.sets.masterseditioniii.Astrolabe {
 
     public Astrolabe1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java b/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java
index 1ef0204026..e023256e1e 100644
--- a/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java
+++ b/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java
@@ -37,7 +37,7 @@ public class Astrolabe2 extends mage.sets.masterseditioniii.Astrolabe {
 
     public Astrolabe2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/BalduvianDead.java b/Mage.Sets/src/mage/sets/alliances/BalduvianDead.java
index 972dfa8b22..6a6c733fbe 100644
--- a/Mage.Sets/src/mage/sets/alliances/BalduvianDead.java
+++ b/Mage.Sets/src/mage/sets/alliances/BalduvianDead.java
@@ -37,7 +37,7 @@ public class BalduvianDead extends mage.sets.masterseditionii.BalduvianDead {
 
     public BalduvianDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/BalduvianWarMakers2.java b/Mage.Sets/src/mage/sets/alliances/BalduvianWarMakers2.java
index 175ba8a214..750d4d1e79 100644
--- a/Mage.Sets/src/mage/sets/alliances/BalduvianWarMakers2.java
+++ b/Mage.Sets/src/mage/sets/alliances/BalduvianWarMakers2.java
@@ -37,7 +37,7 @@ public class BalduvianWarMakers2 extends BalduvianWarMakers1 {
 
     public BalduvianWarMakers2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
     }
 
     public BalduvianWarMakers2(final BalduvianWarMakers2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/BountyOfTheHunt.java b/Mage.Sets/src/mage/sets/alliances/BountyOfTheHunt.java
index 5853f12456..0e784d90e7 100644
--- a/Mage.Sets/src/mage/sets/alliances/BountyOfTheHunt.java
+++ b/Mage.Sets/src/mage/sets/alliances/BountyOfTheHunt.java
@@ -38,7 +38,7 @@ public class BountyOfTheHunt extends mage.sets.masterseditionii.BountyOfTheHunt
 
     public BountyOfTheHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/CarrierPigeons2.java b/Mage.Sets/src/mage/sets/alliances/CarrierPigeons2.java
index 974a74f035..85fb5e125f 100644
--- a/Mage.Sets/src/mage/sets/alliances/CarrierPigeons2.java
+++ b/Mage.Sets/src/mage/sets/alliances/CarrierPigeons2.java
@@ -37,7 +37,7 @@ public class CarrierPigeons2 extends mage.sets.alliances.CarrierPigeons1 {
 
     public CarrierPigeons2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect1.java b/Mage.Sets/src/mage/sets/alliances/DeadlyInsect1.java
index 7f0fefe467..140052ae1d 100644
--- a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect1.java
+++ b/Mage.Sets/src/mage/sets/alliances/DeadlyInsect1.java
@@ -37,7 +37,7 @@ public class DeadlyInsect1 extends mage.sets.mercadianmasques.DeadlyInsect {
 
     public DeadlyInsect1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect2.java b/Mage.Sets/src/mage/sets/alliances/DeadlyInsect2.java
index 747c82dd77..144a8c756e 100644
--- a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect2.java
+++ b/Mage.Sets/src/mage/sets/alliances/DeadlyInsect2.java
@@ -37,7 +37,7 @@ public class DeadlyInsect2 extends mage.sets.mercadianmasques.DeadlyInsect {
 
     public DeadlyInsect2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishBard.java b/Mage.Sets/src/mage/sets/alliances/ElvishBard.java
index 7158bacaa4..7edfc54199 100644
--- a/Mage.Sets/src/mage/sets/alliances/ElvishBard.java
+++ b/Mage.Sets/src/mage/sets/alliances/ElvishBard.java
@@ -37,7 +37,7 @@ public class ElvishBard extends mage.sets.ninthedition.ElvishBard {
 
     public ElvishBard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java
index 6f86d56e3d..40b954bf10 100644
--- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java
+++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java
@@ -37,7 +37,7 @@ public class ElvishRanger1 extends mage.sets.portal.ElvishRanger {
 
     public ElvishRanger1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java
index 9aa1ebd775..332d2efb15 100644
--- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java
+++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java
@@ -37,7 +37,7 @@ public class ElvishRanger2 extends mage.sets.portal.ElvishRanger {
 
     public ElvishRanger2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/EnslavedScout2.java b/Mage.Sets/src/mage/sets/alliances/EnslavedScout2.java
index 51a1f2cffa..ddb35731a7 100644
--- a/Mage.Sets/src/mage/sets/alliances/EnslavedScout2.java
+++ b/Mage.Sets/src/mage/sets/alliances/EnslavedScout2.java
@@ -37,7 +37,7 @@ public class EnslavedScout2 extends mage.sets.alliances.EnslavedScout1 {
 
     public EnslavedScout2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/FalseDemise1.java b/Mage.Sets/src/mage/sets/alliances/FalseDemise1.java
index 980d5b7005..ea5628dd7f 100644
--- a/Mage.Sets/src/mage/sets/alliances/FalseDemise1.java
+++ b/Mage.Sets/src/mage/sets/alliances/FalseDemise1.java
@@ -39,7 +39,7 @@ public class FalseDemise1 extends mage.sets.mercadianmasques.FalseDemise {
 
     public FalseDemise1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java b/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java
index 614a15ca4d..52402abc59 100644
--- a/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java
+++ b/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java
@@ -39,7 +39,7 @@ public class FalseDemise2 extends mage.sets.mercadianmasques.FalseDemise {
 
     public FalseDemise2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java
index dcdb28a347..e3b8c1def3 100644
--- a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java
+++ b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java
@@ -37,7 +37,7 @@ public class FeastOrFamine1 extends mage.sets.izzetvsgolgari.FeastOrFamine {
 
     public FeastOrFamine1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java
index 36b61ba137..aeda124765 100644
--- a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java
+++ b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java
@@ -37,7 +37,7 @@ public class FeastOrFamine2 extends mage.sets.izzetvsgolgari.FeastOrFamine {
 
     public FeastOrFamine2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/FeveredStrength2.java b/Mage.Sets/src/mage/sets/alliances/FeveredStrength2.java
index 9f87d7e30d..ddb13c6ef2 100644
--- a/Mage.Sets/src/mage/sets/alliances/FeveredStrength2.java
+++ b/Mage.Sets/src/mage/sets/alliances/FeveredStrength2.java
@@ -37,7 +37,7 @@ public class FeveredStrength2 extends mage.sets.alliances.FeveredStrength1 {
 
     public FeveredStrength2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/FloodwaterDam.java b/Mage.Sets/src/mage/sets/alliances/FloodwaterDam.java
index ae4e16a926..a158ffd9c1 100644
--- a/Mage.Sets/src/mage/sets/alliances/FloodwaterDam.java
+++ b/Mage.Sets/src/mage/sets/alliances/FloodwaterDam.java
@@ -37,7 +37,7 @@ public class FloodwaterDam extends mage.sets.masterseditioniv.FloodwaterDam {
 
     public FloodwaterDam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaBerserkers2.java b/Mage.Sets/src/mage/sets/alliances/GorillaBerserkers2.java
index 1991e68562..0bdabb066c 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaBerserkers2.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaBerserkers2.java
@@ -37,7 +37,7 @@ public class GorillaBerserkers2 extends GorillaBerserkers1 {
 
     public GorillaBerserkers2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
     }
 
     public GorillaBerserkers2(final GorillaBerserkers2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java
index 487d2863c4..71ab8554bb 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java
@@ -37,7 +37,7 @@ public class GorillaChieftain1 extends mage.sets.seventhedition.GorillaChieftain
 
     public GorillaChieftain1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java
index facc87d9df..66443326db 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java
@@ -37,7 +37,7 @@ public class GorillaChieftain2 extends mage.sets.seventhedition.GorillaChieftain
 
     public GorillaChieftain2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java b/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java
index d6f1c2181d..5a45f795b9 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java
@@ -38,7 +38,7 @@ public class GorillaShaman2 extends GorillaShaman1 {
 
     public GorillaShaman2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.rarity = Rarity.UNCOMMON;
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaWarCry1.java b/Mage.Sets/src/mage/sets/alliances/GorillaWarCry1.java
index 8ee452418b..bf0f5c60ea 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaWarCry1.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaWarCry1.java
@@ -37,7 +37,7 @@ public class GorillaWarCry1 extends mage.sets.masterseditioniv.GorillaWarCry {
 
     public GorillaWarCry1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaWarCry2.java b/Mage.Sets/src/mage/sets/alliances/GorillaWarCry2.java
index 657c2278db..9055291a67 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaWarCry2.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaWarCry2.java
@@ -37,7 +37,7 @@ public class GorillaWarCry2 extends mage.sets.masterseditioniv.GorillaWarCry {
 
     public GorillaWarCry2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java
index c887643a77..1c4f3882b2 100644
--- a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java
+++ b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java
@@ -38,7 +38,7 @@ public class GuerrillaTactics1 extends mage.sets.ninthedition.GuerrillaTactics {
 
     public GuerrillaTactics1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java
index c8590db5f2..26630e3cdf 100644
--- a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java
+++ b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java
@@ -38,7 +38,7 @@ public class GuerrillaTactics2 extends mage.sets.ninthedition.GuerrillaTactics {
 
     public GuerrillaTactics2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/InsidiousBookworms2.java b/Mage.Sets/src/mage/sets/alliances/InsidiousBookworms2.java
index 6b8167641e..f276742247 100644
--- a/Mage.Sets/src/mage/sets/alliances/InsidiousBookworms2.java
+++ b/Mage.Sets/src/mage/sets/alliances/InsidiousBookworms2.java
@@ -37,7 +37,7 @@ public class InsidiousBookworms2 extends InsidiousBookworms1 {
 
     public InsidiousBookworms2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
     }
 
     public InsidiousBookworms2(final InsidiousBookworms2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/KjeldoranOutpost.java b/Mage.Sets/src/mage/sets/alliances/KjeldoranOutpost.java
index ad57069318..2186a2d907 100644
--- a/Mage.Sets/src/mage/sets/alliances/KjeldoranOutpost.java
+++ b/Mage.Sets/src/mage/sets/alliances/KjeldoranOutpost.java
@@ -37,7 +37,7 @@ public class KjeldoranOutpost extends mage.sets.vintagemasters.KjeldoranOutpost
 
     public KjeldoranOutpost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/LakeOfTheDead.java b/Mage.Sets/src/mage/sets/alliances/LakeOfTheDead.java
index 6b6c23f0f7..0f687d7615 100644
--- a/Mage.Sets/src/mage/sets/alliances/LakeOfTheDead.java
+++ b/Mage.Sets/src/mage/sets/alliances/LakeOfTheDead.java
@@ -37,7 +37,7 @@ public class LakeOfTheDead extends mage.sets.vintagemasters.LakeOfTheDead {
 
     public LakeOfTheDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/LimDulsHighGuard2.java b/Mage.Sets/src/mage/sets/alliances/LimDulsHighGuard2.java
index f3eeba47cc..b4de4d2c11 100644
--- a/Mage.Sets/src/mage/sets/alliances/LimDulsHighGuard2.java
+++ b/Mage.Sets/src/mage/sets/alliances/LimDulsHighGuard2.java
@@ -37,7 +37,7 @@ public class LimDulsHighGuard2 extends LimDulsHighGuard1 {
 
     public LimDulsHighGuard2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
     }
 
     public LimDulsHighGuard2(final LimDulsHighGuard2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/LimDulsVault.java b/Mage.Sets/src/mage/sets/alliances/LimDulsVault.java
index b57d0283f7..33b87072bf 100644
--- a/Mage.Sets/src/mage/sets/alliances/LimDulsVault.java
+++ b/Mage.Sets/src/mage/sets/alliances/LimDulsVault.java
@@ -37,7 +37,7 @@ public class LimDulsVault extends mage.sets.commander2013.LimDulsVault {
 
     public LimDulsVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java b/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java
index e7653af15b..6367d87184 100644
--- a/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java
+++ b/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java
@@ -37,7 +37,7 @@ public class PhyrexianWarBeast2 extends PhyrexianWarBeast1 {
 
     public PhyrexianWarBeast2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
     }
 
     public PhyrexianWarBeast2(final PhyrexianWarBeast2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/Pillage.java b/Mage.Sets/src/mage/sets/alliances/Pillage.java
index bdd7edd75b..b7d098f219 100644
--- a/Mage.Sets/src/mage/sets/alliances/Pillage.java
+++ b/Mage.Sets/src/mage/sets/alliances/Pillage.java
@@ -37,7 +37,7 @@ public class Pillage extends mage.sets.seventhedition.Pillage {
 
     public Pillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/Reinforcements1.java b/Mage.Sets/src/mage/sets/alliances/Reinforcements1.java
index 7863eca7cb..04be76b643 100644
--- a/Mage.Sets/src/mage/sets/alliances/Reinforcements1.java
+++ b/Mage.Sets/src/mage/sets/alliances/Reinforcements1.java
@@ -37,7 +37,7 @@ public class Reinforcements1 extends mage.sets.masterseditionii.Reinforcements {
 
     public Reinforcements1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/Reinforcements2.java b/Mage.Sets/src/mage/sets/alliances/Reinforcements2.java
index e9010af879..f7f81d428f 100644
--- a/Mage.Sets/src/mage/sets/alliances/Reinforcements2.java
+++ b/Mage.Sets/src/mage/sets/alliances/Reinforcements2.java
@@ -37,7 +37,7 @@ public class Reinforcements2 extends mage.sets.masterseditionii.Reinforcements {
 
     public Reinforcements2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/Reprisal1.java b/Mage.Sets/src/mage/sets/alliances/Reprisal1.java
index 9bc04ed91c..1111e1e1ea 100644
--- a/Mage.Sets/src/mage/sets/alliances/Reprisal1.java
+++ b/Mage.Sets/src/mage/sets/alliances/Reprisal1.java
@@ -38,7 +38,7 @@ public class Reprisal1 extends mage.sets.seventhedition.Reprisal {
 
     public Reprisal1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/Reprisal2.java b/Mage.Sets/src/mage/sets/alliances/Reprisal2.java
index 80ac2f0193..135e55f463 100644
--- a/Mage.Sets/src/mage/sets/alliances/Reprisal2.java
+++ b/Mage.Sets/src/mage/sets/alliances/Reprisal2.java
@@ -38,7 +38,7 @@ public class Reprisal2 extends mage.sets.seventhedition.Reprisal {
 
     public Reprisal2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/RitualOfTheMachine.java b/Mage.Sets/src/mage/sets/alliances/RitualOfTheMachine.java
index a70b36bb67..2d5e222c00 100644
--- a/Mage.Sets/src/mage/sets/alliances/RitualOfTheMachine.java
+++ b/Mage.Sets/src/mage/sets/alliances/RitualOfTheMachine.java
@@ -37,7 +37,7 @@ public class RitualOfTheMachine extends mage.sets.masterseditionii.RitualOfTheMa
 
     public RitualOfTheMachine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java b/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java
index 6391e0d3fb..ee27909fa4 100644
--- a/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java
+++ b/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java
@@ -38,7 +38,7 @@ public class RoyalHerbalist2 extends mage.sets.alliances.RoyalHerbalist1 {
 
     public RoyalHerbalist2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
     }
 
     public RoyalHerbalist2(final RoyalHerbalist2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/SoldeviAdnate2.java b/Mage.Sets/src/mage/sets/alliances/SoldeviAdnate2.java
index 7844a06ceb..9b2ace3cda 100644
--- a/Mage.Sets/src/mage/sets/alliances/SoldeviAdnate2.java
+++ b/Mage.Sets/src/mage/sets/alliances/SoldeviAdnate2.java
@@ -37,7 +37,7 @@ public class SoldeviAdnate2 extends SoldeviAdnate1 {
 
     public SoldeviAdnate2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
     }
 
     public SoldeviAdnate2(final SoldeviAdnate2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java b/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java
index 4705fe539b..e2fcef8cf5 100644
--- a/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java
+++ b/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java
@@ -37,7 +37,7 @@ public class SoldeviSage2 extends mage.sets.alliances.SoldeviSage1 {
 
     public SoldeviSage2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/StormCauldron.java b/Mage.Sets/src/mage/sets/alliances/StormCauldron.java
index 64b8e466dd..c2b70df399 100644
--- a/Mage.Sets/src/mage/sets/alliances/StormCauldron.java
+++ b/Mage.Sets/src/mage/sets/alliances/StormCauldron.java
@@ -37,7 +37,7 @@ public class StormCauldron extends mage.sets.seventhedition.StormCauldron {
 
     public StormCauldron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/StormCrow1.java b/Mage.Sets/src/mage/sets/alliances/StormCrow1.java
index d0c2d03336..d044c1c744 100644
--- a/Mage.Sets/src/mage/sets/alliances/StormCrow1.java
+++ b/Mage.Sets/src/mage/sets/alliances/StormCrow1.java
@@ -37,7 +37,7 @@ public class StormCrow1 extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/StormCrow2.java b/Mage.Sets/src/mage/sets/alliances/StormCrow2.java
index 2444aecb67..9a827055b9 100644
--- a/Mage.Sets/src/mage/sets/alliances/StormCrow2.java
+++ b/Mage.Sets/src/mage/sets/alliances/StormCrow2.java
@@ -37,7 +37,7 @@ public class StormCrow2 extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/StormShaman2.java b/Mage.Sets/src/mage/sets/alliances/StormShaman2.java
index 744d2da86f..810cd89776 100644
--- a/Mage.Sets/src/mage/sets/alliances/StormShaman2.java
+++ b/Mage.Sets/src/mage/sets/alliances/StormShaman2.java
@@ -39,7 +39,7 @@ public class StormShaman2 extends mage.sets.alliances.StormShaman1 {
 
     public StormShaman2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.rarity = Rarity.UNCOMMON;
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/SwampMosquito2.java b/Mage.Sets/src/mage/sets/alliances/SwampMosquito2.java
index 9b44a183cb..282e1d057f 100644
--- a/Mage.Sets/src/mage/sets/alliances/SwampMosquito2.java
+++ b/Mage.Sets/src/mage/sets/alliances/SwampMosquito2.java
@@ -37,7 +37,7 @@ public class SwampMosquito2 extends SwampMosquito1 {
 
     public SwampMosquito2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
     }
 
     public SwampMosquito2(final SwampMosquito2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/ThawingGlaciers.java b/Mage.Sets/src/mage/sets/alliances/ThawingGlaciers.java
index 356c705d51..ba33411323 100644
--- a/Mage.Sets/src/mage/sets/alliances/ThawingGlaciers.java
+++ b/Mage.Sets/src/mage/sets/alliances/ThawingGlaciers.java
@@ -37,7 +37,7 @@ public class ThawingGlaciers extends mage.sets.vintagemasters.ThawingGlaciers {
 
     public ThawingGlaciers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/ThoughtLash.java b/Mage.Sets/src/mage/sets/alliances/ThoughtLash.java
index 9bff7d5927..0ea8f518c2 100644
--- a/Mage.Sets/src/mage/sets/alliances/ThoughtLash.java
+++ b/Mage.Sets/src/mage/sets/alliances/ThoughtLash.java
@@ -37,7 +37,7 @@ public class ThoughtLash extends mage.sets.masterseditionii.ThoughtLash {
 
     public ThoughtLash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/VisceridArmor1.java b/Mage.Sets/src/mage/sets/alliances/VisceridArmor1.java
index c03afe5f1a..f411fe25f6 100644
--- a/Mage.Sets/src/mage/sets/alliances/VisceridArmor1.java
+++ b/Mage.Sets/src/mage/sets/alliances/VisceridArmor1.java
@@ -37,7 +37,7 @@ public class VisceridArmor1 extends mage.sets.masterseditionii.VisceridArmor {
 
     public VisceridArmor1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/VisceridArmor2.java b/Mage.Sets/src/mage/sets/alliances/VisceridArmor2.java
index 756ee36390..4522ac80ad 100644
--- a/Mage.Sets/src/mage/sets/alliances/VisceridArmor2.java
+++ b/Mage.Sets/src/mage/sets/alliances/VisceridArmor2.java
@@ -37,7 +37,7 @@ public class VisceridArmor2 extends mage.sets.masterseditionii.VisceridArmor {
 
     public VisceridArmor2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/WanderingMage.java b/Mage.Sets/src/mage/sets/alliances/WanderingMage.java
index 20d38dca7c..ae82688d36 100644
--- a/Mage.Sets/src/mage/sets/alliances/WanderingMage.java
+++ b/Mage.Sets/src/mage/sets/alliances/WanderingMage.java
@@ -37,7 +37,7 @@ public class WanderingMage extends mage.sets.masterseditioniii.WanderingMage {
 
     public WanderingMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/WhipVine2.java b/Mage.Sets/src/mage/sets/alliances/WhipVine2.java
index 33fab71847..bee5db9c1f 100644
--- a/Mage.Sets/src/mage/sets/alliances/WhipVine2.java
+++ b/Mage.Sets/src/mage/sets/alliances/WhipVine2.java
@@ -37,7 +37,7 @@ public class WhipVine2 extends WhipVine1 {
 
     public WhipVine2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
     }
 
     public WhipVine2(final WhipVine2 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/WildAesthir1.java b/Mage.Sets/src/mage/sets/alliances/WildAesthir1.java
index 7f7c785162..9ad53ebdec 100644
--- a/Mage.Sets/src/mage/sets/alliances/WildAesthir1.java
+++ b/Mage.Sets/src/mage/sets/alliances/WildAesthir1.java
@@ -37,7 +37,7 @@ public class WildAesthir1 extends mage.sets.masterseditioniv.WildAesthir {
 
     public WildAesthir1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/WildAesthir2.java b/Mage.Sets/src/mage/sets/alliances/WildAesthir2.java
index 59c160f0cc..2de8b265f6 100644
--- a/Mage.Sets/src/mage/sets/alliances/WildAesthir2.java
+++ b/Mage.Sets/src/mage/sets/alliances/WildAesthir2.java
@@ -37,7 +37,7 @@ public class WildAesthir2 extends mage.sets.masterseditioniv.WildAesthir {
 
     public WildAesthir2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "ALL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/YavimayaAncients1.java b/Mage.Sets/src/mage/sets/alliances/YavimayaAncients1.java
index c215b3b833..a5f827810c 100644
--- a/Mage.Sets/src/mage/sets/alliances/YavimayaAncients1.java
+++ b/Mage.Sets/src/mage/sets/alliances/YavimayaAncients1.java
@@ -38,7 +38,7 @@ public class YavimayaAncients1 extends mage.sets.masterseditionii.YavimayaAncien
 
     public YavimayaAncients1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/alliances/YavimayaAncients2.java b/Mage.Sets/src/mage/sets/alliances/YavimayaAncients2.java
index a3df8b2b28..ff33ff0b18 100644
--- a/Mage.Sets/src/mage/sets/alliances/YavimayaAncients2.java
+++ b/Mage.Sets/src/mage/sets/alliances/YavimayaAncients2.java
@@ -38,7 +38,7 @@ public class YavimayaAncients2 extends mage.sets.masterseditionii.YavimayaAncien
 
     public YavimayaAncients2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "ALL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalGatekeeper.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalGatekeeper.java
index de125c457e..aca3627b95 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalGatekeeper.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalGatekeeper.java
@@ -37,7 +37,7 @@ public class AbyssalGatekeeper extends mage.sets.divinevsdemonic.AbyssalGatekeep
 
     public AbyssalGatekeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalSpecter.java
index 9ce75c18e0..940290f986 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalSpecter.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AbyssalSpecter.java
@@ -37,7 +37,7 @@ public class AbyssalSpecter extends mage.sets.fifthedition.AbyssalSpecter {
 
     public AbyssalSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AkromaAngelOfWrath.java
index ea1bf78a69..806493e669 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AkromaAngelOfWrath.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AkromaAngelOfWrath.java
@@ -38,7 +38,7 @@ public class AkromaAngelOfWrath extends mage.sets.timeshifted.AkromaAngelOfWrath
 
     public AkromaAngelOfWrath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DD3DVD";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelOfMercy.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelOfMercy.java
index 8b223667b7..f6b35203b5 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicBenediction.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicBenediction.java
index 2d3c973e3b..e04fb8e7fd 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicBenediction.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicBenediction.java
@@ -37,7 +37,7 @@ public class AngelicBenediction extends mage.sets.shardsofalara.AngelicBenedicti
 
     public AngelicBenediction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicPage.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicPage.java
index c3f00d572b..2a1d74a807 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicPage.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicPage.java
@@ -37,7 +37,7 @@ public class AngelicPage extends mage.sets.urzassaga.AngelicPage {
 
     public AngelicPage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicProtector.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicProtector.java
index 0d2e05931e..5dbc96d8c1 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicProtector.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelicProtector.java
@@ -37,7 +37,7 @@ public class AngelicProtector extends mage.sets.tempest.AngelicProtector {
 
     public AngelicProtector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelsFeather.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelsFeather.java
index 717b83316f..61baeb2288 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/AngelsFeather.java
@@ -37,7 +37,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Angelsong.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Angelsong.java
index 6061661aa4..f4d6ab1f87 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Angelsong.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Angelsong.java
@@ -37,7 +37,7 @@ public class Angelsong extends mage.sets.shardsofalara.Angelsong {
 
     public Angelsong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarrenMoor.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarrenMoor.java
index efaa36d657..8741d0dd1b 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarterInBlood.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarterInBlood.java
index a961f6ffbe..ec276a6d02 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarterInBlood.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BarterInBlood.java
@@ -37,7 +37,7 @@ public class BarterInBlood extends mage.sets.avacynrestored.BarterInBlood {
 
     public BarterInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BreedingPit.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BreedingPit.java
index 352db732fd..f98e122ce5 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BreedingPit.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/BreedingPit.java
@@ -37,7 +37,7 @@ public class BreedingPit extends mage.sets.fifthedition.BreedingPit {
 
     public BreedingPit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CacklingImp.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CacklingImp.java
index 4d4c000f57..4f1e92fc62 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CacklingImp.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CacklingImp.java
@@ -37,7 +37,7 @@ public class CacklingImp extends mage.sets.divinevsdemonic.CacklingImp {
 
     public CacklingImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ChargingPaladin.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ChargingPaladin.java
index 3ec7e7243d..8b2cd68b63 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ChargingPaladin.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ChargingPaladin.java
@@ -37,7 +37,7 @@ public class ChargingPaladin extends mage.sets.divinevsdemonic.ChargingPaladin {
 
     public ChargingPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ConsumeSpirit.java
index 0db6d640a4..2b523caf1b 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ConsumeSpirit.java
@@ -37,7 +37,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Corrupt.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Corrupt.java
index 584cc3a01b..6323afa65b 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Corrupt.java
@@ -37,7 +37,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CruelEdict.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CruelEdict.java
index 06605eaa29..cda1391456 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CruelEdict.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/CruelEdict.java
@@ -37,7 +37,7 @@ public class CruelEdict extends mage.sets.tenthedition.CruelEdict {
 
     public CruelEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DaggerclawImp.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DaggerclawImp.java
index d0d2ab1753..39f35363cb 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DaggerclawImp.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DaggerclawImp.java
@@ -37,7 +37,7 @@ public class DaggerclawImp extends mage.sets.guildpact.DaggerclawImp {
 
     public DaggerclawImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkBanishing.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkBanishing.java
index 306e72c6f3..98d158bbd8 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkRitual.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkRitual.java
index ed1db3c680..41cc0a9f38 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonicTutor.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonicTutor.java
index b2deea3ba1..e0d3520785 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonicTutor.java
@@ -37,7 +37,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsHorn.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsHorn.java
index e94b741a22..9049b2cd11 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsHorn.java
@@ -37,7 +37,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsJester.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsJester.java
index ee10f02cc3..eea9f053b9 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsJester.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DemonsJester.java
@@ -37,7 +37,7 @@ public class DemonsJester extends mage.sets.dissension.DemonsJester {
 
     public DemonsJester(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Duress.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Duress.java
index 2fcbfa31ee..6be11ead0e 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Duress.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DuskImp.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DuskImp.java
index e192f60980..1f38a5daab 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DuskImp.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/DuskImp.java
@@ -37,7 +37,7 @@ public class DuskImp extends mage.sets.tenthedition.DuskImp {
 
     public DuskImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FaithsFetters.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FaithsFetters.java
index 08cf02f8ec..5f0d96e67a 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FaithsFetters.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FaithsFetters.java
@@ -37,7 +37,7 @@ public class FaithsFetters extends mage.sets.divinevsdemonic.FaithsFetters {
 
     public FaithsFetters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FallenAngel.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FallenAngel.java
index b800c20b80..90f418eab7 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FallenAngel.java
@@ -37,7 +37,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FoulImp.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FoulImp.java
index d562fe703f..5c66f64334 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FoulImp.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/FoulImp.java
@@ -37,7 +37,7 @@ public class FoulImp extends mage.sets.stronghold.FoulImp {
 
     public FoulImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/HealingSalve.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/HealingSalve.java
index d14fbff387..4fb04e39e0 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/IcatianPriest.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/IcatianPriest.java
index d1c539ceb2..68be178201 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/IcatianPriest.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/IcatianPriest.java
@@ -37,7 +37,7 @@ public class IcatianPriest extends mage.sets.tenthedition.IcatianPriest {
 
     public IcatianPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/KuroPitlord.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/KuroPitlord.java
index 0a83e2110d..f20cf4a05f 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/KuroPitlord.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/KuroPitlord.java
@@ -37,7 +37,7 @@ public class KuroPitlord extends mage.sets.championsofkamigawa.KuroPitlord {
 
     public KuroPitlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LordOfThePit.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LordOfThePit.java
index 40ba1407f2..b7174e2441 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LordOfThePit.java
@@ -37,7 +37,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LuminousAngel.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LuminousAngel.java
index a192965e65..8996151805 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LuminousAngel.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/LuminousAngel.java
@@ -37,7 +37,7 @@ public class LuminousAngel extends mage.sets.mirrodin.LuminousAngel {
 
     public LuminousAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/MarbleDiamond.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/MarbleDiamond.java
index e3e3143ae1..81e3896750 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/MarbleDiamond.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/MarbleDiamond.java
@@ -37,7 +37,7 @@ public class MarbleDiamond extends mage.sets.seventhedition.MarbleDiamond {
 
     public MarbleDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OniPossession.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OniPossession.java
index d9549288fd..700251049c 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OniPossession.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OniPossession.java
@@ -37,7 +37,7 @@ public class OniPossession extends mage.sets.championsofkamigawa.OniPossession {
 
     public OniPossession(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OtherworldlyJourney.java
index 3edf01f2fc..46fc6e7405 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OtherworldlyJourney.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OtherworldlyJourney.java
@@ -37,7 +37,7 @@ public class OtherworldlyJourney extends mage.sets.championsofkamigawa.Otherworl
 
     public OtherworldlyJourney(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OvereagerApprentice.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OvereagerApprentice.java
index 7cf3236ead..7ad6ae14e7 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OvereagerApprentice.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/OvereagerApprentice.java
@@ -37,7 +37,7 @@ public class OvereagerApprentice extends mage.sets.odyssey.OvereagerApprentice {
 
     public OvereagerApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Pacifism.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Pacifism.java
index 732e49817b..3a6bc50d82 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/PromiseOfPower.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/PromiseOfPower.java
index 99b86acfea..75691ed40b 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/PromiseOfPower.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/PromiseOfPower.java
@@ -37,7 +37,7 @@ public class PromiseOfPower extends mage.sets.commander2014.PromiseOfPower {
 
     public PromiseOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReiverDemon.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReiverDemon.java
index 2fec0f0390..a7ca1a6981 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReiverDemon.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReiverDemon.java
@@ -37,7 +37,7 @@ public class ReiverDemon extends mage.sets.divinevsdemonic.ReiverDemon {
 
     public ReiverDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReyaDawnbringer.java
index 8134b3ed4c..b22585d0da 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReyaDawnbringer.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/ReyaDawnbringer.java
@@ -37,7 +37,7 @@ public class ReyaDawnbringer extends mage.sets.tenthedition.ReyaDawnbringer {
 
     public ReyaDawnbringer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/RighteousCause.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/RighteousCause.java
index d90b33d7ea..1a8c06daa5 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/RighteousCause.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/RighteousCause.java
@@ -37,7 +37,7 @@ public class RighteousCause extends mage.sets.commander.RighteousCause {
 
     public RighteousCause(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SecludedSteppe.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SecludedSteppe.java
index 179f852aa8..e7fc43010f 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAdvocate.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAdvocate.java
index 8f6e8dc190..84872d4c1f 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAdvocate.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAdvocate.java
@@ -37,7 +37,7 @@ public class SerraAdvocate extends mage.sets.urzasdestiny.SerraAdvocate {
 
     public SerraAdvocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAngel.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAngel.java
index 6fdb8a18dc..60f9c4ccfa 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerraAngel.java
@@ -37,7 +37,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasBoon.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasBoon.java
index e119bcd31d..e033e43ba4 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasBoon.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasBoon.java
@@ -37,7 +37,7 @@ public class SerrasBoon extends mage.sets.divinevsdemonic.SerrasBoon {
 
     public SerrasBoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasEmbrace.java
index bfe39b68f8..baaaeaaa29 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasEmbrace.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SerrasEmbrace.java
@@ -37,7 +37,7 @@ public class SerrasEmbrace extends mage.sets.tenthedition.SerrasEmbrace {
 
     public SerrasEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SootImp.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SootImp.java
index d600943f9f..2ec6cf8bbf 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SootImp.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SootImp.java
@@ -37,7 +37,7 @@ public class SootImp extends mage.sets.eventide.SootImp {
 
     public SootImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Souldrinker.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Souldrinker.java
index 002fef303a..7e7988ab83 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Souldrinker.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/Souldrinker.java
@@ -37,7 +37,7 @@ public class Souldrinker extends mage.sets.tempest.Souldrinker {
 
     public Souldrinker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/StinkweedImp.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/StinkweedImp.java
index 615045f434..8b2c7b01b9 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/StinkweedImp.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/StinkweedImp.java
@@ -37,7 +37,7 @@ public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
 
     public StinkweedImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SustainerOfTheRealm.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SustainerOfTheRealm.java
index 9536c41b59..ebbf77eb8b 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SustainerOfTheRealm.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/SustainerOfTheRealm.java
@@ -37,7 +37,7 @@ public class SustainerOfTheRealm extends mage.sets.urzaslegacy.SustainerOfTheRea
 
     public SustainerOfTheRealm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/TwilightShepherd.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/TwilightShepherd.java
index 1ce6ed9d62..cbd8d90fd5 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/TwilightShepherd.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/TwilightShepherd.java
@@ -37,7 +37,7 @@ public class TwilightShepherd extends mage.sets.shadowmoor.TwilightShepherd {
 
     public TwilightShepherd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/UnholyStrength.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/UnholyStrength.java
index 29112eec4d..e090f483c0 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/VenerableMonk.java b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/VenerableMonk.java
index faf624d437..d28fdc0c9d 100644
--- a/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/anthologydivinevsdemonic/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DD3DVD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AkkiCoalflinger.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AkkiCoalflinger.java
index c0bf74af25..06b3615b78 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AkkiCoalflinger.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AkkiCoalflinger.java
@@ -37,7 +37,7 @@ public class AkkiCoalflinger extends mage.sets.championsofkamigawa.AkkiCoalfling
 
     public AkkiCoalflinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AllosaurusRider.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AllosaurusRider.java
index f94c0f4334..a5f310c254 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AllosaurusRider.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AllosaurusRider.java
@@ -37,7 +37,7 @@ public class AllosaurusRider extends mage.sets.elvesvsgoblins.AllosaurusRider {
 
     public AllosaurusRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AmbushCommander.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AmbushCommander.java
index c33a8a0e83..9a53c376f3 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AmbushCommander.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/AmbushCommander.java
@@ -37,7 +37,7 @@ public class AmbushCommander extends mage.sets.elvesvsgoblins.AmbushCommander {
 
     public AmbushCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/BoggartShenanigans.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/BoggartShenanigans.java
index 50e79827fe..39bf8aa10b 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/BoggartShenanigans.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/BoggartShenanigans.java
@@ -37,7 +37,7 @@ public class BoggartShenanigans extends mage.sets.elvesvsgoblins.BoggartShenanig
 
     public BoggartShenanigans(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Clickslither.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Clickslither.java
index a66316b24a..0b1aec2ef2 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Clickslither.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Clickslither.java
@@ -37,7 +37,7 @@ public class Clickslither extends mage.sets.elvesvsgoblins.Clickslither {
 
     public Clickslither(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishEulogist.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishEulogist.java
index 8903e72df7..78dd7c104f 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishEulogist.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishEulogist.java
@@ -37,7 +37,7 @@ public class ElvishEulogist extends mage.sets.lorwyn.ElvishEulogist {
 
     public ElvishEulogist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishHarbinger.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishHarbinger.java
index 334d545c96..6181441261 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishHarbinger.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishHarbinger.java
@@ -37,7 +37,7 @@ public class ElvishHarbinger extends mage.sets.lorwyn.ElvishHarbinger {
 
     public ElvishHarbinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishPromenade.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishPromenade.java
index 665cef42e7..fdf9f6439c 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishPromenade.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishPromenade.java
@@ -37,7 +37,7 @@ public class ElvishPromenade extends mage.sets.lorwyn.ElvishPromenade {
 
     public ElvishPromenade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishWarrior.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishWarrior.java
index 7bfea8e301..ed9f4fb39c 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishWarrior.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ElvishWarrior.java
@@ -37,7 +37,7 @@ public class ElvishWarrior extends mage.sets.morningtide.ElvishWarrior {
 
     public ElvishWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/EmberwildeAugur.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/EmberwildeAugur.java
index 731f6eb371..18703c5894 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/EmberwildeAugur.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/EmberwildeAugur.java
@@ -37,7 +37,7 @@ public class EmberwildeAugur extends mage.sets.elvesvsgoblins.EmberwildeAugur {
 
     public EmberwildeAugur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/FlamewaveInvoker.java
index 41143c1859..52ec91c1cf 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/FlamewaveInvoker.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/FlamewaveInvoker.java
@@ -37,7 +37,7 @@ public class FlamewaveInvoker extends mage.sets.tenthedition.FlamewaveInvoker {
 
     public FlamewaveInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ForgottenCave.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ForgottenCave.java
index 1ea1b9946f..79e148edaa 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmIncinerator.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmIncinerator.java
index f00fa032c0..a11b01159e 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmIncinerator.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmIncinerator.java
@@ -37,7 +37,7 @@ public class GempalmIncinerator extends mage.sets.legions.GempalmIncinerator {
 
     public GempalmIncinerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmStrider.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmStrider.java
index f3a9cf25ef..71e161b2dd 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmStrider.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GempalmStrider.java
@@ -37,7 +37,7 @@ public class GempalmStrider extends mage.sets.elvesvsgoblins.GempalmStrider {
 
     public GempalmStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GiantGrowth.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GiantGrowth.java
index 119eecd577..4516266077 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinBurrows.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinBurrows.java
index b101ead08f..f0dfb1d1b3 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinBurrows.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinBurrows.java
@@ -37,7 +37,7 @@ public class GoblinBurrows extends mage.sets.onslaught.GoblinBurrows {
 
     public GoblinBurrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinCohort.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinCohort.java
index 75e88f5400..ccf3d06e60 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinCohort.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinCohort.java
@@ -37,7 +37,7 @@ public class GoblinCohort extends mage.sets.betrayersofkamigawa.GoblinCohort {
 
     public GoblinCohort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinMatron.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinMatron.java
index 66bc0fbdf1..487912119c 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinMatron.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinMatron.java
@@ -38,7 +38,7 @@ public class GoblinMatron extends mage.sets.urzassaga.GoblinMatron {
 
     public GoblinMatron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DD3EVG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinRingleader.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinRingleader.java
index 711f8c457b..77058e3abe 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinRingleader.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinRingleader.java
@@ -37,7 +37,7 @@ public class GoblinRingleader extends mage.sets.apocalypse.GoblinRingleader {
 
     public GoblinRingleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinSledder.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinSledder.java
index efa360734a..8a04136318 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinSledder.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinSledder.java
@@ -37,7 +37,7 @@ public class GoblinSledder extends mage.sets.onslaught.GoblinSledder {
 
     public GoblinSledder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinWarchief.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinWarchief.java
index 04b2d2f7dc..c86861d780 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinWarchief.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/GoblinWarchief.java
@@ -37,7 +37,7 @@ public class GoblinWarchief extends mage.sets.scourge.GoblinWarchief {
 
     public GoblinWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Harmonize.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Harmonize.java
index e9f266184f..afcca019f3 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/HeedlessOne.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/HeedlessOne.java
index 1edeafd257..159ff4b0e1 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/HeedlessOne.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/HeedlessOne.java
@@ -37,7 +37,7 @@ public class HeedlessOne extends mage.sets.onslaught.HeedlessOne {
 
     public HeedlessOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/IbHalfheartGoblinTactician.java
index c6789ae564..301ddd2142 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/IbHalfheartGoblinTactician.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/IbHalfheartGoblinTactician.java
@@ -37,7 +37,7 @@ public class IbHalfheartGoblinTactician extends mage.sets.elvesvsgoblins.IbHalfh
 
     public IbHalfheartGoblinTactician(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ImperiousPerfect.java
index 00c2ae5e33..f711d35b39 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ImperiousPerfect.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/ImperiousPerfect.java
@@ -37,7 +37,7 @@ public class ImperiousPerfect extends mage.sets.lorwyn.ImperiousPerfect {
 
     public ImperiousPerfect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LlanowarElves.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LlanowarElves.java
index 84ef7caf99..cf3b898a77 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LysAlanaHuntmaster.java
index d111e53fd1..9d56203a60 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LysAlanaHuntmaster.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/LysAlanaHuntmaster.java
@@ -37,7 +37,7 @@ public class LysAlanaHuntmaster extends mage.sets.lorwyn.LysAlanaHuntmaster {
 
     public LysAlanaHuntmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggFanatic.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggFanatic.java
index 04ac93c56f..2f4eb74ff8 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DD3EVG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggWarMarshal.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggWarMarshal.java
index c823157a47..1a28b8ee02 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggWarMarshal.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoggWarMarshal.java
@@ -37,7 +37,7 @@ public class MoggWarMarshal extends mage.sets.timespiral.MoggWarMarshal {
 
     public MoggWarMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoongloveExtract.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoongloveExtract.java
index e69790c7b2..1c25eba70c 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoongloveExtract.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MoongloveExtract.java
@@ -37,7 +37,7 @@ public class MoongloveExtract extends mage.sets.elspethvstezzeret.MoongloveExtra
 
     public MoongloveExtract(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MudbuttonTorchrunner.java
index 77c73ac15c..fe0b033b93 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MudbuttonTorchrunner.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/MudbuttonTorchrunner.java
@@ -37,7 +37,7 @@ public class MudbuttonTorchrunner extends mage.sets.lorwyn.MudbuttonTorchrunner
 
     public MudbuttonTorchrunner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RagingGoblin.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RagingGoblin.java
index 3c6a7da30c..e29b8e06b1 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RecklessOne.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RecklessOne.java
index cb8edbb7d7..ee6495e942 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RecklessOne.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/RecklessOne.java
@@ -37,7 +37,7 @@ public class RecklessOne extends mage.sets.onslaught.RecklessOne {
 
     public RecklessOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SiegeGangCommander.java
index 2572fb3e23..7ba7d4fc70 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SiegeGangCommander.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SiegeGangCommander.java
@@ -37,7 +37,7 @@ public class SiegeGangCommander extends mage.sets.magic2010.SiegeGangCommander {
 
     public SiegeGangCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkDrillSergeant.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkDrillSergeant.java
index b560f75215..eb5d3ff583 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkDrillSergeant.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkDrillSergeant.java
@@ -37,7 +37,7 @@ public class SkirkDrillSergeant extends mage.sets.elvesvsgoblins.SkirkDrillSerge
 
     public SkirkDrillSergeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkFireMarshal.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkFireMarshal.java
index 66a0e84a7c..82c85c52a6 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkFireMarshal.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkFireMarshal.java
@@ -37,7 +37,7 @@ public class SkirkFireMarshal extends mage.sets.onslaught.SkirkFireMarshal {
 
     public SkirkFireMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkProspector.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkProspector.java
index da40f81219..0598953979 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkProspector.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkProspector.java
@@ -37,7 +37,7 @@ public class SkirkProspector extends mage.sets.onslaught.SkirkProspector {
 
     public SkirkProspector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkShaman.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkShaman.java
index cc2d653af0..b0a6593891 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkShaman.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SkirkShaman.java
@@ -37,7 +37,7 @@ public class SkirkShaman extends mage.sets.elvesvsgoblins.SkirkShaman {
 
     public SkirkShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SlateOfAncestry.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SlateOfAncestry.java
index 8decc942e5..c1ee8e8083 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SlateOfAncestry.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SlateOfAncestry.java
@@ -37,7 +37,7 @@ public class SlateOfAncestry extends mage.sets.onslaught.SlateOfAncestry {
 
     public SlateOfAncestry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SpittingEarth.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SpittingEarth.java
index 203131a8b6..2e5968f2f2 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/StonewoodInvoker.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/StonewoodInvoker.java
index 2cb3840b64..915f1cbe8c 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/StonewoodInvoker.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/StonewoodInvoker.java
@@ -37,7 +37,7 @@ public class StonewoodInvoker extends mage.sets.elvesvsgoblins.StonewoodInvoker
 
     public StonewoodInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SylvanMessenger.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SylvanMessenger.java
index 5c0ef44266..7e8fc82f72 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SylvanMessenger.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/SylvanMessenger.java
@@ -37,7 +37,7 @@ public class SylvanMessenger extends mage.sets.apocalypse.SylvanMessenger {
 
     public SylvanMessenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TarPitcher.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TarPitcher.java
index 66b19f29ad..194e48ef48 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TarPitcher.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TarPitcher.java
@@ -37,7 +37,7 @@ public class TarPitcher extends mage.sets.lorwyn.TarPitcher {
 
     public TarPitcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Tarfire.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Tarfire.java
index 4f0ca9b4bf..c2122c534a 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Tarfire.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Tarfire.java
@@ -37,7 +37,7 @@ public class Tarfire extends mage.sets.lorwyn.Tarfire {
 
     public Tarfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TimberwatchElf.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TimberwatchElf.java
index 1e2aabdb51..6ecbf8e674 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TimberwatchElf.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TimberwatchElf.java
@@ -37,7 +37,7 @@ public class TimberwatchElf extends mage.sets.elvesvsgoblins.TimberwatchElf {
 
     public TimberwatchElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TranquilThicket.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TranquilThicket.java
index b798800503..814c7d8246 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/VoiceOfTheWoods.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/VoiceOfTheWoods.java
index 80b4424fa5..15c2269568 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/VoiceOfTheWoods.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/VoiceOfTheWoods.java
@@ -37,7 +37,7 @@ public class VoiceOfTheWoods extends mage.sets.onslaught.VoiceOfTheWoods {
 
     public VoiceOfTheWoods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wellwisher.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wellwisher.java
index 0de3966aed..91c35a4ad2 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wellwisher.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wellwisher.java
@@ -37,7 +37,7 @@ public class Wellwisher extends mage.sets.onslaught.Wellwisher {
 
     public Wellwisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wildsize.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wildsize.java
index 5ff1c2001d..8cee1e9f1f 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wildsize.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/Wildsize.java
@@ -37,7 +37,7 @@ public class Wildsize extends mage.sets.guildpact.Wildsize {
 
     public Wildsize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodHerald.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodHerald.java
index 0067f34dc7..5a54f9e053 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodHerald.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodHerald.java
@@ -37,7 +37,7 @@ public class WirewoodHerald extends mage.sets.onslaught.WirewoodHerald {
 
     public WirewoodHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodLodge.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodLodge.java
index 1e9a77fcd3..648badcbc0 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodLodge.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodLodge.java
@@ -37,7 +37,7 @@ public class WirewoodLodge extends mage.sets.onslaught.WirewoodLodge {
 
     public WirewoodLodge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodSymbiote.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodSymbiote.java
index 966ddb4d28..c37fa1adad 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodSymbiote.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WirewoodSymbiote.java
@@ -37,7 +37,7 @@ public class WirewoodSymbiote extends mage.sets.scourge.WirewoodSymbiote {
 
     public WirewoodSymbiote(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WoodElves.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WoodElves.java
index a92e0bd595..d521a795f5 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WrensRunVanquisher.java b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WrensRunVanquisher.java
index cd11701a23..e91ae09d79 100644
--- a/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WrensRunVanquisher.java
+++ b/Mage.Sets/src/mage/sets/anthologyelvesvsgoblins/WrensRunVanquisher.java
@@ -37,7 +37,7 @@ public class WrensRunVanquisher extends mage.sets.lorwyn.WrensRunVanquisher {
 
     public WrensRunVanquisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DD3EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/AlbinoTroll.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/AlbinoTroll.java
index 392dcab2ab..11da40c9f8 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/AlbinoTroll.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/AlbinoTroll.java
@@ -37,7 +37,7 @@ public class AlbinoTroll extends mage.sets.urzassaga.AlbinoTroll {
 
     public AlbinoTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BadMoon.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BadMoon.java
index 7dcd81827c..5ab1a67ed1 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BaskingRootwalla.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BaskingRootwalla.java
index e61e7eb11a..d1110989a6 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BaskingRootwalla.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BaskingRootwalla.java
@@ -37,7 +37,7 @@ public class BaskingRootwalla extends mage.sets.torment.BaskingRootwalla {
 
     public BaskingRootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BeastAttack.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BeastAttack.java
index f5178eed09..3cfe69b830 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BeastAttack.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/BeastAttack.java
@@ -37,7 +37,7 @@ public class BeastAttack extends mage.sets.odyssey.BeastAttack {
 
     public BeastAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Blastoderm.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Blastoderm.java
index dd5ac84e46..969c57c43d 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Blastoderm.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Blastoderm.java
@@ -37,7 +37,7 @@ public class Blastoderm extends mage.sets.nemesis.Blastoderm {
 
     public Blastoderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Corrupt.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Corrupt.java
index 498b65759f..e75853e6f5 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Corrupt.java
@@ -37,7 +37,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Deathgreeter.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Deathgreeter.java
index fd09b2769a..4f7faeb497 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Deathgreeter.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Deathgreeter.java
@@ -37,7 +37,7 @@ public class Deathgreeter extends mage.sets.shardsofalara.Deathgreeter {
 
     public Deathgreeter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/DrudgeSkeletons.java
index ecfb19f7db..fe5af0a965 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ElephantGuide.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ElephantGuide.java
index 0f14ee042e..9861a2d6da 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ElephantGuide.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ElephantGuide.java
@@ -37,7 +37,7 @@ public class ElephantGuide extends mage.sets.judgment.ElephantGuide {
 
     public ElephantGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Enslave.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Enslave.java
index 3963ef245a..9a7170224c 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Enslave.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Enslave.java
@@ -37,7 +37,7 @@ public class Enslave extends mage.sets.newphyrexia.Enslave {
 
     public Enslave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FaerieMacabre.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FaerieMacabre.java
index e0680a7edd..0f15d65755 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FaerieMacabre.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FaerieMacabre.java
@@ -37,7 +37,7 @@ public class FaerieMacabre extends mage.sets.shadowmoor.FaerieMacabre {
 
     public FaerieMacabre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FleshbagMarauder.java
index efce094124..a43d1bb9dd 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FleshbagMarauder.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/FleshbagMarauder.java
@@ -37,7 +37,7 @@ public class FleshbagMarauder extends mage.sets.shardsofalara.FleshbagMarauder {
 
     public FleshbagMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GarrukWildspeaker.java
index 1d33a5eb58..7ed4cb52c8 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GarrukWildspeaker.java
@@ -37,7 +37,7 @@ public class GarrukWildspeaker extends mage.sets.magic2010.GarrukWildspeaker {
 
     public GarrukWildspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheCedars.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheCedars.java
index 486c94e761..feb8d1b6c9 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheCedars.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheCedars.java
@@ -37,7 +37,7 @@ public class GenjuOfTheCedars extends mage.sets.betrayersofkamigawa.GenjuOfTheCe
 
     public GenjuOfTheCedars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheFens.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheFens.java
index 47059ab547..30cc6a731f 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheFens.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GenjuOfTheFens.java
@@ -37,7 +37,7 @@ public class GenjuOfTheFens extends mage.sets.betrayersofkamigawa.GenjuOfTheFens
 
     public GenjuOfTheFens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GhostLitStalker.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GhostLitStalker.java
index 027dd5c85e..28a19013b7 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GhostLitStalker.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GhostLitStalker.java
@@ -37,7 +37,7 @@ public class GhostLitStalker extends mage.sets.saviorsofkamigawa.GhostLitStalker
 
     public GhostLitStalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GiantGrowth.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GiantGrowth.java
index a7ea84fad1..da15b6d0df 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Harmonize.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Harmonize.java
index fd2e0304af..9a2b627e2b 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HideousEnd.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HideousEnd.java
index fecc33bd57..d5ad337c39 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HideousEnd.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HideousEnd.java
@@ -37,7 +37,7 @@ public class HideousEnd extends mage.sets.zendikar.HideousEnd {
 
     public HideousEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HowlingBanshee.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HowlingBanshee.java
index c9816449d8..1239e5cc96 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HowlingBanshee.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/HowlingBanshee.java
@@ -37,7 +37,7 @@ public class HowlingBanshee extends mage.sets.magic2010.HowlingBanshee {
 
     public HowlingBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IchorSlick.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IchorSlick.java
index 351adec8e4..02d4587e41 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IchorSlick.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IchorSlick.java
@@ -37,7 +37,7 @@ public class IchorSlick extends mage.sets.futuresight.IchorSlick {
 
     public IchorSlick(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IndrikStomphowler.java
index 3af6493ffc..2dafc493c0 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IndrikStomphowler.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/IndrikStomphowler.java
@@ -37,7 +37,7 @@ public class IndrikStomphowler extends mage.sets.dissension.IndrikStomphowler {
 
     public IndrikStomphowler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Invigorate.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Invigorate.java
index a2b4fefc72..650e97a499 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Invigorate.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Invigorate.java
@@ -37,7 +37,7 @@ public class Invigorate extends mage.sets.commander.Invigorate {
 
     public Invigorate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KeeningBanshee.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KeeningBanshee.java
index 29ab376b8f..75ea8c8ae4 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KeeningBanshee.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KeeningBanshee.java
@@ -37,7 +37,7 @@ public class KeeningBanshee extends mage.sets.ravnica.KeeningBanshee {
 
     public KeeningBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KrosanTusker.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KrosanTusker.java
index b2fe9e670f..0c6d84ca9e 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Lignify.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Lignify.java
index b1b1600d63..2a91ab4b89 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Lignify.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Lignify.java
@@ -37,7 +37,7 @@ public class Lignify extends mage.sets.lorwyn.Lignify {
 
     public Lignify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/LilianaVess.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/LilianaVess.java
index 8ab38574ff..bd6e689cc6 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/LilianaVess.java
@@ -37,7 +37,7 @@ public class LilianaVess extends mage.sets.magic2010.LilianaVess {
 
     public LilianaVess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Mutilate.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Mutilate.java
index dc8734a8c2..6b28d198ea 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Mutilate.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Mutilate.java
@@ -37,7 +37,7 @@ public class Mutilate extends mage.sets.magic2013.Mutilate {
 
     public Mutilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/NaturesLore.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/NaturesLore.java
index 778d25bf4d..7fd046ea01 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DD3GVL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Overrun.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Overrun.java
index 3821516b9f..42f54b1e42 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Overrun.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PhyrexianRager.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PhyrexianRager.java
index c1dc785761..76eeee1387 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PhyrexianRager.java
@@ -37,7 +37,7 @@ public class PhyrexianRager extends mage.sets.tenthedition.PhyrexianRager {
 
     public PhyrexianRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PlatedSlagwurm.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PlatedSlagwurm.java
index c6b1a98dc9..882824b484 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PlatedSlagwurm.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PlatedSlagwurm.java
@@ -37,7 +37,7 @@ public class PlatedSlagwurm extends mage.sets.mirrodin.PlatedSlagwurm {
 
     public PlatedSlagwurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PollutedMire.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PollutedMire.java
index 1935039183..c1c1ba2b9d 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PollutedMire.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/PollutedMire.java
@@ -37,7 +37,7 @@ public class PollutedMire extends mage.sets.urzassaga.PollutedMire {
 
     public PollutedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Rancor.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Rancor.java
index 35f77db164..7207f780cd 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Rancor.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Rancor.java
@@ -37,7 +37,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousBaloth.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousBaloth.java
index 8f87c70f28..234d3af5b2 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousBaloth.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousBaloth.java
@@ -37,7 +37,7 @@ public class RavenousBaloth extends mage.sets.onslaught.RavenousBaloth {
 
     public RavenousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousRats.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousRats.java
index 09729611c4..52d6f29031 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RiseFromTheGrave.java
index 2eb8075b0f..75733d2f7a 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RiseFromTheGrave.java
@@ -37,7 +37,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RudeAwakening.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RudeAwakening.java
index 099f24a18f..3b5729e343 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RudeAwakening.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/RudeAwakening.java
@@ -37,7 +37,7 @@ public class RudeAwakening extends mage.sets.modernmasters.RudeAwakening {
 
     public RudeAwakening(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SerratedArrows.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SerratedArrows.java
index aa8fc81deb..260f4d8824 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SerratedArrows.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SerratedArrows.java
@@ -37,7 +37,7 @@ public class SerratedArrows extends mage.sets.homelands.SerratedArrows {
 
     public SerratedArrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SignInBlood.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SignInBlood.java
index e88866097d..fb8ee15954 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SkeletalVampire.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SkeletalVampire.java
index 2708776477..afd1f82358 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SkeletalVampire.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SkeletalVampire.java
@@ -37,7 +37,7 @@ public class SkeletalVampire extends mage.sets.guildpact.SkeletalVampire {
 
     public SkeletalVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SlipperyKarst.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SlipperyKarst.java
index 5f8cf35955..61edc96b7c 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SlipperyKarst.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SlipperyKarst.java
@@ -37,7 +37,7 @@ public class SlipperyKarst extends mage.sets.urzassaga.SlipperyKarst {
 
     public SlipperyKarst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SnuffOut.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SnuffOut.java
index c453c0564d..c2902acf19 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SnuffOut.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/SnuffOut.java
@@ -37,7 +37,7 @@ public class SnuffOut extends mage.sets.mercadianmasques.SnuffOut {
 
     public SnuffOut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/StampedingWildebeests.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/StampedingWildebeests.java
index f369904da6..40408914ed 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/StampedingWildebeests.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/StampedingWildebeests.java
@@ -37,7 +37,7 @@ public class StampedingWildebeests extends mage.sets.tenthedition.StampedingWild
 
     public StampedingWildebeests(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TendrilsOfCorruption.java
index b245ecd750..f4f04bd901 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TendrilsOfCorruption.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TendrilsOfCorruption.java
@@ -37,7 +37,7 @@ public class TendrilsOfCorruption extends mage.sets.magic2010.TendrilsOfCorrupti
 
     public TendrilsOfCorruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TreetopVillage.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TreetopVillage.java
index c7980ad7fb..720c6d59f8 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TreetopVillage.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TreetopVillage.java
@@ -37,7 +37,7 @@ public class TreetopVillage extends mage.sets.tenthedition.TreetopVillage {
 
     public TreetopVillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TwistedAbomination.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TwistedAbomination.java
index c0e8676ffb..a8f0d2ff1c 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/TwistedAbomination.java
@@ -38,7 +38,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DD3GVL";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/UrborgSyphonMage.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/UrborgSyphonMage.java
index 31dae3090c..6c20dbb526 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/UrborgSyphonMage.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/UrborgSyphonMage.java
@@ -37,7 +37,7 @@ public class UrborgSyphonMage extends mage.sets.timespiral.UrborgSyphonMage {
 
     public UrborgSyphonMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VampireBats.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VampireBats.java
index de8f083520..0b51014d50 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VampireBats.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VampireBats.java
@@ -37,7 +37,7 @@ public class VampireBats extends mage.sets.fifthedition.VampireBats {
 
     public VampireBats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ViciousHunger.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ViciousHunger.java
index 73e60c29bd..00858b0cfb 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ViciousHunger.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/ViciousHunger.java
@@ -37,7 +37,7 @@ public class ViciousHunger extends mage.sets.nemesis.ViciousHunger {
 
     public ViciousHunger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VineTrellis.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VineTrellis.java
index 776887e366..de1e152c00 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VineTrellis.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/VineTrellis.java
@@ -37,7 +37,7 @@ public class VineTrellis extends mage.sets.mercadianmasques.VineTrellis {
 
     public VineTrellis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WallOfBone.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WallOfBone.java
index 82e4fd390c..82d60a3fe1 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WildMongrel.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WildMongrel.java
index 86db6f28f8..6665649a83 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WildMongrel.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WildMongrel.java
@@ -37,7 +37,7 @@ public class WildMongrel extends mage.sets.odyssey.WildMongrel {
 
     public WildMongrel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Windstorm.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Windstorm.java
index 8eb8faf746..ded355550e 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Windstorm.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/Windstorm.java
@@ -37,7 +37,7 @@ public class Windstorm extends mage.sets.magic2010.Windstorm {
 
     public Windstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WirewoodSavage.java b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WirewoodSavage.java
index d97fcb0489..60bbf59939 100644
--- a/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WirewoodSavage.java
+++ b/Mage.Sets/src/mage/sets/anthologygarrukvsliliana/WirewoodSavage.java
@@ -37,7 +37,7 @@ public class WirewoodSavage extends mage.sets.onslaught.WirewoodSavage {
 
     public WirewoodSavage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DD3GVL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java
index e1883dec36..2a7694c040 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java
@@ -37,7 +37,7 @@ public class AEthersnipe extends mage.sets.commander.AEthersnipe {
 
     public AEthersnipe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AirElemental.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/AirElemental.java
index 7fd80be20b..d38743ec75 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AncestralVision.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/AncestralVision.java
index fc5cd93ae4..2c73c70146 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AncestralVision.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/AncestralVision.java
@@ -37,7 +37,7 @@ public class AncestralVision extends mage.sets.timespiral.AncestralVision {
 
     public AncestralVision(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/BottleGnomes.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/BottleGnomes.java
index a5b3e65f6a..3f29e1aee3 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/BrineElemental.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/BrineElemental.java
index e144c61ab0..521316937d 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/BrineElemental.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/BrineElemental.java
@@ -37,7 +37,7 @@ public class BrineElemental extends mage.sets.commander2014.BrineElemental {
 
     public BrineElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChandraNalaar.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChandraNalaar.java
index b2916684e3..d485f252ba 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChandraNalaar.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChandraNalaar.java
@@ -37,7 +37,7 @@ public class ChandraNalaar extends mage.sets.magic2010.ChandraNalaar {
 
     public ChandraNalaar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChartoothCougar.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChartoothCougar.java
index c529f0382a..f1c4c5b618 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChartoothCougar.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ChartoothCougar.java
@@ -37,7 +37,7 @@ public class ChartoothCougar extends mage.sets.scourge.ChartoothCougar {
 
     public ChartoothCougar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Condescend.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Condescend.java
index 9a152585f2..6423e74238 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Condescend.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Condescend.java
@@ -37,7 +37,7 @@ public class Condescend extends mage.sets.fifthdawn.Condescend {
 
     public Condescend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ConeOfFlame.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ConeOfFlame.java
index e65d3d634f..2a6b043762 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Counterspell.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Counterspell.java
index 262093dc83..6b635ad3cf 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Daze.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Daze.java
index aa33c9241c..52812dc168 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Daze.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Daze.java
@@ -37,7 +37,7 @@ public class Daze extends mage.sets.nemesis.Daze {
 
     public Daze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Demonfire.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Demonfire.java
index acb4ffae8b..aea2d26700 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Demonfire.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Demonfire.java
@@ -37,7 +37,7 @@ public class Demonfire extends mage.sets.dissension.Demonfire {
 
     public Demonfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ErrantEphemeron.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ErrantEphemeron.java
index a45433c20b..78f00cf5c7 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ErrantEphemeron.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ErrantEphemeron.java
@@ -37,7 +37,7 @@ public class ErrantEphemeron extends mage.sets.timespiral.ErrantEphemeron {
 
     public ErrantEphemeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FactOrFiction.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FactOrFiction.java
index 9813bc5ff2..8e813ad2b1 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FathomSeer.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FathomSeer.java
index e9419b7ba7..40a4acc784 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FathomSeer.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FathomSeer.java
@@ -37,7 +37,7 @@ public class FathomSeer extends mage.sets.jacevschandra.FathomSeer {
 
     public FathomSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireball.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireball.java
index f55ba19a69..93e064205f 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireball.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireblast.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireblast.java
index 5d67453817..baeb0650b0 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireblast.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireblast.java
@@ -37,7 +37,7 @@ public class Fireblast extends mage.sets.visions.Fireblast {
 
     public Fireblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Firebolt.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Firebolt.java
index beb0830749..29d658a3ae 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Firebolt.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Firebolt.java
@@ -37,7 +37,7 @@ public class Firebolt extends mage.sets.odyssey.Firebolt {
 
     public Firebolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireslinger.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireslinger.java
index 87de1d0200..64d1de6881 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireslinger.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Fireslinger.java
@@ -37,7 +37,7 @@ public class Fireslinger extends mage.sets.tempest.Fireslinger {
 
     public Fireslinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlameJavelin.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlameJavelin.java
index 6b56380400..26a34b6b28 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlameJavelin.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlameJavelin.java
@@ -37,7 +37,7 @@ public class FlameJavelin extends mage.sets.shadowmoor.FlameJavelin {
 
     public FlameJavelin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamekinBrawler.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamekinBrawler.java
index c0076f342d..1c7ae96ee7 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamekinBrawler.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamekinBrawler.java
@@ -37,7 +37,7 @@ public class FlamekinBrawler extends mage.sets.lorwyn.FlamekinBrawler {
 
     public FlamekinBrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlametongueKavu.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlametongueKavu.java
index 9c19e8462c..fa967516dc 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamewaveInvoker.java
index 0c28dcff2b..c2fc7fa5a1 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamewaveInvoker.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FlamewaveInvoker.java
@@ -37,7 +37,7 @@ public class FlamewaveInvoker extends mage.sets.tenthedition.FlamewaveInvoker {
 
     public FlamewaveInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FledglingMawcor.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FledglingMawcor.java
index 7318f198e7..500e3f99d1 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FledglingMawcor.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FledglingMawcor.java
@@ -37,7 +37,7 @@ public class FledglingMawcor extends mage.sets.jacevschandra.FledglingMawcor {
 
     public FledglingMawcor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FurnaceWhelp.java
index 272f77331c..8a8a8681b7 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/FurnaceWhelp.java
@@ -37,7 +37,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
 
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Guile.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Guile.java
index 585a87a9f4..9361542a75 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Guile.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Guile.java
@@ -37,7 +37,7 @@ public class Guile extends mage.sets.lorwyn.Guile {
 
     public Guile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Gush.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Gush.java
index ccaf50b37d..3e56b81272 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Gush.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Gush.java
@@ -37,7 +37,7 @@ public class Gush extends mage.sets.jacevschandra.Gush {
 
     public Gush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Hostility.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Hostility.java
index 579a7e3cec..968e0bd132 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Hostility.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Hostility.java
@@ -37,7 +37,7 @@ public class Hostility extends mage.sets.jacevschandra.Hostility {
 
     public Hostility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Incinerate.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Incinerate.java
index e2d04c4822..073376ac78 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/IngotChewer.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/IngotChewer.java
index 985cfb4eaf..6bdb5f0ec2 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/IngotChewer.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/IngotChewer.java
@@ -37,7 +37,7 @@ public class IngotChewer extends mage.sets.lorwyn.IngotChewer {
 
     public IngotChewer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/InnerFlameAcolyte.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/InnerFlameAcolyte.java
index 8bb7d67156..cb6319287d 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/InnerFlameAcolyte.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/InnerFlameAcolyte.java
@@ -37,7 +37,7 @@ public class InnerFlameAcolyte extends mage.sets.lorwyn.InnerFlameAcolyte {
 
     public InnerFlameAcolyte(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/JaceBeleren.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/JaceBeleren.java
index 7ccededf1e..0eb061c6a7 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/JaceBeleren.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/JaceBeleren.java
@@ -37,7 +37,7 @@ public class JaceBeleren extends mage.sets.magic2010.JaceBeleren {
 
     public JaceBeleren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/KeldonMegaliths.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/KeldonMegaliths.java
index 9d85489350..d02c9781a9 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/KeldonMegaliths.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/KeldonMegaliths.java
@@ -37,7 +37,7 @@ public class KeldonMegaliths extends mage.sets.jacevschandra.KeldonMegaliths {
 
     public KeldonMegaliths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/MagmaJet.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/MagmaJet.java
index 4dce051c8f..22560e5bde 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/MagmaJet.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/MagmaJet.java
@@ -37,7 +37,7 @@ public class MagmaJet extends mage.sets.fifthdawn.MagmaJet {
 
     public MagmaJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ManOWar.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ManOWar.java
index 1def0236d1..d3c256e933 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/ManOWar.java
@@ -37,7 +37,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/MartyrOfFrost.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/MartyrOfFrost.java
index 934a7d5a10..c0d7abbb56 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/MartyrOfFrost.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/MartyrOfFrost.java
@@ -37,7 +37,7 @@ public class MartyrOfFrost extends mage.sets.coldsnap.MartyrOfFrost {
 
     public MartyrOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/MindStone.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/MindStone.java
index 287fedb0dd..8840764813 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/MindStone.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/MindStone.java
@@ -37,7 +37,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Mulldrifter.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Mulldrifter.java
index f8b4df4088..090040d116 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Mulldrifter.java
@@ -37,7 +37,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Ophidian.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Ophidian.java
index f41743847f..b1ffbecf5a 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Ophidian.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Ophidian.java
@@ -37,7 +37,7 @@ public class Ophidian extends mage.sets.vintagemasters.Ophidian {
 
     public Ophidian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/OxiddaGolem.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/OxiddaGolem.java
index dedc0737e0..46335538e6 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/OxiddaGolem.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/OxiddaGolem.java
@@ -37,7 +37,7 @@ public class OxiddaGolem extends mage.sets.jacevschandra.OxiddaGolem {
 
     public OxiddaGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/PyreCharger.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/PyreCharger.java
index 3edb77a032..a8c8bb9462 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/PyreCharger.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/PyreCharger.java
@@ -37,7 +37,7 @@ public class PyreCharger extends mage.sets.shadowmoor.PyreCharger {
 
     public PyreCharger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/QuicksilverDragon.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/QuicksilverDragon.java
index dda55f154b..7327073c7b 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/QuicksilverDragon.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/QuicksilverDragon.java
@@ -37,7 +37,7 @@ public class QuicksilverDragon extends mage.sets.jacevschandra.QuicksilverDragon
 
     public QuicksilverDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/RakdosPitDragon.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/RakdosPitDragon.java
index 21922d60f6..84bdd0fd80 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/RakdosPitDragon.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/RakdosPitDragon.java
@@ -37,7 +37,7 @@ public class RakdosPitDragon extends mage.sets.dissension.RakdosPitDragon {
 
     public RakdosPitDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Repulse.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Repulse.java
index a9409f104d..05897bd354 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Repulse.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Repulse.java
@@ -37,7 +37,7 @@ public class Repulse extends mage.sets.invasion.Repulse {
 
     public Repulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/RiftwingCloudskate.java
index 4ef9b741f3..8f7189661e 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/RiftwingCloudskate.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/RiftwingCloudskate.java
@@ -37,7 +37,7 @@ public class RiftwingCloudskate extends mage.sets.timespiral.RiftwingCloudskate
 
     public RiftwingCloudskate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SealOfFire.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SealOfFire.java
index 2b32b8626a..7916d02cd8 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SealOfFire.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SealOfFire.java
@@ -37,7 +37,7 @@ public class SealOfFire extends mage.sets.nemesis.SealOfFire {
 
     public SealOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SlithFirewalker.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SlithFirewalker.java
index f002e088a2..1a57154061 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SlithFirewalker.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SlithFirewalker.java
@@ -37,7 +37,7 @@ public class SlithFirewalker extends mage.sets.mirrodin.SlithFirewalker {
 
     public SlithFirewalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SoulbrightFlamekin.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SoulbrightFlamekin.java
index 07ce504f16..3062f83f6a 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SoulbrightFlamekin.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SoulbrightFlamekin.java
@@ -37,7 +37,7 @@ public class SoulbrightFlamekin extends mage.sets.lorwyn.SoulbrightFlamekin {
 
     public SoulbrightFlamekin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SpireGolem.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SpireGolem.java
index a2c67369b2..f92180e216 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/SpireGolem.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/SpireGolem.java
@@ -37,7 +37,7 @@ public class SpireGolem extends mage.sets.jacevschandra.SpireGolem {
 
     public SpireGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/WaterspoutDjinn.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/WaterspoutDjinn.java
index 65c8a9ecd9..9d5172744d 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/WaterspoutDjinn.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/WaterspoutDjinn.java
@@ -37,7 +37,7 @@ public class WaterspoutDjinn extends mage.sets.jacevschandra.WaterspoutDjinn {
 
     public WaterspoutDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Willbender.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Willbender.java
index 37f8d36f42..16ab0d2570 100644
--- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/Willbender.java
+++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Willbender.java
@@ -37,7 +37,7 @@ public class Willbender extends mage.sets.commander2014.Willbender {
 
     public Willbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DD3JVC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/AmuletOfKroog.java b/Mage.Sets/src/mage/sets/antiquities/AmuletOfKroog.java
index 66c143d0e4..574c4fc6db 100644
--- a/Mage.Sets/src/mage/sets/antiquities/AmuletOfKroog.java
+++ b/Mage.Sets/src/mage/sets/antiquities/AmuletOfKroog.java
@@ -37,7 +37,7 @@ public class AmuletOfKroog extends mage.sets.fifthedition.AmuletOfKroog {
 
     public AmuletOfKroog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/ArmageddonClock.java b/Mage.Sets/src/mage/sets/antiquities/ArmageddonClock.java
index 6fc21cd24b..68ebfdf4ee 100644
--- a/Mage.Sets/src/mage/sets/antiquities/ArmageddonClock.java
+++ b/Mage.Sets/src/mage/sets/antiquities/ArmageddonClock.java
@@ -38,7 +38,7 @@ public class ArmageddonClock extends mage.sets.masterseditioniv.ArmageddonClock
 
     public ArmageddonClock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/AshnodsAltar.java b/Mage.Sets/src/mage/sets/antiquities/AshnodsAltar.java
index 7d9035216e..2371d96e12 100644
--- a/Mage.Sets/src/mage/sets/antiquities/AshnodsAltar.java
+++ b/Mage.Sets/src/mage/sets/antiquities/AshnodsAltar.java
@@ -37,7 +37,7 @@ public class AshnodsAltar extends mage.sets.fifthedition.AshnodsAltar {
 
     public AshnodsAltar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/AshnodsTransmogrant.java b/Mage.Sets/src/mage/sets/antiquities/AshnodsTransmogrant.java
index e1327d1d52..992b153508 100644
--- a/Mage.Sets/src/mage/sets/antiquities/AshnodsTransmogrant.java
+++ b/Mage.Sets/src/mage/sets/antiquities/AshnodsTransmogrant.java
@@ -39,7 +39,7 @@ public class AshnodsTransmogrant extends mage.sets.fifthedition.AshnodsTransmogr
 
     public AshnodsTransmogrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/Atog.java b/Mage.Sets/src/mage/sets/antiquities/Atog.java
index 718b3365e8..6aabdd1648 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Atog.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Atog.java
@@ -38,7 +38,7 @@ public class Atog extends mage.sets.mirrodin.Atog {
 
     public Atog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/CircleOfProtectionArtifacts.java b/Mage.Sets/src/mage/sets/antiquities/CircleOfProtectionArtifacts.java
index 2bfcc5801e..da00df225e 100644
--- a/Mage.Sets/src/mage/sets/antiquities/CircleOfProtectionArtifacts.java
+++ b/Mage.Sets/src/mage/sets/antiquities/CircleOfProtectionArtifacts.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionArtifacts extends mage.sets.fifthdawn.CircleOfPro
 
     public CircleOfProtectionArtifacts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/ClockworkAvian.java b/Mage.Sets/src/mage/sets/antiquities/ClockworkAvian.java
index 3949e4e5c3..484722d7f7 100644
--- a/Mage.Sets/src/mage/sets/antiquities/ClockworkAvian.java
+++ b/Mage.Sets/src/mage/sets/antiquities/ClockworkAvian.java
@@ -37,7 +37,7 @@ public class ClockworkAvian extends mage.sets.fourthedition.ClockworkAvian {
 
     public ClockworkAvian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/ColossusOfSardia.java b/Mage.Sets/src/mage/sets/antiquities/ColossusOfSardia.java
index dfae2faa5f..bb2d297ffe 100644
--- a/Mage.Sets/src/mage/sets/antiquities/ColossusOfSardia.java
+++ b/Mage.Sets/src/mage/sets/antiquities/ColossusOfSardia.java
@@ -37,7 +37,7 @@ public class ColossusOfSardia extends mage.sets.fifthedition.ColossusOfSardia {
 
     public ColossusOfSardia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/CoralHelm.java b/Mage.Sets/src/mage/sets/antiquities/CoralHelm.java
index 033986635c..ef2980d504 100644
--- a/Mage.Sets/src/mage/sets/antiquities/CoralHelm.java
+++ b/Mage.Sets/src/mage/sets/antiquities/CoralHelm.java
@@ -38,7 +38,7 @@ public class CoralHelm extends mage.sets.masterseditioniv.CoralHelm {
 
     public CoralHelm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/Crumble.java b/Mage.Sets/src/mage/sets/antiquities/Crumble.java
index e9ca8886e6..02cda9208b 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Crumble.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Crumble.java
@@ -37,7 +37,7 @@ public class Crumble extends mage.sets.masterseditioniv.Crumble {
 
     public Crumble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/Detonate.java b/Mage.Sets/src/mage/sets/antiquities/Detonate.java
index ac409913a8..77a6c3ce6c 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Detonate.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Detonate.java
@@ -37,7 +37,7 @@ public class Detonate extends mage.sets.fifthedition.Detonate {
 
     public Detonate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/DragonEngine.java b/Mage.Sets/src/mage/sets/antiquities/DragonEngine.java
index c641485cd7..0ad593857e 100644
--- a/Mage.Sets/src/mage/sets/antiquities/DragonEngine.java
+++ b/Mage.Sets/src/mage/sets/antiquities/DragonEngine.java
@@ -38,7 +38,7 @@ public class DragonEngine extends mage.sets.fifthedition.DragonEngine {
 
     public DragonEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/DwarvenWeaponsmith.java b/Mage.Sets/src/mage/sets/antiquities/DwarvenWeaponsmith.java
index 1c25699a7f..3321b314e5 100644
--- a/Mage.Sets/src/mage/sets/antiquities/DwarvenWeaponsmith.java
+++ b/Mage.Sets/src/mage/sets/antiquities/DwarvenWeaponsmith.java
@@ -37,7 +37,7 @@ public class DwarvenWeaponsmith extends mage.sets.revisededition.DwarvenWeaponsm
 
     public DwarvenWeaponsmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/FeldonsCane.java b/Mage.Sets/src/mage/sets/antiquities/FeldonsCane.java
index 1b98bc6e5d..df12423012 100644
--- a/Mage.Sets/src/mage/sets/antiquities/FeldonsCane.java
+++ b/Mage.Sets/src/mage/sets/antiquities/FeldonsCane.java
@@ -38,7 +38,7 @@ public class FeldonsCane extends mage.sets.timeshifted.FeldonsCane {
 
     public FeldonsCane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/GaeasAvenger.java b/Mage.Sets/src/mage/sets/antiquities/GaeasAvenger.java
index b14726f021..00c58e88e3 100644
--- a/Mage.Sets/src/mage/sets/antiquities/GaeasAvenger.java
+++ b/Mage.Sets/src/mage/sets/antiquities/GaeasAvenger.java
@@ -38,7 +38,7 @@ public class GaeasAvenger extends mage.sets.masterseditioniv.GaeasAvenger {
 
     public GaeasAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/GoblinArtisans.java b/Mage.Sets/src/mage/sets/antiquities/GoblinArtisans.java
index a657f31307..02c165282d 100644
--- a/Mage.Sets/src/mage/sets/antiquities/GoblinArtisans.java
+++ b/Mage.Sets/src/mage/sets/antiquities/GoblinArtisans.java
@@ -37,7 +37,7 @@ public class GoblinArtisans extends mage.sets.chronicles.GoblinArtisans {
 
     public GoblinArtisans(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/GrapeshotCatapult.java b/Mage.Sets/src/mage/sets/antiquities/GrapeshotCatapult.java
index 4a6592dee9..b70ea1e61e 100644
--- a/Mage.Sets/src/mage/sets/antiquities/GrapeshotCatapult.java
+++ b/Mage.Sets/src/mage/sets/antiquities/GrapeshotCatapult.java
@@ -38,7 +38,7 @@ public class GrapeshotCatapult extends mage.sets.seventhedition.GrapeshotCatapul
 
     public GrapeshotCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/HurkylsRecall.java b/Mage.Sets/src/mage/sets/antiquities/HurkylsRecall.java
index a800c0f341..951eb6d801 100644
--- a/Mage.Sets/src/mage/sets/antiquities/HurkylsRecall.java
+++ b/Mage.Sets/src/mage/sets/antiquities/HurkylsRecall.java
@@ -37,7 +37,7 @@ public class HurkylsRecall extends mage.sets.fifthedition.HurkylsRecall {
 
     public HurkylsRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/JalumTome.java b/Mage.Sets/src/mage/sets/antiquities/JalumTome.java
index 33efe7d46f..097adaef38 100644
--- a/Mage.Sets/src/mage/sets/antiquities/JalumTome.java
+++ b/Mage.Sets/src/mage/sets/antiquities/JalumTome.java
@@ -38,7 +38,7 @@ public class JalumTome extends mage.sets.seventhedition.JalumTome {
 
     public JalumTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/MartyrsOfKorlis.java b/Mage.Sets/src/mage/sets/antiquities/MartyrsOfKorlis.java
index 4ff7cdab06..7bca0fc069 100644
--- a/Mage.Sets/src/mage/sets/antiquities/MartyrsOfKorlis.java
+++ b/Mage.Sets/src/mage/sets/antiquities/MartyrsOfKorlis.java
@@ -37,7 +37,7 @@ public class MartyrsOfKorlis extends mage.sets.masterseditioniv.MartyrsOfKorlis
 
     public MartyrsOfKorlis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/Millstone.java b/Mage.Sets/src/mage/sets/antiquities/Millstone.java
index de21f352e6..e8c5d34922 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Millstone.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Millstone.java
@@ -38,7 +38,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory1.java b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory1.java
index 22b9008494..cb404270ca 100644
--- a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory1.java
+++ b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory1.java
@@ -37,7 +37,7 @@ public class MishrasFactory1 extends mage.sets.elspethvstezzeret.MishrasFactory
 
     public MishrasFactory1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory2.java b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory2.java
index 9458ff624d..ae148b8064 100644
--- a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory2.java
+++ b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory2.java
@@ -37,7 +37,7 @@ public class MishrasFactory2 extends mage.sets.elspethvstezzeret.MishrasFactory
 
     public MishrasFactory2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory3.java b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory3.java
index b16a376ccc..0867c7ae2b 100644
--- a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory3.java
+++ b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory3.java
@@ -37,7 +37,7 @@ public class MishrasFactory3 extends mage.sets.elspethvstezzeret.MishrasFactory
 
     public MishrasFactory3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory4.java b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory4.java
index 231cc38ca5..dc203f0af7 100644
--- a/Mage.Sets/src/mage/sets/antiquities/MishrasFactory4.java
+++ b/Mage.Sets/src/mage/sets/antiquities/MishrasFactory4.java
@@ -37,7 +37,7 @@ public class MishrasFactory4 extends mage.sets.elspethvstezzeret.MishrasFactory
 
     public MishrasFactory4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/MishrasWorkshop.java b/Mage.Sets/src/mage/sets/antiquities/MishrasWorkshop.java
index 72d0c67bfb..9b651c1807 100644
--- a/Mage.Sets/src/mage/sets/antiquities/MishrasWorkshop.java
+++ b/Mage.Sets/src/mage/sets/antiquities/MishrasWorkshop.java
@@ -38,7 +38,7 @@ public class MishrasWorkshop extends mage.sets.vintagemasters.MishrasWorkshop {
 
     public MishrasWorkshop(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/ObeliskOfUndoing.java b/Mage.Sets/src/mage/sets/antiquities/ObeliskOfUndoing.java
index 0fcf89274c..a01eae8967 100644
--- a/Mage.Sets/src/mage/sets/antiquities/ObeliskOfUndoing.java
+++ b/Mage.Sets/src/mage/sets/antiquities/ObeliskOfUndoing.java
@@ -37,7 +37,7 @@ public class ObeliskOfUndoing extends mage.sets.chronicles.ObeliskOfUndoing {
 
     public ObeliskOfUndoing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/Onulet.java b/Mage.Sets/src/mage/sets/antiquities/Onulet.java
index b3a44081d8..94a72304c6 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Onulet.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Onulet.java
@@ -38,7 +38,7 @@ public class Onulet extends mage.sets.mastersedition.Onulet {
 
     public Onulet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java b/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java
index d0330033f9..dcffd60454 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java
@@ -38,7 +38,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java b/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java
index b048aacb63..f7f0f14f72 100644
--- a/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java
@@ -38,7 +38,7 @@ public class PrimalClay extends mage.sets.fifthedition.PrimalClay {
 
     public PrimalClay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/Rakalite.java b/Mage.Sets/src/mage/sets/antiquities/Rakalite.java
index 24f8275872..140338191b 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Rakalite.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Rakalite.java
@@ -38,7 +38,7 @@ public class Rakalite extends mage.sets.masterseditioniv.Rakalite {
 
     public Rakalite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/RocketLauncher.java b/Mage.Sets/src/mage/sets/antiquities/RocketLauncher.java
index aaf5b4208e..35a652afb0 100644
--- a/Mage.Sets/src/mage/sets/antiquities/RocketLauncher.java
+++ b/Mage.Sets/src/mage/sets/antiquities/RocketLauncher.java
@@ -38,7 +38,7 @@ public class RocketLauncher extends mage.sets.revisededition.RocketLauncher {
 
     public RocketLauncher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java b/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java
index 0121b12ffd..41da2600eb 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java
@@ -38,7 +38,7 @@ public class Shatterstorm extends mage.sets.fifthedition.Shatterstorm {
 
     public Shatterstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java b/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java
index d2de484bc0..65bef6097b 100644
--- a/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java
+++ b/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java
@@ -37,7 +37,7 @@ public class StaffOfZegon extends mage.sets.masterseditioniv.StaffOfZegon {
 
     public StaffOfZegon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/StripMine1.java b/Mage.Sets/src/mage/sets/antiquities/StripMine1.java
index c79ee940f2..4d79d3bcd8 100644
--- a/Mage.Sets/src/mage/sets/antiquities/StripMine1.java
+++ b/Mage.Sets/src/mage/sets/antiquities/StripMine1.java
@@ -37,7 +37,7 @@ public class StripMine1 extends mage.sets.fourthedition.StripMine {
 
     public StripMine1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/StripMine2.java b/Mage.Sets/src/mage/sets/antiquities/StripMine2.java
index 5c21b15477..dc3d1f5183 100644
--- a/Mage.Sets/src/mage/sets/antiquities/StripMine2.java
+++ b/Mage.Sets/src/mage/sets/antiquities/StripMine2.java
@@ -37,7 +37,7 @@ public class StripMine2 extends mage.sets.fourthedition.StripMine {
 
     public StripMine2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/StripMine3.java b/Mage.Sets/src/mage/sets/antiquities/StripMine3.java
index f88759c681..73e296759c 100644
--- a/Mage.Sets/src/mage/sets/antiquities/StripMine3.java
+++ b/Mage.Sets/src/mage/sets/antiquities/StripMine3.java
@@ -37,7 +37,7 @@ public class StripMine3 extends mage.sets.fourthedition.StripMine {
 
     public StripMine3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/StripMine4.java b/Mage.Sets/src/mage/sets/antiquities/StripMine4.java
index 86e04cbcc9..f49dfabbaf 100644
--- a/Mage.Sets/src/mage/sets/antiquities/StripMine4.java
+++ b/Mage.Sets/src/mage/sets/antiquities/StripMine4.java
@@ -37,7 +37,7 @@ public class StripMine4 extends mage.sets.fourthedition.StripMine {
 
     public StripMine4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/SuChi.java b/Mage.Sets/src/mage/sets/antiquities/SuChi.java
index b0e22a81e1..9c39b1d012 100644
--- a/Mage.Sets/src/mage/sets/antiquities/SuChi.java
+++ b/Mage.Sets/src/mage/sets/antiquities/SuChi.java
@@ -38,7 +38,7 @@ public class SuChi extends mage.sets.vintagemasters.SuChi {
 
     public SuChi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/TawnossWeaponry.java b/Mage.Sets/src/mage/sets/antiquities/TawnossWeaponry.java
index 2cdb382f60..2c31dca87f 100644
--- a/Mage.Sets/src/mage/sets/antiquities/TawnossWeaponry.java
+++ b/Mage.Sets/src/mage/sets/antiquities/TawnossWeaponry.java
@@ -37,7 +37,7 @@ public class TawnossWeaponry extends mage.sets.fifthedition.TawnossWeaponry {
 
     public TawnossWeaponry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/TheRack.java b/Mage.Sets/src/mage/sets/antiquities/TheRack.java
index 46000c28a9..866bdf4805 100644
--- a/Mage.Sets/src/mage/sets/antiquities/TheRack.java
+++ b/Mage.Sets/src/mage/sets/antiquities/TheRack.java
@@ -37,7 +37,7 @@ public class TheRack extends mage.sets.fourthedition.TheRack {
 
     public TheRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/TitaniasSong.java b/Mage.Sets/src/mage/sets/antiquities/TitaniasSong.java
index 1daec9e08b..88709c63da 100644
--- a/Mage.Sets/src/mage/sets/antiquities/TitaniasSong.java
+++ b/Mage.Sets/src/mage/sets/antiquities/TitaniasSong.java
@@ -38,7 +38,7 @@ public class TitaniasSong extends mage.sets.fourthedition.TitaniasSong {
 
     public TitaniasSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/Triskelion.java b/Mage.Sets/src/mage/sets/antiquities/Triskelion.java
index 8a2851a0e4..ea1cfd0a7d 100644
--- a/Mage.Sets/src/mage/sets/antiquities/Triskelion.java
+++ b/Mage.Sets/src/mage/sets/antiquities/Triskelion.java
@@ -37,7 +37,7 @@ public class Triskelion extends mage.sets.magic2011.Triskelion {
 
     public Triskelion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasMine1.java b/Mage.Sets/src/mage/sets/antiquities/UrzasMine1.java
index fc87a23f36..d4a0942b06 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasMine1.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasMine1.java
@@ -38,7 +38,7 @@ public class UrzasMine1 extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasMine2.java b/Mage.Sets/src/mage/sets/antiquities/UrzasMine2.java
index d57c1ea7d7..e66743cbf9 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasMine2.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasMine2.java
@@ -38,7 +38,7 @@ public class UrzasMine2 extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasMine3.java b/Mage.Sets/src/mage/sets/antiquities/UrzasMine3.java
index 73e045a5ae..b0dadde563 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasMine3.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasMine3.java
@@ -38,7 +38,7 @@ public class UrzasMine3 extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasMine4.java b/Mage.Sets/src/mage/sets/antiquities/UrzasMine4.java
index 024ab021ba..4066b59213 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasMine4.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasMine4.java
@@ -38,7 +38,7 @@ public class UrzasMine4 extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasMiter.java b/Mage.Sets/src/mage/sets/antiquities/UrzasMiter.java
index ab21afe7d8..5b65f44064 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasMiter.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasMiter.java
@@ -37,7 +37,7 @@ public class UrzasMiter extends mage.sets.masterseditioniv.UrzasMiter {
 
     public UrzasMiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant1.java b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant1.java
index d829ecee1f..98b928fc76 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant1.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant1.java
@@ -38,7 +38,7 @@ public class UrzasPowerPlant1 extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant2.java b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant2.java
index db3047ee78..06a922d9d7 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant2.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant2.java
@@ -38,7 +38,7 @@ public class UrzasPowerPlant2 extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant3.java b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant3.java
index 03a017e941..c30860040e 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant3.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant3.java
@@ -38,7 +38,7 @@ public class UrzasPowerPlant3 extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant4.java b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant4.java
index 35ab56cf63..95771ccfe3 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant4.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant4.java
@@ -38,7 +38,7 @@ public class UrzasPowerPlant4 extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasTower1.java b/Mage.Sets/src/mage/sets/antiquities/UrzasTower1.java
index 9164d8a9eb..f909450e13 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasTower1.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasTower1.java
@@ -38,7 +38,7 @@ public class UrzasTower1 extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasTower2.java b/Mage.Sets/src/mage/sets/antiquities/UrzasTower2.java
index 7855425474..6f6bd587ce 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasTower2.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasTower2.java
@@ -38,7 +38,7 @@ public class UrzasTower2 extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasTower3.java b/Mage.Sets/src/mage/sets/antiquities/UrzasTower3.java
index 6df76eb4e6..1aa22837ca 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasTower3.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasTower3.java
@@ -38,7 +38,7 @@ public class UrzasTower3 extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasTower4.java b/Mage.Sets/src/mage/sets/antiquities/UrzasTower4.java
index 9c7633bcc0..4d36383309 100644
--- a/Mage.Sets/src/mage/sets/antiquities/UrzasTower4.java
+++ b/Mage.Sets/src/mage/sets/antiquities/UrzasTower4.java
@@ -38,7 +38,7 @@ public class UrzasTower4 extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java b/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java
index 40111f69c6..082675ffff 100644
--- a/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java
+++ b/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java
@@ -38,7 +38,7 @@ public class WallOfSpears extends mage.sets.fifthedition.WallOfSpears {
 
     public WallOfSpears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ATQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/antiquities/XenicPoltergeist.java b/Mage.Sets/src/mage/sets/antiquities/XenicPoltergeist.java
index 99337bc313..b3abda8e7e 100644
--- a/Mage.Sets/src/mage/sets/antiquities/XenicPoltergeist.java
+++ b/Mage.Sets/src/mage/sets/antiquities/XenicPoltergeist.java
@@ -37,7 +37,7 @@ public class XenicPoltergeist extends mage.sets.masterseditioniv.XenicPoltergeis
 
     public XenicPoltergeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/YawgmothDemon.java b/Mage.Sets/src/mage/sets/antiquities/YawgmothDemon.java
index efc3226ecc..a6b69860ad 100644
--- a/Mage.Sets/src/mage/sets/antiquities/YawgmothDemon.java
+++ b/Mage.Sets/src/mage/sets/antiquities/YawgmothDemon.java
@@ -37,7 +37,7 @@ public class YawgmothDemon extends mage.sets.ninthedition.YawgmothDemon {
 
     public YawgmothDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/antiquities/YotianSoldier.java b/Mage.Sets/src/mage/sets/antiquities/YotianSoldier.java
index 11fe9add1d..2be024c426 100644
--- a/Mage.Sets/src/mage/sets/antiquities/YotianSoldier.java
+++ b/Mage.Sets/src/mage/sets/antiquities/YotianSoldier.java
@@ -37,7 +37,7 @@ public class YotianSoldier extends mage.sets.mirrodin.YotianSoldier {
 
     public YotianSoldier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ATQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/apocalypse/LastStand.java b/Mage.Sets/src/mage/sets/apocalypse/LastStand.java
index 675e2643ef..8bf57194ab 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/LastStand.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/LastStand.java
@@ -37,7 +37,7 @@ public class LastStand extends mage.sets.planechase2012.LastStand {
 
     public LastStand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "APC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianRager.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianRager.java
index e0b5bfd808..363a9116b6 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianRager.java
@@ -37,7 +37,7 @@ public class PhyrexianRager extends mage.sets.tenthedition.PhyrexianRager {
 
     public PhyrexianRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "APC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/apocalypse/PropheticBolt.java b/Mage.Sets/src/mage/sets/apocalypse/PropheticBolt.java
index e4cd7ae7f5..bb225750b0 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/PropheticBolt.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/PropheticBolt.java
@@ -37,7 +37,7 @@ public class PropheticBolt extends mage.sets.commander.PropheticBolt {
 
     public PropheticBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "APC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolWarrior.java b/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolWarrior.java
index dd19c0468d..cfb34fcc24 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolWarrior.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolWarrior.java
@@ -37,7 +37,7 @@ public class WhirlpoolWarrior extends mage.sets.planechase2012.WhirlpoolWarrior
 
     public WhirlpoolWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "APC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Aladdin.java b/Mage.Sets/src/mage/sets/arabiannights/Aladdin.java
index 51906a0d33..d26cf1728d 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Aladdin.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Aladdin.java
@@ -37,7 +37,7 @@ public class Aladdin extends mage.sets.masterseditioniv.Aladdin {
 
     public Aladdin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/AladdinsLamp.java b/Mage.Sets/src/mage/sets/arabiannights/AladdinsLamp.java
index 3ea82cb803..400258da6f 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/AladdinsLamp.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/AladdinsLamp.java
@@ -37,7 +37,7 @@ public class AladdinsLamp extends mage.sets.revisededition.AladdinsLamp {
 
     public AladdinsLamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/AladdinsRing.java b/Mage.Sets/src/mage/sets/arabiannights/AladdinsRing.java
index 32365c81bb..86022d371d 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java b/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java
index b50534ab8c..319d3a81d8 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java
@@ -37,7 +37,7 @@ public class ArmyOfAllah2 extends ArmyOfAllah1 {
     
     public ArmyOfAllah2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
     }
 
     public ArmyOfAllah2(final ArmyOfAllah2 card) {
diff --git a/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden1.java b/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden1.java
index af3bc6ebc1..dabc12c31d 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden1.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden1.java
@@ -37,7 +37,7 @@ public class BirdMaiden1 extends mage.sets.fifthedition.BirdMaiden {
 
     public BirdMaiden1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden2.java b/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden2.java
index fe4077e9c4..20219a8d95 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/BirdMaiden2.java
@@ -37,7 +37,7 @@ public class BirdMaiden2 extends mage.sets.fifthedition.BirdMaiden {
 
     public BirdMaiden2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/BottleOfSuleiman.java b/Mage.Sets/src/mage/sets/arabiannights/BottleOfSuleiman.java
index d71af25e5e..c9070f47be 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/BottleOfSuleiman.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/BottleOfSuleiman.java
@@ -37,7 +37,7 @@ public class BottleOfSuleiman extends mage.sets.fifthedition.BottleOfSuleiman {
 
     public BottleOfSuleiman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/BrassMan.java b/Mage.Sets/src/mage/sets/arabiannights/BrassMan.java
index 2d189f4f4d..436ae3a342 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/BrassMan.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/BrassMan.java
@@ -37,7 +37,7 @@ public class BrassMan extends mage.sets.fourthedition.BrassMan {
 
     public BrassMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/CityInABottle.java b/Mage.Sets/src/mage/sets/arabiannights/CityInABottle.java
index ea6298378f..d7fec25156 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/CityInABottle.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/CityInABottle.java
@@ -38,7 +38,7 @@ public class CityInABottle extends mage.sets.vintagemasters.CityInABottle {
 
     public CityInABottle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java b/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java
index 80148f8c31..65467b6ff2 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java
@@ -38,7 +38,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java b/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java
index 270effe835..a14b6bce67 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java
@@ -38,7 +38,7 @@ public class CuombajjWitches extends mage.sets.mastersedition.CuombajjWitches {
 
     public CuombajjWitches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Cyclone.java b/Mage.Sets/src/mage/sets/arabiannights/Cyclone.java
index 773b67d044..ab150324f1 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Cyclone.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Cyclone.java
@@ -38,7 +38,7 @@ public class Cyclone extends mage.sets.masterseditioniv.Cyclone {
 
     public Cyclone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java b/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java
index 925bd0984b..00ce2870d0 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java
@@ -38,7 +38,7 @@ public class DancingScimitar extends mage.sets.ninthedition.DancingScimitar {
 
     public DancingScimitar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Dandan.java b/Mage.Sets/src/mage/sets/arabiannights/Dandan.java
index 4aceeae6fd..957cfa3282 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Dandan.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Dandan.java
@@ -38,7 +38,7 @@ public class Dandan extends mage.sets.fifthedition.Dandan {
 
     public Dandan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Desert.java b/Mage.Sets/src/mage/sets/arabiannights/Desert.java
index 48f9647db1..cf4c08a4c5 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Desert.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Desert.java
@@ -38,7 +38,7 @@ public class Desert extends mage.sets.timeshifted.Desert {
 
     public Desert(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/DesertTwister.java b/Mage.Sets/src/mage/sets/arabiannights/DesertTwister.java
index 4a12e477c1..4ad463f323 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/EbonyHorse.java b/Mage.Sets/src/mage/sets/arabiannights/EbonyHorse.java
index d47922dbd5..7adb3bbffa 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/EbonyHorse.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/EbonyHorse.java
@@ -37,7 +37,7 @@ public class EbonyHorse extends mage.sets.fourthedition.EbonyHorse {
 
     public EbonyHorse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/ElephantGraveyard.java b/Mage.Sets/src/mage/sets/arabiannights/ElephantGraveyard.java
index f5b46ed2f5..d1dcf995ef 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/ElephantGraveyard.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/ElephantGraveyard.java
@@ -38,7 +38,7 @@ public class ElephantGraveyard extends mage.sets.masterseditioniv.ElephantGravey
 
     public ElephantGraveyard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders1.java b/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders1.java
index 30162adc48..f40e5c520c 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders1.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders1.java
@@ -38,7 +38,7 @@ public class ErgRaiders1 extends mage.sets.fourthedition.ErgRaiders {
 
     public ErgRaiders1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders2.java b/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders2.java
index 542000552a..351a64b9f5 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/ErgRaiders2.java
@@ -38,7 +38,7 @@ public class ErgRaiders2 extends mage.sets.fourthedition.ErgRaiders {
 
     public ErgRaiders2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/ErhnamDjinn.java b/Mage.Sets/src/mage/sets/arabiannights/ErhnamDjinn.java
index 4f95fe9a1f..8fd6f7e381 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/ErhnamDjinn.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/ErhnamDjinn.java
@@ -37,7 +37,7 @@ public class ErhnamDjinn extends mage.sets.judgment.ErhnamDjinn {
 
     public ErhnamDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/FishliverOil2.java b/Mage.Sets/src/mage/sets/arabiannights/FishliverOil2.java
index 7540256d51..45801ae0c3 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/FishliverOil2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/FishliverOil2.java
@@ -15,7 +15,7 @@ public class FishliverOil2 extends mage.sets.arabiannights.FishliverOil1 {
     
    public FishliverOil2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java b/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java
index 84df6fd620..9ccd02339e 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java
@@ -38,7 +38,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java b/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java
index 5c1510bb65..059ef8c099 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java
@@ -38,7 +38,7 @@ public class FlyingMen extends mage.sets.timeshifted.FlyingMen {
 
     public FlyingMen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/GhazbanOgre.java b/Mage.Sets/src/mage/sets/arabiannights/GhazbanOgre.java
index 5a1aeaabfc..f139218afe 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/GhazbanOgre.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/GhazbanOgre.java
@@ -37,7 +37,7 @@ public class GhazbanOgre extends mage.sets.fifthedition.GhazbanOgre {
 
     public GhazbanOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise1.java b/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise1.java
index c91458b42a..3a8fd156d1 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise1.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise1.java
@@ -37,7 +37,7 @@ public class GiantTortoise1 extends mage.sets.fourthedition.GiantTortoise {
 
     public GiantTortoise1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise2.java b/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise2.java
index 2e9ca156d7..0afe7c3825 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/GiantTortoise2.java
@@ -37,7 +37,7 @@ public class GiantTortoise2 extends mage.sets.fourthedition.GiantTortoise {
 
     public GiantTortoise2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/HasranOgress1.java b/Mage.Sets/src/mage/sets/arabiannights/HasranOgress1.java
index dc6dea357e..2e41881cc4 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/HasranOgress1.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/HasranOgress1.java
@@ -38,7 +38,7 @@ public class HasranOgress1 extends mage.sets.masterseditioniv.HasranOgress {
 
     public HasranOgress1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/HasranOgress2.java b/Mage.Sets/src/mage/sets/arabiannights/HasranOgress2.java
index 9b64f3a8e8..f198b90066 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/HasranOgress2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/HasranOgress2.java
@@ -38,7 +38,7 @@ public class HasranOgress2 extends mage.sets.masterseditioniv.HasranOgress {
 
     public HasranOgress2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/IfhBiffEfreet.java b/Mage.Sets/src/mage/sets/arabiannights/IfhBiffEfreet.java
index 0b1b20df4c..ee50b9ad15 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/IfhBiffEfreet.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/IfhBiffEfreet.java
@@ -37,7 +37,7 @@ public class IfhBiffEfreet extends mage.sets.mastersedition.IfhBiffEfreet {
 
     public IfhBiffEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/IslandFishJasconius.java b/Mage.Sets/src/mage/sets/arabiannights/IslandFishJasconius.java
index 165b82a710..c3ead97062 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/IslandFishJasconius.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/IslandFishJasconius.java
@@ -37,7 +37,7 @@ public class IslandFishJasconius extends mage.sets.fourthedition.IslandFishJasco
 
     public IslandFishJasconius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/JandorsRing.java b/Mage.Sets/src/mage/sets/arabiannights/JandorsRing.java
index 4dbda78ae7..68319a50f1 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/JandorsRing.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/JandorsRing.java
@@ -37,7 +37,7 @@ public class JandorsRing extends mage.sets.revisededition.JandorsRing {
 
     public JandorsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/JandorsSaddlebags.java b/Mage.Sets/src/mage/sets/arabiannights/JandorsSaddlebags.java
index 8e61dddd4d..33d9d8aca6 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/JandorsSaddlebags.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/JandorsSaddlebags.java
@@ -37,7 +37,7 @@ public class JandorsSaddlebags extends mage.sets.seventhedition.JandorsSaddlebag
 
     public JandorsSaddlebags(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/JununEfreet.java b/Mage.Sets/src/mage/sets/arabiannights/JununEfreet.java
index 58ca657c48..cf45db0951 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/JununEfreet.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/JununEfreet.java
@@ -38,7 +38,7 @@ public class JununEfreet extends mage.sets.fourthedition.JununEfreet {
 
     public JununEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/KhabalGhoul.java b/Mage.Sets/src/mage/sets/arabiannights/KhabalGhoul.java
index 1c50103cb4..7738962d0b 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/KhabalGhoul.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/KhabalGhoul.java
@@ -38,7 +38,7 @@ public class KhabalGhoul extends mage.sets.mastersedition.KhabalGhoul {
 
     public KhabalGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java b/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java
index 4def3d6769..8e2a6f035f 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java
@@ -38,7 +38,7 @@ public class KirdApe extends mage.sets.ninthedition.KirdApe {
 
     public KirdApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/LibraryOfAlexandria.java b/Mage.Sets/src/mage/sets/arabiannights/LibraryOfAlexandria.java
index 051f311eec..b3222a6822 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/LibraryOfAlexandria.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/LibraryOfAlexandria.java
@@ -38,7 +38,7 @@ public class LibraryOfAlexandria extends mage.sets.vintagemasters.LibraryOfAlexa
 
     public LibraryOfAlexandria(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/MijaeDjinn.java b/Mage.Sets/src/mage/sets/arabiannights/MijaeDjinn.java
index 7785a68488..9bc7357073 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/MijaeDjinn.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/MijaeDjinn.java
@@ -37,7 +37,7 @@ public class MijaeDjinn extends mage.sets.masterseditioniv.MijaeDjinn {
 
     public MijaeDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry1.java b/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry1.java
index 98a8c4369e..3a17be8aeb 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry1.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry1.java
@@ -38,7 +38,7 @@ public class MoorishCavalry1 extends mage.sets.timeshifted.MoorishCavalry {
 
     public MoorishCavalry1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry2.java b/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry2.java
index f394fa3894..bb28fe617c 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry2.java
@@ -38,7 +38,7 @@ public class MoorishCavalry2 extends mage.sets.timeshifted.MoorishCavalry {
 
     public MoorishCavalry2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java b/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java
index 1a040c0bd0..2cf442b8fc 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java
@@ -37,7 +37,7 @@ public class NafsAsp2 extends NafsAsp1 {
 
     public NafsAsp2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
     }
 
     public NafsAsp2(final NafsAsp2 card) {
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Oasis.java b/Mage.Sets/src/mage/sets/arabiannights/Oasis.java
index 5b24858bb3..683f90f8a1 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Oasis.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Oasis.java
@@ -37,7 +37,7 @@ public class Oasis extends mage.sets.fourthedition.Oasis {
 
     public Oasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java b/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java
index ecbb541a22..84bf278673 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java
@@ -37,7 +37,7 @@ public class Oubliette2 extends Oubliette1 {
 
     public Oubliette2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
     }
 
     public Oubliette2(final Oubliette2 card) {
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Piety2.java b/Mage.Sets/src/mage/sets/arabiannights/Piety2.java
index 2ee8a1bc53..ff45bb6cc2 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Piety2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Piety2.java
@@ -37,7 +37,7 @@ public class Piety2 extends Piety1 {
 
     public Piety2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
     }
 
     public Piety2(final Piety2 card) {
diff --git a/Mage.Sets/src/mage/sets/arabiannights/RepentantBlacksmith.java b/Mage.Sets/src/mage/sets/arabiannights/RepentantBlacksmith.java
index 6879086012..c3f71964f8 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/RepentantBlacksmith.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/RepentantBlacksmith.java
@@ -38,7 +38,7 @@ public class RepentantBlacksmith extends mage.sets.fifthedition.RepentantBlacksm
 
     public RepentantBlacksmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/RukhEgg2.java b/Mage.Sets/src/mage/sets/arabiannights/RukhEgg2.java
index 1b5866538c..da442c00ce 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/RukhEgg2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/RukhEgg2.java
@@ -38,7 +38,7 @@ public class RukhEgg2 extends mage.sets.arabiannights.RukhEgg1 {
 
     public RukhEgg2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Sandstorm.java b/Mage.Sets/src/mage/sets/arabiannights/Sandstorm.java
index 42ec098510..af67c181d1 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Sandstorm.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Sandstorm.java
@@ -37,7 +37,7 @@ public class Sandstorm extends mage.sets.fourthedition.Sandstorm {
 
     public Sandstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/SerendibDjinn.java b/Mage.Sets/src/mage/sets/arabiannights/SerendibDjinn.java
index 541accc488..62912720e2 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/SerendibDjinn.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/SerendibDjinn.java
@@ -37,7 +37,7 @@ public class SerendibDjinn extends mage.sets.masterseditioniv.SerendibDjinn {
 
     public SerendibDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/SerendibEfreet.java b/Mage.Sets/src/mage/sets/arabiannights/SerendibEfreet.java
index c1211a6adb..bf726e0735 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/SerendibEfreet.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/SerendibEfreet.java
@@ -38,7 +38,7 @@ public class SerendibEfreet extends mage.sets.vintagemasters.SerendibEfreet {
 
     public SerendibEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Sindbad.java b/Mage.Sets/src/mage/sets/arabiannights/Sindbad.java
index f5d7e9502d..1cfea83fba 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Sindbad.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Sindbad.java
@@ -37,7 +37,7 @@ public class Sindbad extends mage.sets.fourthedition.Sindbad {
 
     public Sindbad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/SorceressQueen.java b/Mage.Sets/src/mage/sets/arabiannights/SorceressQueen.java
index 2b10da04dc..8e09128c3d 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/SorceressQueen.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/SorceressQueen.java
@@ -38,7 +38,7 @@ public class SorceressQueen extends mage.sets.revisededition.SorceressQueen {
 
     public SorceressQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils2.java b/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils2.java
index 9026254759..60f2e68e59 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils2.java
@@ -15,7 +15,7 @@ public class StoneThrowingDevils2 extends mage.sets.arabiannights.StoneThrowingD
     
    public StoneThrowingDevils2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf1.java b/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf1.java
index 1b15f35517..7c962fee05 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf1.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf1.java
@@ -38,7 +38,7 @@ public class WyluliWolf1 extends mage.sets.fifthedition.WyluliWolf {
 
     public WyluliWolf1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf2.java b/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf2.java
index 9f2e093f71..e1a8a76c50 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf2.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/WyluliWolf2.java
@@ -38,7 +38,7 @@ public class WyluliWolf2 extends mage.sets.fifthedition.WyluliWolf {
 
     public WyluliWolf2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "ARN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/YdwenEfreet.java b/Mage.Sets/src/mage/sets/arabiannights/YdwenEfreet.java
index 3298eaafbf..7b47ad3ee7 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/YdwenEfreet.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/YdwenEfreet.java
@@ -37,7 +37,7 @@ public class YdwenEfreet extends mage.sets.mastersedition.YdwenEfreet {
 
     public YdwenEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ARN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java
index 45e67a8c44..27745f1906 100644
--- a/Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java
@@ -37,7 +37,7 @@ public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb
 
     public AEtherSpellbomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/AgonyWarp.java b/Mage.Sets/src/mage/sets/archenemy/AgonyWarp.java
index fd14a3ba81..36567dbf7e 100644
--- a/Mage.Sets/src/mage/sets/archenemy/AgonyWarp.java
+++ b/Mage.Sets/src/mage/sets/archenemy/AgonyWarp.java
@@ -37,7 +37,7 @@ public class AgonyWarp extends mage.sets.shardsofalara.AgonyWarp {
 
     public AgonyWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ArchitectsOfWill.java b/Mage.Sets/src/mage/sets/archenemy/ArchitectsOfWill.java
index 582b0b6d10..46a94de15c 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ArchitectsOfWill.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ArchitectsOfWill.java
@@ -37,7 +37,7 @@ public class ArchitectsOfWill extends mage.sets.alarareborn.ArchitectsOfWill {
 
     public ArchitectsOfWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/archenemy/ArmadilloCloak.java
index 943d8e2126..41751c5588 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ArmadilloCloak.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ArmadilloCloak.java
@@ -37,7 +37,7 @@ public class ArmadilloCloak extends mage.sets.invasion.ArmadilloCloak {
 
     public ArmadilloCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/archenemy/ArtisanOfKozilek.java
index e112f4b61e..c28ec9c011 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ArtisanOfKozilek.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ArtisanOfKozilek.java
@@ -37,7 +37,7 @@ public class ArtisanOfKozilek extends mage.sets.riseoftheeldrazi.ArtisanOfKozile
 
     public ArtisanOfKozilek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/AvatarOfDiscord.java b/Mage.Sets/src/mage/sets/archenemy/AvatarOfDiscord.java
index 5f45f8d090..5d91c34fbb 100644
--- a/Mage.Sets/src/mage/sets/archenemy/AvatarOfDiscord.java
+++ b/Mage.Sets/src/mage/sets/archenemy/AvatarOfDiscord.java
@@ -37,7 +37,7 @@ public class AvatarOfDiscord extends mage.sets.dissension.AvatarOfDiscord {
 
     public AvatarOfDiscord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/AzoriusSignet.java b/Mage.Sets/src/mage/sets/archenemy/AzoriusSignet.java
index d4d26cab2c..7ce049e0d7 100644
--- a/Mage.Sets/src/mage/sets/archenemy/AzoriusSignet.java
+++ b/Mage.Sets/src/mage/sets/archenemy/AzoriusSignet.java
@@ -37,7 +37,7 @@ public class AzoriusSignet extends mage.sets.dissension.AzoriusSignet {
 
     public AzoriusSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BarrenMoor.java b/Mage.Sets/src/mage/sets/archenemy/BarrenMoor.java
index 8f11cad04a..7a8b33982e 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BatwingBrume.java b/Mage.Sets/src/mage/sets/archenemy/BatwingBrume.java
index 343a18fe3e..50ab8ca474 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BatwingBrume.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BatwingBrume.java
@@ -37,7 +37,7 @@ public class BatwingBrume extends mage.sets.eventide.BatwingBrume {
 
     public BatwingBrume(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BeaconOfUnrest.java b/Mage.Sets/src/mage/sets/archenemy/BeaconOfUnrest.java
index 366e32c330..1aad662754 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BeaconOfUnrest.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BeaconOfUnrest.java
@@ -37,7 +37,7 @@ public class BeaconOfUnrest extends mage.sets.planechase.BeaconOfUnrest {
 
     public BeaconOfUnrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BituminousBlast.java b/Mage.Sets/src/mage/sets/archenemy/BituminousBlast.java
index 0463f80506..61d768f14d 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BituminousBlast.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BituminousBlast.java
@@ -37,7 +37,7 @@ public class BituminousBlast extends mage.sets.alarareborn.BituminousBlast {
 
     public BituminousBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BogWitch.java b/Mage.Sets/src/mage/sets/archenemy/BogWitch.java
index a034d96cfc..311cc76546 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BogWitch.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BogWitch.java
@@ -37,7 +37,7 @@ public class BogWitch extends mage.sets.mercadianmasques.BogWitch {
 
     public BogWitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BranchingBolt.java b/Mage.Sets/src/mage/sets/archenemy/BranchingBolt.java
index abff02a2b2..e1af5c260c 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BranchingBolt.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BranchingBolt.java
@@ -37,7 +37,7 @@ public class BranchingBolt extends mage.sets.shardsofalara.BranchingBolt {
 
     public BranchingBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/BreathOfDarigaaz.java b/Mage.Sets/src/mage/sets/archenemy/BreathOfDarigaaz.java
index 19857c0f07..b85d594b3f 100644
--- a/Mage.Sets/src/mage/sets/archenemy/BreathOfDarigaaz.java
+++ b/Mage.Sets/src/mage/sets/archenemy/BreathOfDarigaaz.java
@@ -37,7 +37,7 @@ public class BreathOfDarigaaz extends mage.sets.commander.BreathOfDarigaaz {
 
     public BreathOfDarigaaz(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/CemeteryReaper.java b/Mage.Sets/src/mage/sets/archenemy/CemeteryReaper.java
index fec6512033..a11fc1f0f4 100644
--- a/Mage.Sets/src/mage/sets/archenemy/CemeteryReaper.java
+++ b/Mage.Sets/src/mage/sets/archenemy/CemeteryReaper.java
@@ -37,7 +37,7 @@ public class CemeteryReaper extends mage.sets.magic2012.CemeteryReaper {
 
     public CemeteryReaper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ChameleonColossus.java b/Mage.Sets/src/mage/sets/archenemy/ChameleonColossus.java
index 78bf6b8173..e8007def43 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ChameleonColossus.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ChameleonColossus.java
@@ -37,7 +37,7 @@ public class ChameleonColossus extends mage.sets.morningtide.ChameleonColossus {
 
     public ChameleonColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/archenemy/ChandrasOutrage.java
index f0e58d237f..6ef800a82f 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ChandrasOutrage.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ChandrasOutrage.java
@@ -37,7 +37,7 @@ public class ChandrasOutrage extends mage.sets.magic2011.ChandrasOutrage {
 
     public ChandrasOutrage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ColossalMight.java b/Mage.Sets/src/mage/sets/archenemy/ColossalMight.java
index e4f36c82b7..ea0bed8386 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ColossalMight.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ColossalMight.java
@@ -37,7 +37,7 @@ public class ColossalMight extends mage.sets.alarareborn.ColossalMight {
 
     public ColossalMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/CorpseConnoisseur.java b/Mage.Sets/src/mage/sets/archenemy/CorpseConnoisseur.java
index 60f34d4969..96dd6ad808 100644
--- a/Mage.Sets/src/mage/sets/archenemy/CorpseConnoisseur.java
+++ b/Mage.Sets/src/mage/sets/archenemy/CorpseConnoisseur.java
@@ -37,7 +37,7 @@ public class CorpseConnoisseur extends mage.sets.shardsofalara.CorpseConnoisseur
 
     public CorpseConnoisseur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/DimirSignet.java b/Mage.Sets/src/mage/sets/archenemy/DimirSignet.java
index 30c0c8cd4e..c8a7084465 100644
--- a/Mage.Sets/src/mage/sets/archenemy/DimirSignet.java
+++ b/Mage.Sets/src/mage/sets/archenemy/DimirSignet.java
@@ -37,7 +37,7 @@ public class DimirSignet extends mage.sets.ravnica.DimirSignet {
 
     public DimirSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/DragonFodder.java b/Mage.Sets/src/mage/sets/archenemy/DragonFodder.java
index 5548623ffe..9dfc3352c5 100644
--- a/Mage.Sets/src/mage/sets/archenemy/DragonFodder.java
+++ b/Mage.Sets/src/mage/sets/archenemy/DragonFodder.java
@@ -37,7 +37,7 @@ public class DragonFodder extends mage.sets.shardsofalara.DragonFodder {
 
     public DragonFodder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/DragonWhelp.java b/Mage.Sets/src/mage/sets/archenemy/DragonWhelp.java
index 5c8c5ad752..7038cdfd45 100644
--- a/Mage.Sets/src/mage/sets/archenemy/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/archenemy/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/DragonspeakerShaman.java b/Mage.Sets/src/mage/sets/archenemy/DragonspeakerShaman.java
index 10010c9769..ade315371a 100644
--- a/Mage.Sets/src/mage/sets/archenemy/DragonspeakerShaman.java
+++ b/Mage.Sets/src/mage/sets/archenemy/DragonspeakerShaman.java
@@ -37,7 +37,7 @@ public class DragonspeakerShaman extends mage.sets.scourge.DragonspeakerShaman {
 
     public DragonspeakerShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/DreamstoneHedron.java b/Mage.Sets/src/mage/sets/archenemy/DreamstoneHedron.java
index 48ee93fa84..0c92790199 100644
--- a/Mage.Sets/src/mage/sets/archenemy/DreamstoneHedron.java
+++ b/Mage.Sets/src/mage/sets/archenemy/DreamstoneHedron.java
@@ -37,7 +37,7 @@ public class DreamstoneHedron extends mage.sets.riseoftheeldrazi.DreamstoneHedro
 
     public DreamstoneHedron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/DregscapeZombie.java b/Mage.Sets/src/mage/sets/archenemy/DregscapeZombie.java
index 5a3664aa20..089ca1959a 100644
--- a/Mage.Sets/src/mage/sets/archenemy/DregscapeZombie.java
+++ b/Mage.Sets/src/mage/sets/archenemy/DregscapeZombie.java
@@ -37,7 +37,7 @@ public class DregscapeZombie extends mage.sets.shardsofalara.DregscapeZombie {
 
     public DregscapeZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Duplicant.java b/Mage.Sets/src/mage/sets/archenemy/Duplicant.java
index ad6880cfb8..6ae9a480bb 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Duplicant.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Duplicant.java
@@ -37,7 +37,7 @@ public class Duplicant extends mage.sets.mirrodin.Duplicant {
 
     public Duplicant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/EtherswornShieldmage.java b/Mage.Sets/src/mage/sets/archenemy/EtherswornShieldmage.java
index 11bd0ae744..b08ba84ec6 100644
--- a/Mage.Sets/src/mage/sets/archenemy/EtherswornShieldmage.java
+++ b/Mage.Sets/src/mage/sets/archenemy/EtherswornShieldmage.java
@@ -37,7 +37,7 @@ public class EtherswornShieldmage extends mage.sets.alarareborn.EtherswornShield
 
     public EtherswornShieldmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/EverflowingChalice.java b/Mage.Sets/src/mage/sets/archenemy/EverflowingChalice.java
index 25d7efd713..566114a20f 100644
--- a/Mage.Sets/src/mage/sets/archenemy/EverflowingChalice.java
+++ b/Mage.Sets/src/mage/sets/archenemy/EverflowingChalice.java
@@ -37,7 +37,7 @@ public class EverflowingChalice extends mage.sets.worldwake.EverflowingChalice {
 
     public EverflowingChalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ExtractorDemon.java b/Mage.Sets/src/mage/sets/archenemy/ExtractorDemon.java
index d720fbe5b1..9fb413a8db 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ExtractorDemon.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ExtractorDemon.java
@@ -37,7 +37,7 @@ public class ExtractorDemon extends mage.sets.conflux.ExtractorDemon {
 
     public ExtractorDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FeralHydra.java b/Mage.Sets/src/mage/sets/archenemy/FeralHydra.java
index 01de4a154e..8f31a6782e 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FeralHydra.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FeralHydra.java
@@ -37,7 +37,7 @@ public class FeralHydra extends mage.sets.shardsofalara.FeralHydra {
 
     public FeralHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Fertilid.java b/Mage.Sets/src/mage/sets/archenemy/Fertilid.java
index df59cab005..0911850b28 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Fertilid.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Fertilid.java
@@ -37,7 +37,7 @@ public class Fertilid extends mage.sets.commander.Fertilid {
 
     public Fertilid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FesteringGoblin.java b/Mage.Sets/src/mage/sets/archenemy/FesteringGoblin.java
index 377ea4af3a..56c3a03ab7 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FesteringGoblin.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FesteringGoblin.java
@@ -37,7 +37,7 @@ public class FesteringGoblin extends mage.sets.planechase.FesteringGoblin {
 
     public FesteringGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FieldmistBorderpost.java b/Mage.Sets/src/mage/sets/archenemy/FieldmistBorderpost.java
index 758aefe75f..14f5f9afe0 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FieldmistBorderpost.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FieldmistBorderpost.java
@@ -37,7 +37,7 @@ public class FieldmistBorderpost extends mage.sets.alarareborn.FieldmistBorderpo
 
     public FieldmistBorderpost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FierceEmpath.java b/Mage.Sets/src/mage/sets/archenemy/FierceEmpath.java
index d4780c73c5..4cbaa4bca5 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FierceEmpath.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FierceEmpath.java
@@ -37,7 +37,7 @@ public class FierceEmpath extends mage.sets.commander.FierceEmpath {
 
     public FierceEmpath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Fireball.java b/Mage.Sets/src/mage/sets/archenemy/Fireball.java
index 14405b7d37..847f594445 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Fireball.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/archenemy/FiresOfYavimaya.java
index d95265ebf7..1b4a79da9b 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FlameblastDragon.java b/Mage.Sets/src/mage/sets/archenemy/FlameblastDragon.java
index 79928204aa..a8dbd36f7d 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FlameblastDragon.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FlameblastDragon.java
@@ -37,7 +37,7 @@ public class FlameblastDragon extends mage.sets.shardsofalara.FlameblastDragon {
 
     public FlameblastDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Fog.java b/Mage.Sets/src/mage/sets/archenemy/Fog.java
index 255f02972e..c30c03c594 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Fog.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ForgottenAncient.java b/Mage.Sets/src/mage/sets/archenemy/ForgottenAncient.java
index e102950a15..f274901338 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ForgottenAncient.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ForgottenAncient.java
@@ -37,7 +37,7 @@ public class ForgottenAncient extends mage.sets.scourge.ForgottenAncient {
 
     public ForgottenAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/archenemy/FurnaceWhelp.java
index 6616e58029..da965b91cc 100644
--- a/Mage.Sets/src/mage/sets/archenemy/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/archenemy/FurnaceWhelp.java
@@ -37,7 +37,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
 
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/GathanRaiders.java b/Mage.Sets/src/mage/sets/archenemy/GathanRaiders.java
index 8e61c647f6..71fd642fce 100644
--- a/Mage.Sets/src/mage/sets/archenemy/GathanRaiders.java
+++ b/Mage.Sets/src/mage/sets/archenemy/GathanRaiders.java
@@ -37,7 +37,7 @@ public class GathanRaiders extends mage.sets.futuresight.GathanRaiders {
 
     public GathanRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/GraypeltRefuge.java b/Mage.Sets/src/mage/sets/archenemy/GraypeltRefuge.java
index 5dff1f24d4..6f83829432 100644
--- a/Mage.Sets/src/mage/sets/archenemy/GraypeltRefuge.java
+++ b/Mage.Sets/src/mage/sets/archenemy/GraypeltRefuge.java
@@ -37,7 +37,7 @@ public class GraypeltRefuge extends mage.sets.zendikar.GraypeltRefuge {
 
     public GraypeltRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/GruulSignet.java b/Mage.Sets/src/mage/sets/archenemy/GruulSignet.java
index 21c3b994fd..cd7ced421a 100644
--- a/Mage.Sets/src/mage/sets/archenemy/GruulSignet.java
+++ b/Mage.Sets/src/mage/sets/archenemy/GruulSignet.java
@@ -37,7 +37,7 @@ public class GruulSignet extends mage.sets.guildpact.GruulSignet {
 
     public GruulSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Harmonize.java b/Mage.Sets/src/mage/sets/archenemy/Harmonize.java
index 7ca1f219e9..6df060b086 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/HellkiteCharger.java b/Mage.Sets/src/mage/sets/archenemy/HellkiteCharger.java
index 712079b467..2baeaa79d9 100644
--- a/Mage.Sets/src/mage/sets/archenemy/HellkiteCharger.java
+++ b/Mage.Sets/src/mage/sets/archenemy/HellkiteCharger.java
@@ -37,7 +37,7 @@ public class HellkiteCharger extends mage.sets.zendikar.HellkiteCharger {
 
     public HellkiteCharger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/HeroesReunion.java b/Mage.Sets/src/mage/sets/archenemy/HeroesReunion.java
index 68482afe8f..1972970585 100644
--- a/Mage.Sets/src/mage/sets/archenemy/HeroesReunion.java
+++ b/Mage.Sets/src/mage/sets/archenemy/HeroesReunion.java
@@ -37,7 +37,7 @@ public class HeroesReunion extends mage.sets.invasion.HeroesReunion {
 
     public HeroesReunion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/HuntingMoa.java b/Mage.Sets/src/mage/sets/archenemy/HuntingMoa.java
index 0bbebf6370..3f4df4775e 100644
--- a/Mage.Sets/src/mage/sets/archenemy/HuntingMoa.java
+++ b/Mage.Sets/src/mage/sets/archenemy/HuntingMoa.java
@@ -37,7 +37,7 @@ public class HuntingMoa extends mage.sets.urzasdestiny.HuntingMoa {
 
     public HuntingMoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/IncrementalBlight.java b/Mage.Sets/src/mage/sets/archenemy/IncrementalBlight.java
index f37806c869..8faa31f5ef 100644
--- a/Mage.Sets/src/mage/sets/archenemy/IncrementalBlight.java
+++ b/Mage.Sets/src/mage/sets/archenemy/IncrementalBlight.java
@@ -37,7 +37,7 @@ public class IncrementalBlight extends mage.sets.shadowmoor.IncrementalBlight {
 
     public IncrementalBlight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/InfectiousHorror.java b/Mage.Sets/src/mage/sets/archenemy/InfectiousHorror.java
index 19f58617ac..92b72751aa 100644
--- a/Mage.Sets/src/mage/sets/archenemy/InfectiousHorror.java
+++ b/Mage.Sets/src/mage/sets/archenemy/InfectiousHorror.java
@@ -37,7 +37,7 @@ public class InfectiousHorror extends mage.sets.conflux.InfectiousHorror {
 
     public InfectiousHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/InfernoTrap.java b/Mage.Sets/src/mage/sets/archenemy/InfernoTrap.java
index 03e2dc7da7..033e834252 100644
--- a/Mage.Sets/src/mage/sets/archenemy/InfernoTrap.java
+++ b/Mage.Sets/src/mage/sets/archenemy/InfernoTrap.java
@@ -37,7 +37,7 @@ public class InfernoTrap extends mage.sets.zendikar.InfernoTrap {
 
     public InfernoTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Infest.java b/Mage.Sets/src/mage/sets/archenemy/Infest.java
index 9fe09e0265..d000991f47 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Infest.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Infest.java
@@ -37,7 +37,7 @@ public class Infest extends mage.sets.shardsofalara.Infest {
 
     public Infest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Juggernaut.java b/Mage.Sets/src/mage/sets/archenemy/Juggernaut.java
index 3ce14ebb8b..8824ad6858 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KaervekTheMerciless.java b/Mage.Sets/src/mage/sets/archenemy/KaervekTheMerciless.java
index f87c0c3f53..6d7b80d5d5 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KaervekTheMerciless.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KaervekTheMerciless.java
@@ -37,7 +37,7 @@ public class KaervekTheMerciless extends mage.sets.timespiral.KaervekTheMerciles
 
     public KaervekTheMerciless(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KamahlFistOfKrosa.java b/Mage.Sets/src/mage/sets/archenemy/KamahlFistOfKrosa.java
index 8d9a7396b7..b1e049e4df 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KamahlFistOfKrosa.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KamahlFistOfKrosa.java
@@ -37,7 +37,7 @@ public class KamahlFistOfKrosa extends mage.sets.onslaught.KamahlFistOfKrosa {
 
     public KamahlFistOfKrosa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KazanduRefuge.java b/Mage.Sets/src/mage/sets/archenemy/KazanduRefuge.java
index 83ede09fe5..38b8d3a1ee 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KazanduRefuge.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KazanduRefuge.java
@@ -37,7 +37,7 @@ public class KazanduRefuge extends mage.sets.zendikar.KazanduRefuge {
 
     public KazanduRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KhalniGarden.java b/Mage.Sets/src/mage/sets/archenemy/KhalniGarden.java
index f67f24e8e1..150a708eb3 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KhalniGarden.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KhalniGarden.java
@@ -37,7 +37,7 @@ public class KhalniGarden extends mage.sets.worldwake.KhalniGarden {
 
     public KhalniGarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KilnmouthDragon.java b/Mage.Sets/src/mage/sets/archenemy/KilnmouthDragon.java
index 2ca7765b9d..48589c7b06 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KilnmouthDragon.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KilnmouthDragon.java
@@ -37,7 +37,7 @@ public class KilnmouthDragon extends mage.sets.knightsvsdragons.KilnmouthDragon
 
     public KilnmouthDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KrosanTusker.java b/Mage.Sets/src/mage/sets/archenemy/KrosanTusker.java
index 56587c2692..3db73e1640 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/KrosanVerge.java b/Mage.Sets/src/mage/sets/archenemy/KrosanVerge.java
index 80b84d1bc5..e7c7fa36d2 100644
--- a/Mage.Sets/src/mage/sets/archenemy/KrosanVerge.java
+++ b/Mage.Sets/src/mage/sets/archenemy/KrosanVerge.java
@@ -37,7 +37,7 @@ public class KrosanVerge extends mage.sets.planechase2012.KrosanVerge {
 
     public KrosanVerge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/LeafGilder.java b/Mage.Sets/src/mage/sets/archenemy/LeafGilder.java
index e8081dc160..20e3749366 100644
--- a/Mage.Sets/src/mage/sets/archenemy/LeafGilder.java
+++ b/Mage.Sets/src/mage/sets/archenemy/LeafGilder.java
@@ -37,7 +37,7 @@ public class LeafGilder extends mage.sets.lorwyn.LeafGilder {
 
     public LeafGilder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/LeoninAbunas.java b/Mage.Sets/src/mage/sets/archenemy/LeoninAbunas.java
index 045e46493a..31288415e5 100644
--- a/Mage.Sets/src/mage/sets/archenemy/LeoninAbunas.java
+++ b/Mage.Sets/src/mage/sets/archenemy/LeoninAbunas.java
@@ -37,7 +37,7 @@ public class LeoninAbunas extends mage.sets.mirrodin.LeoninAbunas {
 
     public LeoninAbunas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/LightningGreaves.java b/Mage.Sets/src/mage/sets/archenemy/LightningGreaves.java
index bbef021dc1..fd0c55c7ba 100644
--- a/Mage.Sets/src/mage/sets/archenemy/LightningGreaves.java
+++ b/Mage.Sets/src/mage/sets/archenemy/LightningGreaves.java
@@ -37,7 +37,7 @@ public class LightningGreaves extends mage.sets.mirrodin.LightningGreaves {
 
     public LightningGreaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/LlanowarReborn.java b/Mage.Sets/src/mage/sets/archenemy/LlanowarReborn.java
index 1f70ac1a31..7570681341 100644
--- a/Mage.Sets/src/mage/sets/archenemy/LlanowarReborn.java
+++ b/Mage.Sets/src/mage/sets/archenemy/LlanowarReborn.java
@@ -37,7 +37,7 @@ public class LlanowarReborn extends mage.sets.heroesvsmonsters.LlanowarReborn {
 
     public LlanowarReborn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/LodestoneGolem.java b/Mage.Sets/src/mage/sets/archenemy/LodestoneGolem.java
index 55069bf68d..17b23622b4 100644
--- a/Mage.Sets/src/mage/sets/archenemy/LodestoneGolem.java
+++ b/Mage.Sets/src/mage/sets/archenemy/LodestoneGolem.java
@@ -37,7 +37,7 @@ public class LodestoneGolem extends mage.sets.worldwake.LodestoneGolem {
 
     public LodestoneGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/MagisterSphinx.java b/Mage.Sets/src/mage/sets/archenemy/MagisterSphinx.java
index bbdd25ee6c..349a3f0a7b 100644
--- a/Mage.Sets/src/mage/sets/archenemy/MagisterSphinx.java
+++ b/Mage.Sets/src/mage/sets/archenemy/MagisterSphinx.java
@@ -37,7 +37,7 @@ public class MagisterSphinx extends mage.sets.conflux.MagisterSphinx {
 
     public MagisterSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/MarchOfTheMachines.java b/Mage.Sets/src/mage/sets/archenemy/MarchOfTheMachines.java
index e2323e1aa2..a9ef7d4efc 100644
--- a/Mage.Sets/src/mage/sets/archenemy/MarchOfTheMachines.java
+++ b/Mage.Sets/src/mage/sets/archenemy/MarchOfTheMachines.java
@@ -37,7 +37,7 @@ public class MarchOfTheMachines extends mage.sets.tenthedition.MarchOfTheMachine
 
     public MarchOfTheMachines(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/MasterTransmuter.java b/Mage.Sets/src/mage/sets/archenemy/MasterTransmuter.java
index aae05f0bc1..d5ae664bfb 100644
--- a/Mage.Sets/src/mage/sets/archenemy/MasterTransmuter.java
+++ b/Mage.Sets/src/mage/sets/archenemy/MasterTransmuter.java
@@ -37,7 +37,7 @@ public class MasterTransmuter extends mage.sets.conflux.MasterTransmuter {
 
     public MasterTransmuter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Metallurgeon.java b/Mage.Sets/src/mage/sets/archenemy/Metallurgeon.java
index 1db1b8ccae..c886885114 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Metallurgeon.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Metallurgeon.java
@@ -37,7 +37,7 @@ public class Metallurgeon extends mage.sets.shardsofalara.Metallurgeon {
 
     public Metallurgeon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/MistveinBorderpost.java b/Mage.Sets/src/mage/sets/archenemy/MistveinBorderpost.java
index 69c1046aa3..11e3978c7c 100644
--- a/Mage.Sets/src/mage/sets/archenemy/MistveinBorderpost.java
+++ b/Mage.Sets/src/mage/sets/archenemy/MistveinBorderpost.java
@@ -37,7 +37,7 @@ public class MistveinBorderpost extends mage.sets.alarareborn.MistveinBorderpost
 
     public MistveinBorderpost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/sets/archenemy/MolimoMaroSorcerer.java
index b9e343a18e..4a622ee530 100644
--- a/Mage.Sets/src/mage/sets/archenemy/MolimoMaroSorcerer.java
+++ b/Mage.Sets/src/mage/sets/archenemy/MolimoMaroSorcerer.java
@@ -37,7 +37,7 @@ public class MolimoMaroSorcerer extends mage.sets.tenthedition.MolimoMaroSorcere
 
     public MolimoMaroSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/MosswortBridge.java b/Mage.Sets/src/mage/sets/archenemy/MosswortBridge.java
index af88e7142a..a8ad40a57c 100644
--- a/Mage.Sets/src/mage/sets/archenemy/MosswortBridge.java
+++ b/Mage.Sets/src/mage/sets/archenemy/MosswortBridge.java
@@ -37,7 +37,7 @@ public class MosswortBridge extends mage.sets.commander2013.MosswortBridge {
 
     public MosswortBridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ObeliskOfEsper.java b/Mage.Sets/src/mage/sets/archenemy/ObeliskOfEsper.java
index 68f8dd24e2..3d37f14c66 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ObeliskOfEsper.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ObeliskOfEsper.java
@@ -37,7 +37,7 @@ public class ObeliskOfEsper extends mage.sets.shardsofalara.ObeliskOfEsper {
 
     public ObeliskOfEsper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/OblivionRing.java b/Mage.Sets/src/mage/sets/archenemy/OblivionRing.java
index b406b5af41..1f6658268d 100644
--- a/Mage.Sets/src/mage/sets/archenemy/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/archenemy/OblivionRing.java
@@ -37,7 +37,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/PaleRecluse.java b/Mage.Sets/src/mage/sets/archenemy/PaleRecluse.java
index 5445f98535..97de5bbef6 100644
--- a/Mage.Sets/src/mage/sets/archenemy/PaleRecluse.java
+++ b/Mage.Sets/src/mage/sets/archenemy/PaleRecluse.java
@@ -37,7 +37,7 @@ public class PaleRecluse extends mage.sets.alarareborn.PaleRecluse {
 
     public PaleRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/PathToExile.java b/Mage.Sets/src/mage/sets/archenemy/PathToExile.java
index 1ff9da492c..0f2ccf70fb 100644
--- a/Mage.Sets/src/mage/sets/archenemy/PathToExile.java
+++ b/Mage.Sets/src/mage/sets/archenemy/PathToExile.java
@@ -37,7 +37,7 @@ public class PathToExile extends mage.sets.conflux.PathToExile {
 
     public PathToExile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Plummet.java b/Mage.Sets/src/mage/sets/archenemy/Plummet.java
index f2e74aa284..8d0e7f7b7d 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Plummet.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/PrimalCommand.java b/Mage.Sets/src/mage/sets/archenemy/PrimalCommand.java
index 17ac8542e7..c1f95766e7 100644
--- a/Mage.Sets/src/mage/sets/archenemy/PrimalCommand.java
+++ b/Mage.Sets/src/mage/sets/archenemy/PrimalCommand.java
@@ -37,7 +37,7 @@ public class PrimalCommand extends mage.sets.lorwyn.PrimalCommand {
 
     public PrimalCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/archenemy/RakdosCarnarium.java
index 1161a24dcb..2cb9a07667 100644
--- a/Mage.Sets/src/mage/sets/archenemy/RakdosCarnarium.java
+++ b/Mage.Sets/src/mage/sets/archenemy/RakdosCarnarium.java
@@ -37,7 +37,7 @@ public class RakdosCarnarium extends mage.sets.dissension.RakdosCarnarium {
 
     public RakdosCarnarium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/RakdosGuildmage.java b/Mage.Sets/src/mage/sets/archenemy/RakdosGuildmage.java
index 0d135b88ed..a61b1b977d 100644
--- a/Mage.Sets/src/mage/sets/archenemy/RakdosGuildmage.java
+++ b/Mage.Sets/src/mage/sets/archenemy/RakdosGuildmage.java
@@ -37,7 +37,7 @@ public class RakdosGuildmage extends mage.sets.dissension.RakdosGuildmage {
 
     public RakdosGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/RakdosSignet.java b/Mage.Sets/src/mage/sets/archenemy/RakdosSignet.java
index 27b6d16751..25a68653a2 100644
--- a/Mage.Sets/src/mage/sets/archenemy/RakdosSignet.java
+++ b/Mage.Sets/src/mage/sets/archenemy/RakdosSignet.java
@@ -37,7 +37,7 @@ public class RakdosSignet extends mage.sets.dissension.RakdosSignet {
 
     public RakdosSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Rancor.java b/Mage.Sets/src/mage/sets/archenemy/Rancor.java
index 488aea3455..9d20e29901 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Rancor.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Rancor.java
@@ -37,7 +37,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Reanimate.java b/Mage.Sets/src/mage/sets/archenemy/Reanimate.java
index 8b781d922e..c280c14524 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Reanimate.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Reanimate.java
@@ -37,7 +37,7 @@ public class Reanimate extends mage.sets.tempest.Reanimate {
 
     public Reanimate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/archenemy/ReassemblingSkeleton.java
index 30caf88fa7..fac441e7c1 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ReassemblingSkeleton.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ReassemblingSkeleton.java
@@ -37,7 +37,7 @@ public class ReassemblingSkeleton extends mage.sets.magic2011.ReassemblingSkelet
 
     public ReassemblingSkeleton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/archenemy/RyuseiTheFallingStar.java
index 13897232f8..c62e2716a0 100644
--- a/Mage.Sets/src/mage/sets/archenemy/RyuseiTheFallingStar.java
+++ b/Mage.Sets/src/mage/sets/archenemy/RyuseiTheFallingStar.java
@@ -37,7 +37,7 @@ public class RyuseiTheFallingStar extends mage.sets.championsofkamigawa.RyuseiTh
 
     public RyuseiTheFallingStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/archenemy/SakuraTribeElder.java
index 8be087b96c..85edf3a1c7 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SakuraTribeElder.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SakuraTribeElder.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder extends mage.sets.championsofkamigawa.SakuraTribeE
 
     public SakuraTribeElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SanctumGargoyle.java b/Mage.Sets/src/mage/sets/archenemy/SanctumGargoyle.java
index 28d9a590d1..8f90e69b24 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SanctumGargoyle.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SanctumGargoyle.java
@@ -37,7 +37,7 @@ public class SanctumGargoyle extends mage.sets.shardsofalara.SanctumGargoyle {
 
     public SanctumGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SavageTwister.java b/Mage.Sets/src/mage/sets/archenemy/SavageTwister.java
index 1f7e958914..72c36cd47c 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SavageTwister.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SavageTwister.java
@@ -37,7 +37,7 @@ public class SavageTwister extends mage.sets.commander2013.SavageTwister {
 
     public SavageTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ScionOfDarkness.java b/Mage.Sets/src/mage/sets/archenemy/ScionOfDarkness.java
index ab965e9db4..1af3cf3982 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ScionOfDarkness.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ScionOfDarkness.java
@@ -37,7 +37,7 @@ public class ScionOfDarkness extends mage.sets.legions.ScionOfDarkness {
 
     public ScionOfDarkness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SecludedSteppe.java b/Mage.Sets/src/mage/sets/archenemy/SecludedSteppe.java
index cbbad27b3f..afeeec82a4 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SeethingSong.java b/Mage.Sets/src/mage/sets/archenemy/SeethingSong.java
index fc9c86fab7..105149907e 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SeethingSong.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SeethingSong.java
@@ -37,7 +37,7 @@ public class SeethingSong extends mage.sets.mirrodin.SeethingSong {
 
     public SeethingSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SelesnyaGuildmage.java b/Mage.Sets/src/mage/sets/archenemy/SelesnyaGuildmage.java
index 2af37412e3..5ef10e4445 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SelesnyaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SelesnyaGuildmage.java
@@ -37,7 +37,7 @@ public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
 
     public SelesnyaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ShinenOfLifesRoar.java b/Mage.Sets/src/mage/sets/archenemy/ShinenOfLifesRoar.java
index 3d04266634..eb878d6818 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ShinenOfLifesRoar.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ShinenOfLifesRoar.java
@@ -37,7 +37,7 @@ public class ShinenOfLifesRoar extends mage.sets.saviorsofkamigawa.ShinenOfLifes
 
     public ShinenOfLifesRoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Shriekmaw.java b/Mage.Sets/src/mage/sets/archenemy/Shriekmaw.java
index 053a85ef47..39b612fd52 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Shriekmaw.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Shriekmaw.java
@@ -37,7 +37,7 @@ public class Shriekmaw extends mage.sets.commander.Shriekmaw {
 
     public Shriekmaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SignInBlood.java b/Mage.Sets/src/mage/sets/archenemy/SignInBlood.java
index 8213d0d1f5..1714bfb225 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SkirkMarauder.java b/Mage.Sets/src/mage/sets/archenemy/SkirkMarauder.java
index 3d2e4a36a9..b8fc884170 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SkirkMarauder.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SkirkMarauder.java
@@ -37,7 +37,7 @@ public class SkirkMarauder extends mage.sets.legions.SkirkMarauder {
 
     public SkirkMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SorcerersStrongbox.java b/Mage.Sets/src/mage/sets/archenemy/SorcerersStrongbox.java
index 0c796b1e7e..4331f6322b 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SorcerersStrongbox.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SorcerersStrongbox.java
@@ -37,7 +37,7 @@ public class SorcerersStrongbox extends mage.sets.magic2011.SorcerersStrongbox {
 
     public SorcerersStrongbox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SpiderUmbra.java b/Mage.Sets/src/mage/sets/archenemy/SpiderUmbra.java
index ac1d88dbf9..452ed27c35 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SpiderUmbra.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SpiderUmbra.java
@@ -37,7 +37,7 @@ public class SpiderUmbra extends mage.sets.riseoftheeldrazi.SpiderUmbra {
 
     public SpiderUmbra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SunDroplet.java b/Mage.Sets/src/mage/sets/archenemy/SunDroplet.java
index 7e1c42ca9b..9b3fbd2a68 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SunDroplet.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SunDroplet.java
@@ -37,7 +37,7 @@ public class SunDroplet extends mage.sets.commander2013.SunDroplet {
 
     public SunDroplet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SunderingTitan.java b/Mage.Sets/src/mage/sets/archenemy/SunderingTitan.java
index b4191336e6..dc1aa0f686 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SunderingTitan.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SunderingTitan.java
@@ -37,7 +37,7 @@ public class SunderingTitan extends mage.sets.darksteel.SunderingTitan {
 
     public SunderingTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/SynodCenturion.java b/Mage.Sets/src/mage/sets/archenemy/SynodCenturion.java
index c1e4cf0c96..bf5af48846 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SynodCenturion.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SynodCenturion.java
@@ -37,7 +37,7 @@ public class SynodCenturion extends mage.sets.elspethvstezzeret.SynodCenturion {
 
     public SynodCenturion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/TaureanMauler.java b/Mage.Sets/src/mage/sets/archenemy/TaureanMauler.java
index a9e553fc01..7f1a50f100 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TaureanMauler.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TaureanMauler.java
@@ -37,7 +37,7 @@ public class TaureanMauler extends mage.sets.planechase.TaureanMauler {
 
     public TaureanMauler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Terminate.java b/Mage.Sets/src/mage/sets/archenemy/Terminate.java
index 21d1d5f419..27dea8e2d9 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Terminate.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Terminate.java
@@ -37,7 +37,7 @@ public class Terminate extends mage.sets.alarareborn.Terminate {
 
     public Terminate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/archenemy/TerramorphicExpanse.java
index aec3728409..96deba12c7 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/TheloniteHermit.java b/Mage.Sets/src/mage/sets/archenemy/TheloniteHermit.java
index 2cfc350e2c..d61c9e7c88 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TheloniteHermit.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TheloniteHermit.java
@@ -37,7 +37,7 @@ public class TheloniteHermit extends mage.sets.timespiral.TheloniteHermit {
 
     public TheloniteHermit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ThranDynamo.java b/Mage.Sets/src/mage/sets/archenemy/ThranDynamo.java
index cdc068096d..eac2fde808 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ThranDynamo.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ThranDynamo.java
@@ -37,7 +37,7 @@ public class ThranDynamo extends mage.sets.urzasdestiny.ThranDynamo {
 
     public ThranDynamo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Thunderstaff.java b/Mage.Sets/src/mage/sets/archenemy/Thunderstaff.java
index c2a0edcd7f..33413a9abb 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Thunderstaff.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Thunderstaff.java
@@ -37,7 +37,7 @@ public class Thunderstaff extends mage.sets.commander2013.Thunderstaff {
 
     public Thunderstaff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/TorrentOfSouls.java b/Mage.Sets/src/mage/sets/archenemy/TorrentOfSouls.java
index 0859de62bb..a39c632378 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TorrentOfSouls.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TorrentOfSouls.java
@@ -37,7 +37,7 @@ public class TorrentOfSouls extends mage.sets.shadowmoor.TorrentOfSouls {
 
     public TorrentOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/TranquilThicket.java b/Mage.Sets/src/mage/sets/archenemy/TranquilThicket.java
index ea8c7d94c8..b38352bd49 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/TwistedAbomination.java b/Mage.Sets/src/mage/sets/archenemy/TwistedAbomination.java
index 899c8229a8..c491dee7de 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TwistedAbomination.java
@@ -38,7 +38,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ARC";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/archenemy/TwoHeadedDragon.java b/Mage.Sets/src/mage/sets/archenemy/TwoHeadedDragon.java
index 8ffe5bc025..6d377cf969 100644
--- a/Mage.Sets/src/mage/sets/archenemy/TwoHeadedDragon.java
+++ b/Mage.Sets/src/mage/sets/archenemy/TwoHeadedDragon.java
@@ -37,7 +37,7 @@ public class TwoHeadedDragon extends mage.sets.mercadianmasques.TwoHeadedDragon
 
     public TwoHeadedDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/UnbenderTine.java b/Mage.Sets/src/mage/sets/archenemy/UnbenderTine.java
index 87438f76f9..16a3771804 100644
--- a/Mage.Sets/src/mage/sets/archenemy/UnbenderTine.java
+++ b/Mage.Sets/src/mage/sets/archenemy/UnbenderTine.java
@@ -37,7 +37,7 @@ public class UnbenderTine extends mage.sets.alarareborn.UnbenderTine {
 
     public UnbenderTine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Unmake.java b/Mage.Sets/src/mage/sets/archenemy/Unmake.java
index ac4b1c42c7..5581296704 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Unmake.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Unmake.java
@@ -37,7 +37,7 @@ public class Unmake extends mage.sets.eventide.Unmake {
 
     public Unmake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/UrborgSyphonMage.java b/Mage.Sets/src/mage/sets/archenemy/UrborgSyphonMage.java
index e30512e1a7..ca81a997a1 100644
--- a/Mage.Sets/src/mage/sets/archenemy/UrborgSyphonMage.java
+++ b/Mage.Sets/src/mage/sets/archenemy/UrborgSyphonMage.java
@@ -37,7 +37,7 @@ public class UrborgSyphonMage extends mage.sets.timespiral.UrborgSyphonMage {
 
     public UrborgSyphonMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/VerdelothTheAncient.java b/Mage.Sets/src/mage/sets/archenemy/VerdelothTheAncient.java
index cb495428cc..29288fc450 100644
--- a/Mage.Sets/src/mage/sets/archenemy/VerdelothTheAncient.java
+++ b/Mage.Sets/src/mage/sets/archenemy/VerdelothTheAncient.java
@@ -37,7 +37,7 @@ public class VerdelothTheAncient extends mage.sets.invasion.VerdelothTheAncient
 
     public VerdelothTheAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/sets/archenemy/VituGhaziTheCityTree.java
index a16a7de81e..44f45e66fd 100644
--- a/Mage.Sets/src/mage/sets/archenemy/VituGhaziTheCityTree.java
+++ b/Mage.Sets/src/mage/sets/archenemy/VituGhaziTheCityTree.java
@@ -37,7 +37,7 @@ public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree
 
     public VituGhaziTheCityTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/VolcanicFallout.java b/Mage.Sets/src/mage/sets/archenemy/VolcanicFallout.java
index 31dac81e3e..0afad1bf4c 100644
--- a/Mage.Sets/src/mage/sets/archenemy/VolcanicFallout.java
+++ b/Mage.Sets/src/mage/sets/archenemy/VolcanicFallout.java
@@ -37,7 +37,7 @@ public class VolcanicFallout extends mage.sets.conflux.VolcanicFallout {
 
     public VolcanicFallout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/WallOfRoots.java b/Mage.Sets/src/mage/sets/archenemy/WallOfRoots.java
index efa89ee2a2..ca32ba9dcc 100644
--- a/Mage.Sets/src/mage/sets/archenemy/WallOfRoots.java
+++ b/Mage.Sets/src/mage/sets/archenemy/WallOfRoots.java
@@ -38,7 +38,7 @@ public class WallOfRoots extends mage.sets.timeshifted.WallOfRoots {
 
     public WallOfRoots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ARC";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/archenemy/Watchwolf.java b/Mage.Sets/src/mage/sets/archenemy/Watchwolf.java
index f292cb8048..82c9903827 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Watchwolf.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Watchwolf.java
@@ -37,7 +37,7 @@ public class Watchwolf extends mage.sets.ravnica.Watchwolf {
 
     public Watchwolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/WickerboughElder.java b/Mage.Sets/src/mage/sets/archenemy/WickerboughElder.java
index 822d880a20..d3acebf841 100644
--- a/Mage.Sets/src/mage/sets/archenemy/WickerboughElder.java
+++ b/Mage.Sets/src/mage/sets/archenemy/WickerboughElder.java
@@ -37,7 +37,7 @@ public class WickerboughElder extends mage.sets.eventide.WickerboughElder {
 
     public WickerboughElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/ZombieInfestation.java b/Mage.Sets/src/mage/sets/archenemy/ZombieInfestation.java
index 7a89551a3b..b62429a0a6 100644
--- a/Mage.Sets/src/mage/sets/archenemy/ZombieInfestation.java
+++ b/Mage.Sets/src/mage/sets/archenemy/ZombieInfestation.java
@@ -37,7 +37,7 @@ public class ZombieInfestation extends mage.sets.magic2012.ZombieInfestation {
 
     public ZombieInfestation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/archenemy/Zombify.java b/Mage.Sets/src/mage/sets/archenemy/Zombify.java
index 2991d6d285..6fcee7d8b1 100644
--- a/Mage.Sets/src/mage/sets/archenemy/Zombify.java
+++ b/Mage.Sets/src/mage/sets/archenemy/Zombify.java
@@ -37,7 +37,7 @@ public class Zombify extends mage.sets.ninthedition.Zombify {
 
     public Zombify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "ARC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/ArcLightning.java b/Mage.Sets/src/mage/sets/arenaleague/ArcLightning.java
index 768fb2ae63..8cd1db7028 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/ArcLightning.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/ArcLightning.java
@@ -37,7 +37,7 @@ public class ArcLightning extends mage.sets.urzassaga.ArcLightning {
 
     public ArcLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Bonesplitter.java b/Mage.Sets/src/mage/sets/arenaleague/Bonesplitter.java
index 4ed95889fa..68bd960007 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Bonesplitter.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Bonesplitter.java
@@ -37,7 +37,7 @@ public class Bonesplitter extends mage.sets.mirrodin.Bonesplitter {
 
     public Bonesplitter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Castigate.java b/Mage.Sets/src/mage/sets/arenaleague/Castigate.java
index 5aa7c8c8af..2362dd13a4 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Castigate.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Castigate.java
@@ -37,7 +37,7 @@ public class Castigate extends mage.sets.guildpact.Castigate {
 
     public Castigate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Chill.java b/Mage.Sets/src/mage/sets/arenaleague/Chill.java
index 4d8395c0d8..0bda5eb21b 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Chill.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Chill.java
@@ -38,7 +38,7 @@ public class Chill extends mage.sets.tempest.Chill {
 
     public Chill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/CoilingOracle.java b/Mage.Sets/src/mage/sets/arenaleague/CoilingOracle.java
index 4997833315..f18715def9 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/CoilingOracle.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/CoilingOracle.java
@@ -37,7 +37,7 @@ public class CoilingOracle extends mage.sets.dissension.CoilingOracle {
 
     public CoilingOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/CreepingMold.java b/Mage.Sets/src/mage/sets/arenaleague/CreepingMold.java
index feddce59ba..fac5404e56 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/CreepingMold.java
@@ -38,7 +38,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/DarksteelIngot.java b/Mage.Sets/src/mage/sets/arenaleague/DarksteelIngot.java
index f00fa9ecce..fdb5030b97 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/DarksteelIngot.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/DarksteelIngot.java
@@ -37,7 +37,7 @@ public class DarksteelIngot extends mage.sets.darksteel.DarksteelIngot {
 
     public DarksteelIngot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/DauthiSlayer.java b/Mage.Sets/src/mage/sets/arenaleague/DauthiSlayer.java
index 1f99fed600..baa15e8708 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/DauthiSlayer.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/DauthiSlayer.java
@@ -38,7 +38,7 @@ public class DauthiSlayer extends mage.sets.tempest.DauthiSlayer {
 
     public DauthiSlayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/DiabolicEdict.java b/Mage.Sets/src/mage/sets/arenaleague/DiabolicEdict.java
index 1fcf31c859..7506f74057 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/DiabolicEdict.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/DiabolicEdict.java
@@ -37,7 +37,7 @@ public class DiabolicEdict extends mage.sets.tempest.DiabolicEdict {
 
     public DiabolicEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Disenchant.java b/Mage.Sets/src/mage/sets/arenaleague/Disenchant.java
index 43b830f5c0..1f7d212034 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Dismiss.java b/Mage.Sets/src/mage/sets/arenaleague/Dismiss.java
index 1ae351f234..cccdd772c8 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Dismiss.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Dismiss.java
@@ -38,7 +38,7 @@ public class Dismiss extends mage.sets.tempest.Dismiss {
 
     public Dismiss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Duress.java b/Mage.Sets/src/mage/sets/arenaleague/Duress.java
index dbc8931d5a..a2f15a0756 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Duress.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/ElvishAberration.java b/Mage.Sets/src/mage/sets/arenaleague/ElvishAberration.java
index 95297f9832..5d3031354d 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/ElvishAberration.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/ElvishAberration.java
@@ -38,7 +38,7 @@ public class ElvishAberration extends mage.sets.scourge.ElvishAberration {
 
     public ElvishAberration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/EmpyrialArmor.java b/Mage.Sets/src/mage/sets/arenaleague/EmpyrialArmor.java
index cef065d8cc..ab51be2c51 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/EmpyrialArmor.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/EmpyrialArmor.java
@@ -38,7 +38,7 @@ public class EmpyrialArmor extends mage.sets.vintagemasters.EmpyrialArmor {
 
     public EmpyrialArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/EnlightenedTutor.java b/Mage.Sets/src/mage/sets/arenaleague/EnlightenedTutor.java
index a3404cfc5a..2f7d96cbc7 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/EnlightenedTutor.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/EnlightenedTutor.java
@@ -38,7 +38,7 @@ public class EnlightenedTutor extends mage.sets.mirage.EnlightenedTutor {
 
     public EnlightenedTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Fireball.java b/Mage.Sets/src/mage/sets/arenaleague/Fireball.java
index 826c377304..b8aa130cc2 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Fireball.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Fling.java b/Mage.Sets/src/mage/sets/arenaleague/Fling.java
index 8822e0b6e7..ae2edc3788 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Fling.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Fling.java
@@ -37,7 +37,7 @@ public class Fling extends mage.sets.magic2011.Fling {
 
     public Fling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/GaeasBlessing.java b/Mage.Sets/src/mage/sets/arenaleague/GaeasBlessing.java
index 10b2433e49..918c8c957b 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/GaeasBlessing.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/GaeasBlessing.java
@@ -37,7 +37,7 @@ public class GaeasBlessing extends mage.sets.timeshifted.GaeasBlessing {
 
     public GaeasBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/GenjuOfTheSpires.java b/Mage.Sets/src/mage/sets/arenaleague/GenjuOfTheSpires.java
index f16b800600..1690c810b0 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/GenjuOfTheSpires.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/GenjuOfTheSpires.java
@@ -38,7 +38,7 @@ public class GenjuOfTheSpires extends mage.sets.betrayersofkamigawa.GenjuOfTheSp
 
     public GenjuOfTheSpires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/GlacialRay.java b/Mage.Sets/src/mage/sets/arenaleague/GlacialRay.java
index 64e2b5bb17..5f7b68db58 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/GlacialRay.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/GlacialRay.java
@@ -37,7 +37,7 @@ public class GlacialRay extends mage.sets.modernmasters.GlacialRay {
 
     public GlacialRay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/KarnSilverGolem.java b/Mage.Sets/src/mage/sets/arenaleague/KarnSilverGolem.java
index 206ee44fea..8e2319c12d 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/KarnSilverGolem.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/KarnSilverGolem.java
@@ -38,7 +38,7 @@ public class KarnSilverGolem extends mage.sets.urzassaga.KarnSilverGolem {
 
     public KarnSilverGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/ManOWar.java b/Mage.Sets/src/mage/sets/arenaleague/ManOWar.java
index fe6d42204f..3974b4ee78 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/ManOWar.java
@@ -37,7 +37,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/ManaLeak.java b/Mage.Sets/src/mage/sets/arenaleague/ManaLeak.java
index 2d99187537..58533955e8 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/OkinaNightwatch.java b/Mage.Sets/src/mage/sets/arenaleague/OkinaNightwatch.java
index 87864e65bc..f746a64275 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/OkinaNightwatch.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/OkinaNightwatch.java
@@ -37,7 +37,7 @@ public class OkinaNightwatch extends mage.sets.saviorsofkamigawa.OkinaNightwatch
 
     public OkinaNightwatch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Pillage.java b/Mage.Sets/src/mage/sets/arenaleague/Pillage.java
index 24f2bfeafe..583659f15b 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Pillage.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Pillage.java
@@ -38,7 +38,7 @@ public class Pillage extends mage.sets.seventhedition.Pillage {
 
     public Pillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/PouncingJaguar.java b/Mage.Sets/src/mage/sets/arenaleague/PouncingJaguar.java
index 62d9fdc46b..9932b11f5a 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/PouncingJaguar.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/PouncingJaguar.java
@@ -37,7 +37,7 @@ public class PouncingJaguar extends mage.sets.urzassaga.PouncingJaguar {
 
     public PouncingJaguar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Rewind.java b/Mage.Sets/src/mage/sets/arenaleague/Rewind.java
index 73fc669612..2f8a30f42b 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Rewind.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Rewind.java
@@ -37,7 +37,7 @@ public class Rewind extends mage.sets.urzassaga.Rewind {
 
     public Rewind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/SerumVisions.java b/Mage.Sets/src/mage/sets/arenaleague/SerumVisions.java
index 4793902833..bce14ca403 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/SerumVisions.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/SerumVisions.java
@@ -37,7 +37,7 @@ public class SerumVisions extends mage.sets.fifthdawn.SerumVisions {
 
     public SerumVisions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/SkirkMarauder.java b/Mage.Sets/src/mage/sets/arenaleague/SkirkMarauder.java
index 0cefb0e315..be9404b07e 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/SkirkMarauder.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/SkirkMarauder.java
@@ -37,7 +37,7 @@ public class SkirkMarauder extends mage.sets.legions.SkirkMarauder {
 
     public SkirkMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/SkitteringSkirge.java b/Mage.Sets/src/mage/sets/arenaleague/SkitteringSkirge.java
index f9a6b32fec..aade421c4f 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/SkitteringSkirge.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/SkitteringSkirge.java
@@ -37,7 +37,7 @@ public class SkitteringSkirge extends mage.sets.urzassaga.SkitteringSkirge {
 
     public SkitteringSkirge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/SkyknightLegionnaire.java b/Mage.Sets/src/mage/sets/arenaleague/SkyknightLegionnaire.java
index ef97bad532..2671c4265a 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/SkyknightLegionnaire.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/SkyknightLegionnaire.java
@@ -37,7 +37,7 @@ public class SkyknightLegionnaire extends mage.sets.ravnica.SkyknightLegionnaire
 
     public SkyknightLegionnaire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/Stupor.java b/Mage.Sets/src/mage/sets/arenaleague/Stupor.java
index d927b12ac9..1826e71b9d 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/Stupor.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/Stupor.java
@@ -37,7 +37,7 @@ public class Stupor extends mage.sets.timeshifted.Stupor {
 
     public Stupor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/SurgingFlame.java b/Mage.Sets/src/mage/sets/arenaleague/SurgingFlame.java
index 70d4759e51..89bb059593 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/SurgingFlame.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/SurgingFlame.java
@@ -37,7 +37,7 @@ public class SurgingFlame extends mage.sets.coldsnap.SurgingFlame {
 
     public SurgingFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/arenaleague/UktabiOrangutan.java b/Mage.Sets/src/mage/sets/arenaleague/UktabiOrangutan.java
index 30e9304d02..25ea606ad7 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/UktabiOrangutan.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/UktabiOrangutan.java
@@ -38,7 +38,7 @@ public class UktabiOrangutan extends mage.sets.visions.UktabiOrangutan {
 
     public UktabiOrangutan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ARENA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/arenaleague/WeeDragonauts.java b/Mage.Sets/src/mage/sets/arenaleague/WeeDragonauts.java
index c0051d6619..c27036a89f 100644
--- a/Mage.Sets/src/mage/sets/arenaleague/WeeDragonauts.java
+++ b/Mage.Sets/src/mage/sets/arenaleague/WeeDragonauts.java
@@ -37,7 +37,7 @@ public class WeeDragonauts extends mage.sets.guildpact.WeeDragonauts {
 
     public WeeDragonauts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "ARENA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelicWall.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelicWall.java
index 3692c7f06d..78b5e135c3 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/AngelicWall.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelicWall.java
@@ -37,7 +37,7 @@ public class AngelicWall extends mage.sets.tenthedition.AngelicWall {
 
     public AngelicWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "AVR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelsMercy.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelsMercy.java
index ad486414b6..19b7bcc55c 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/AngelsMercy.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelsMercy.java
@@ -37,7 +37,7 @@ public class AngelsMercy extends mage.sets.magic2010.AngelsMercy {
 
     public AngelsMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "AVR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BoneSplinters.java b/Mage.Sets/src/mage/sets/avacynrestored/BoneSplinters.java
index 30d0095dfa..4da8260805 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/BoneSplinters.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/BoneSplinters.java
@@ -37,7 +37,7 @@ public class BoneSplinters extends mage.sets.shardsofalara.BoneSplinters {
 
     public BoneSplinters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "AVR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BorderlandRanger.java b/Mage.Sets/src/mage/sets/avacynrestored/BorderlandRanger.java
index 9361555cd8..46d3772cdc 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/BorderlandRanger.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/BorderlandRanger.java
@@ -37,7 +37,7 @@ public class BorderlandRanger extends mage.sets.magic2010.BorderlandRanger {
 
     public BorderlandRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "AVR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Demolish.java b/Mage.Sets/src/mage/sets/avacynrestored/Demolish.java
index 749a6628ba..483a5a336a 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/Demolish.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/Demolish.java
@@ -37,7 +37,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "AVR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FleetingDistraction.java b/Mage.Sets/src/mage/sets/avacynrestored/FleetingDistraction.java
index 32fc6459f6..a7701d9ddd 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/FleetingDistraction.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/FleetingDistraction.java
@@ -37,7 +37,7 @@ public class FleetingDistraction extends mage.sets.riseoftheeldrazi.FleetingDist
 
     public FleetingDistraction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "AVR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/AltarsReap.java b/Mage.Sets/src/mage/sets/battleforzendikar/AltarsReap.java
index a368b658d6..77a5e77be9 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/AltarsReap.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/AltarsReap.java
@@ -37,7 +37,7 @@ public class AltarsReap extends mage.sets.innistrad.AltarsReap {
 
     public AltarsReap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Anticipate.java b/Mage.Sets/src/mage/sets/battleforzendikar/Anticipate.java
index 168d21bcbc..dea93ff171 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Anticipate.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Anticipate.java
@@ -37,7 +37,7 @@ public class Anticipate extends mage.sets.dragonsoftarkir.Anticipate {
 
     public Anticipate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/BoneSplinters.java b/Mage.Sets/src/mage/sets/battleforzendikar/BoneSplinters.java
index 0712b2f20e..03ac3ffa02 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/BoneSplinters.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/BoneSplinters.java
@@ -37,7 +37,7 @@ public class BoneSplinters extends mage.sets.shardsofalara.BoneSplinters {
 
     public BoneSplinters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Dispel.java b/Mage.Sets/src/mage/sets/battleforzendikar/Dispel.java
index 19a73eac4b..f477d94a5d 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Dispel.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Dispel.java
@@ -37,7 +37,7 @@ public class Dispel extends mage.sets.worldwake.Dispel {
 
     public Dispel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/DragonmasterOutcast.java b/Mage.Sets/src/mage/sets/battleforzendikar/DragonmasterOutcast.java
index 8689e99c97..b2fb0c9afc 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/DragonmasterOutcast.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/DragonmasterOutcast.java
@@ -37,7 +37,7 @@ public class DragonmasterOutcast extends mage.sets.worldwake.DragonmasterOutcast
 
     public DragonmasterOutcast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/DutifulReturn.java b/Mage.Sets/src/mage/sets/battleforzendikar/DutifulReturn.java
index b02963f253..8643b07a4e 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/DutifulReturn.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/DutifulReturn.java
@@ -37,7 +37,7 @@ public class DutifulReturn extends mage.sets.khansoftarkir.DutifulReturn {
 
     public DutifulReturn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/EvolvingWilds.java b/Mage.Sets/src/mage/sets/battleforzendikar/EvolvingWilds.java
index eb1aec5ff8..274ae35f3a 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/FelidarSovereign.java b/Mage.Sets/src/mage/sets/battleforzendikar/FelidarSovereign.java
index 4b5683b1f3..2939eab700 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/FelidarSovereign.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/FelidarSovereign.java
@@ -38,7 +38,7 @@ public class FelidarSovereign extends mage.sets.zendikar.FelidarSovereign {
 
     public FelidarSovereign(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "BFZ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/ForerunnerOfSlaughter.java b/Mage.Sets/src/mage/sets/battleforzendikar/ForerunnerOfSlaughter.java
index 45bdcdabc9..13f994447e 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/ForerunnerOfSlaughter.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/ForerunnerOfSlaughter.java
@@ -37,7 +37,7 @@ public class ForerunnerOfSlaughter extends mage.sets.zendikarvseldrazi.Forerunne
 
     public ForerunnerOfSlaughter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest1.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest1.java
index d62397e6e1..5b19a1bea1 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest1.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest1.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Forest1 extends mage.cards.basiclands.Forest {
 
     public Forest1(UUID ownerId) {
-        super(ownerId, 270);
+        super(ownerId, "270a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java
new file mode 100644
index 0000000000..23bcb9ceaf
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Forest10 extends mage.cards.basiclands.Forest {
+
+    public Forest10(UUID ownerId) {
+        super(ownerId, "274b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Forest10(final Forest10 card) {
+        super(card);
+    }
+
+    @Override
+    public Forest10 copy() {
+        return new Forest10(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest2.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest2.java
index ec7f4c906a..08a9801070 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest2.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest2.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Forest2 extends mage.cards.basiclands.Forest {
 
     public Forest2(UUID ownerId) {
-        super(ownerId, 271);
+        super(ownerId, "271a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest3.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest3.java
index 951dce0ba3..900fbdc009 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest3.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest3.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Forest3 extends mage.cards.basiclands.Forest {
 
     public Forest3(UUID ownerId) {
-        super(ownerId, 272);
+        super(ownerId, "272a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest4.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest4.java
index 647fe97350..bb00418a4c 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest4.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest4.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Forest4 extends mage.cards.basiclands.Forest {
 
     public Forest4(UUID ownerId) {
-        super(ownerId, 273);
+        super(ownerId, "273a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest5.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest5.java
index 22ed174134..6e8e4cf82d 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest5.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest5.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Forest5 extends mage.cards.basiclands.Forest {
 
     public Forest5(UUID ownerId) {
-        super(ownerId, 274);
+        super(ownerId, "274a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java
new file mode 100644
index 0000000000..071eb8bd52
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Forest6 extends mage.cards.basiclands.Forest {
+
+    public Forest6(UUID ownerId) {
+        super(ownerId, "270b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Forest6(final Forest6 card) {
+        super(card);
+    }
+
+    @Override
+    public Forest6 copy() {
+        return new Forest6(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java
new file mode 100644
index 0000000000..e29564f4de
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Forest7 extends mage.cards.basiclands.Forest {
+
+    public Forest7(UUID ownerId) {
+        super(ownerId, "271b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Forest7(final Forest7 card) {
+        super(card);
+    }
+
+    @Override
+    public Forest7 copy() {
+        return new Forest7(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java
new file mode 100644
index 0000000000..2d94070106
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Forest8 extends mage.cards.basiclands.Forest {
+
+    public Forest8(UUID ownerId) {
+        super(ownerId, "272b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Forest8(final Forest8 card) {
+        super(card);
+    }
+
+    @Override
+    public Forest8 copy() {
+        return new Forest8(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java
new file mode 100644
index 0000000000..a705c9921e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Forest9 extends mage.cards.basiclands.Forest {
+
+    public Forest9(UUID ownerId) {
+        super(ownerId, "273b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Forest9(final Forest9 card) {
+        super(card);
+    }
+
+    @Override
+    public Forest9 copy() {
+        return new Forest9(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/GiantMantis.java b/Mage.Sets/src/mage/sets/battleforzendikar/GiantMantis.java
index 64b96d7c7a..6aa47b6675 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/GiantMantis.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/GiantMantis.java
@@ -37,7 +37,7 @@ public class GiantMantis extends mage.sets.mirage.GiantMantis {
 
     public GiantMantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/battleforzendikar/GoblinWarPaint.java
index 3c8af75276..71842e31c4 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/GoblinWarPaint.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/GoblinWarPaint.java
@@ -37,7 +37,7 @@ public class GoblinWarPaint extends mage.sets.zendikar.GoblinWarPaint {
 
     public GoblinWarPaint(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/InspiredCharge.java b/Mage.Sets/src/mage/sets/battleforzendikar/InspiredCharge.java
index 3d8a831991..8b2edc81df 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/InspiredCharge.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/InspiredCharge.java
@@ -37,7 +37,7 @@ public class InspiredCharge extends mage.sets.magic2011.InspiredCharge {
 
     public InspiredCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island1.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island1.java
index d7c7643785..4d4c88238b 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Island1.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island1.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Island1 extends mage.cards.basiclands.Island {
 
     public Island1(UUID ownerId) {
-        super(ownerId, 255);
+        super(ownerId, "255a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java
new file mode 100644
index 0000000000..05f385c2b9
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Island10 extends mage.cards.basiclands.Island {
+
+    public Island10(UUID ownerId) {
+        super(ownerId, "259b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Island10(final Island10 card) {
+        super(card);
+    }
+
+    @Override
+    public Island10 copy() {
+        return new Island10(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island2.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island2.java
index 191e7a9c94..08fb3296d7 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Island2.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island2.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Island2 extends mage.cards.basiclands.Island {
 
     public Island2(UUID ownerId) {
-        super(ownerId, 256);
+        super(ownerId, "256a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island3.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island3.java
index d097e0fe23..985d82186c 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Island3.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island3.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Island3 extends mage.cards.basiclands.Island {
 
     public Island3(UUID ownerId) {
-        super(ownerId, 257);
+        super(ownerId, "257a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island4.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island4.java
index 7346a47f65..54cb5bd705 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Island4.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island4.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Island4 extends mage.cards.basiclands.Island {
 
     public Island4(UUID ownerId) {
-        super(ownerId, 258);
+        super(ownerId, "258a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island5.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island5.java
index 508d1081cc..e41860a2ee 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Island5.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island5.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Island5 extends mage.cards.basiclands.Island {
 
     public Island5(UUID ownerId) {
-        super(ownerId, 259);
+        super(ownerId, "259a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java
new file mode 100644
index 0000000000..1119555f32
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Island6 extends mage.cards.basiclands.Island {
+
+    public Island6(UUID ownerId) {
+        super(ownerId, "255b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Island6(final Island6 card) {
+        super(card);
+    }
+
+    @Override
+    public Island6 copy() {
+        return new Island6(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java
new file mode 100644
index 0000000000..7547fa7be8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Island7 extends mage.cards.basiclands.Island {
+
+    public Island7(UUID ownerId) {
+        super(ownerId, "256b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Island7(final Island7 card) {
+        super(card);
+    }
+
+    @Override
+    public Island7 copy() {
+        return new Island7(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java
new file mode 100644
index 0000000000..b8aad3f54e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Island8 extends mage.cards.basiclands.Island {
+
+    public Island8(UUID ownerId) {
+        super(ownerId, "257b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Island8(final Island8 card) {
+        super(card);
+    }
+
+    @Override
+    public Island8 copy() {
+        return new Island8(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java
new file mode 100644
index 0000000000..522a3b4e37
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Island9 extends mage.cards.basiclands.Island {
+
+    public Island9(UUID ownerId) {
+        super(ownerId, "258b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Island9(final Island9 card) {
+        super(card);
+    }
+
+    @Override
+    public Island9 copy() {
+        return new Island9(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain1.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain1.java
index 049c251e4c..f071fd06c4 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain1.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain1.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Mountain1 extends mage.cards.basiclands.Mountain {
 
     public Mountain1(UUID ownerId) {
-        super(ownerId, 265);
+        super(ownerId, "265a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java
new file mode 100644
index 0000000000..1a62598d04
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Mountain10 extends mage.cards.basiclands.Mountain {
+
+    public Mountain10(UUID ownerId) {
+        super(ownerId, "269b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Mountain10(final Mountain10 card) {
+        super(card);
+    }
+
+    @Override
+    public Mountain10 copy() {
+        return new Mountain10(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain2.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain2.java
index adb01c4671..46ecc6e7ef 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain2.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain2.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Mountain2 extends mage.cards.basiclands.Mountain {
 
     public Mountain2(UUID ownerId) {
-        super(ownerId, 266);
+        super(ownerId, "266a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain3.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain3.java
index 38e5f5c4b6..7148378dfd 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain3.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain3.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Mountain3 extends mage.cards.basiclands.Mountain {
 
     public Mountain3(UUID ownerId) {
-        super(ownerId, 267);
+        super(ownerId, "267a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain4.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain4.java
index 3d72ef0dbc..f21ace3683 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain4.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain4.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Mountain4 extends mage.cards.basiclands.Mountain {
 
     public Mountain4(UUID ownerId) {
-        super(ownerId, 268);
+        super(ownerId, "268a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain5.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain5.java
index 913411db52..50b47dd1c5 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain5.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain5.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Mountain5 extends mage.cards.basiclands.Mountain {
 
     public Mountain5(UUID ownerId) {
-        super(ownerId, 269);
+        super(ownerId, "269a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java
new file mode 100644
index 0000000000..921cbeaf36
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Mountain6 extends mage.cards.basiclands.Mountain {
+
+    public Mountain6(UUID ownerId) {
+        super(ownerId, "265b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Mountain6(final Mountain6 card) {
+        super(card);
+    }
+
+    @Override
+    public Mountain6 copy() {
+        return new Mountain6(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java
new file mode 100644
index 0000000000..1c23f5e64e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Mountain7 extends mage.cards.basiclands.Mountain {
+
+    public Mountain7(UUID ownerId) {
+        super(ownerId, "266b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Mountain7(final Mountain7 card) {
+        super(card);
+    }
+
+    @Override
+    public Mountain7 copy() {
+        return new Mountain7(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java
new file mode 100644
index 0000000000..755f49ea6c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Mountain8 extends mage.cards.basiclands.Mountain {
+
+    public Mountain8(UUID ownerId) {
+        super(ownerId, "267b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Mountain8(final Mountain8 card) {
+        super(card);
+    }
+
+    @Override
+    public Mountain8 copy() {
+        return new Mountain8(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java
new file mode 100644
index 0000000000..8713dfa46f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Mountain9 extends mage.cards.basiclands.Mountain {
+
+    public Mountain9(UUID ownerId) {
+        super(ownerId, "268b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Mountain9(final Mountain9 card) {
+        super(card);
+    }
+
+    @Override
+    public Mountain9 copy() {
+        return new Mountain9(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/PilgrimsEye.java b/Mage.Sets/src/mage/sets/battleforzendikar/PilgrimsEye.java
index 67f74e4c74..f0d1275966 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/PilgrimsEye.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/PilgrimsEye.java
@@ -38,7 +38,7 @@ public class PilgrimsEye extends mage.sets.worldwake.PilgrimsEye {
 
     public PilgrimsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "BFZ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains1.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains1.java
index 4b2a1798cf..17f7538c99 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains1.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains1.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Plains1 extends mage.cards.basiclands.Plains {
 
     public Plains1(UUID ownerId) {
-        super(ownerId, 250);
+        super(ownerId, "250a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java
new file mode 100644
index 0000000000..ac9c617c3c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Plains10 extends mage.cards.basiclands.Plains {
+
+    public Plains10(UUID ownerId) {
+        super(ownerId, "254b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Plains10(final Plains10 card) {
+        super(card);
+    }
+
+    @Override
+    public Plains10 copy() {
+        return new Plains10(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains2.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains2.java
index d278d488fb..374e09dafe 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains2.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains2.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Plains2 extends mage.cards.basiclands.Plains {
 
     public Plains2(UUID ownerId) {
-        super(ownerId, 251);
+        super(ownerId, "251a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains3.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains3.java
index 93a2b32e20..de8341b17c 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains3.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains3.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Plains3 extends mage.cards.basiclands.Plains {
 
     public Plains3(UUID ownerId) {
-        super(ownerId, 252);
+        super(ownerId, "252a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains4.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains4.java
index 7c95ef8945..4ae10df07c 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains4.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains4.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Plains4 extends mage.cards.basiclands.Plains {
 
     public Plains4(UUID ownerId) {
-        super(ownerId, 253);
+        super(ownerId, "253a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains5.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains5.java
index df7ccc8563..7f0f02f131 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains5.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains5.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Plains5 extends mage.cards.basiclands.Plains {
 
     public Plains5(UUID ownerId) {
-        super(ownerId, 254);
+        super(ownerId, "254a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java
new file mode 100644
index 0000000000..ed3ec52d2b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Plains6 extends mage.cards.basiclands.Plains {
+
+    public Plains6(UUID ownerId) {
+        super(ownerId, "250b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Plains6(final Plains6 card) {
+        super(card);
+    }
+
+    @Override
+    public Plains6 copy() {
+        return new Plains6(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java
new file mode 100644
index 0000000000..a054d77cd4
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Plains7 extends mage.cards.basiclands.Plains {
+
+    public Plains7(UUID ownerId) {
+        super(ownerId, "251b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Plains7(final Plains7 card) {
+        super(card);
+    }
+
+    @Override
+    public Plains7 copy() {
+        return new Plains7(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java
new file mode 100644
index 0000000000..6487b28714
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Plains8 extends mage.cards.basiclands.Plains {
+
+    public Plains8(UUID ownerId) {
+        super(ownerId, "252b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Plains8(final Plains8 card) {
+        super(card);
+    }
+
+    @Override
+    public Plains8 copy() {
+        return new Plains8(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java
new file mode 100644
index 0000000000..4ee6207182
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Plains9 extends mage.cards.basiclands.Plains {
+
+    public Plains9(UUID ownerId) {
+        super(ownerId, "253b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Plains9(final Plains9 card) {
+        super(card);
+    }
+
+    @Override
+    public Plains9 copy() {
+        return new Plains9(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plummet.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plummet.java
index 6c2d15a756..16409ca07d 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Plummet.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToKazandu.java b/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToKazandu.java
index 8d767821c6..6687077f40 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToKazandu.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToKazandu.java
@@ -37,7 +37,7 @@ public class RetreatToKazandu extends mage.sets.zendikarvseldrazi.RetreatToKazan
 
     public RetreatToKazandu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/RollingThunder.java b/Mage.Sets/src/mage/sets/battleforzendikar/RollingThunder.java
index 5201f9e3ce..6997f0490e 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/RollingThunder.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/RollingThunder.java
@@ -37,7 +37,7 @@ public class RollingThunder extends mage.sets.tempestremastered.RollingThunder {
 
     public RollingThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/SheerDrop.java b/Mage.Sets/src/mage/sets/battleforzendikar/SheerDrop.java
index 23eb73d84a..b69ca17c4b 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/SheerDrop.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/SheerDrop.java
@@ -37,7 +37,7 @@ public class SheerDrop extends mage.sets.zendikarvseldrazi.SheerDrop {
 
     public SheerDrop(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/battleforzendikar/SmiteTheMonstrous.java
index cfef5b1c09..c8106d8e2d 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/SmiteTheMonstrous.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/SmiteTheMonstrous.java
@@ -37,7 +37,7 @@ public class SmiteTheMonstrous extends mage.sets.innistrad.SmiteTheMonstrous {
 
     public SmiteTheMonstrous(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp1.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp1.java
index bea737b374..c891a04e3f 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp1.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp1.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Swamp1 extends mage.cards.basiclands.Swamp {
 
     public Swamp1(UUID ownerId) {
-        super(ownerId, 260);
+        super(ownerId, "260a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java
new file mode 100644
index 0000000000..60b17fd318
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Swamp10 extends mage.cards.basiclands.Swamp {
+
+    public Swamp10(UUID ownerId) {
+        super(ownerId, "264b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Swamp10(final Swamp10 card) {
+        super(card);
+    }
+
+    @Override
+    public Swamp10 copy() {
+        return new Swamp10(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp2.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp2.java
index 0436899d9c..89bf4fdb7c 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp2.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp2.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Swamp2 extends mage.cards.basiclands.Swamp {
 
     public Swamp2(UUID ownerId) {
-        super(ownerId, 261);
+        super(ownerId, "261a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp3.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp3.java
index 4bceb8a424..a27f98fbd1 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp3.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp3.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Swamp3 extends mage.cards.basiclands.Swamp {
 
     public Swamp3(UUID ownerId) {
-        super(ownerId, 262);
+        super(ownerId, "262a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp4.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp4.java
index 87bd2b49c7..459b614c13 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp4.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp4.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Swamp4 extends mage.cards.basiclands.Swamp {
 
     public Swamp4(UUID ownerId) {
-        super(ownerId, 263);
+        super(ownerId, "263a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp5.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp5.java
index b2ebc6e393..5ba5e6f23a 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp5.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp5.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 public class Swamp5 extends mage.cards.basiclands.Swamp {
 
     public Swamp5(UUID ownerId) {
-        super(ownerId, 264);
+        super(ownerId, "264a");
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java
new file mode 100644
index 0000000000..165f8ae606
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Swamp6 extends mage.cards.basiclands.Swamp {
+
+    public Swamp6(UUID ownerId) {
+        super(ownerId, "260b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Swamp6(final Swamp6 card) {
+        super(card);
+    }
+
+    @Override
+    public Swamp6 copy() {
+        return new Swamp6(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java
new file mode 100644
index 0000000000..e54203cdc3
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Swamp7 extends mage.cards.basiclands.Swamp {
+
+    public Swamp7(UUID ownerId) {
+        super(ownerId, "261b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Swamp7(final Swamp7 card) {
+        super(card);
+    }
+
+    @Override
+    public Swamp7 copy() {
+        return new Swamp7(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java
new file mode 100644
index 0000000000..0bfd1222dd
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Swamp8 extends mage.cards.basiclands.Swamp {
+
+    public Swamp8(UUID ownerId) {
+        super(ownerId, "262b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Swamp8(final Swamp8 card) {
+        super(card);
+    }
+
+    @Override
+    public Swamp8 copy() {
+        return new Swamp8(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java
new file mode 100644
index 0000000000..93d9cb9b3c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.battleforzendikar;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Swamp9 extends mage.cards.basiclands.Swamp {
+
+    public Swamp9(UUID ownerId) {
+        super(ownerId, "263b");
+        this.expansionSetCode = "BFZ";
+    }
+
+    public Swamp9(final Swamp9 card) {
+        super(card);
+    }
+
+    @Override
+    public Swamp9 copy() {
+        return new Swamp9(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/SylvanScrying.java b/Mage.Sets/src/mage/sets/battleforzendikar/SylvanScrying.java
index c583cbf1f4..33a3329788 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/SylvanScrying.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/SylvanScrying.java
@@ -37,7 +37,7 @@ public class SylvanScrying extends mage.sets.tenthedition.SylvanScrying {
 
     public SylvanScrying(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/TerritorialBaloth.java b/Mage.Sets/src/mage/sets/battleforzendikar/TerritorialBaloth.java
index bb99cc0562..6d27566afa 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/TerritorialBaloth.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/TerritorialBaloth.java
@@ -37,7 +37,7 @@ public class TerritorialBaloth extends mage.sets.zendikar.TerritorialBaloth {
 
     public TerritorialBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/VeteranWarleader.java b/Mage.Sets/src/mage/sets/battleforzendikar/VeteranWarleader.java
index e46455b609..2c04e978e9 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/VeteranWarleader.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/VeteranWarleader.java
@@ -37,7 +37,7 @@ public class VeteranWarleader extends mage.sets.zendikarvseldrazi.VeteranWarlead
 
     public VeteranWarleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "BFZ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/AbattoirGhoul.java b/Mage.Sets/src/mage/sets/blessedvscursed/AbattoirGhoul.java
index 110721e61f..f1cc8b852a 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/AbattoirGhoul.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/AbattoirGhoul.java
@@ -37,7 +37,7 @@ public class AbattoirGhoul extends mage.sets.innistrad.AbattoirGhoul {
 
     public AbattoirGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/AppetiteForBrains.java b/Mage.Sets/src/mage/sets/blessedvscursed/AppetiteForBrains.java
index 28cd0604e2..5c08bb9abb 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/AppetiteForBrains.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/AppetiteForBrains.java
@@ -37,7 +37,7 @@ public class AppetiteForBrains extends mage.sets.avacynrestored.AppetiteForBrain
 
     public AppetiteForBrains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/BarterInBlood.java b/Mage.Sets/src/mage/sets/blessedvscursed/BarterInBlood.java
index e2eb70fe51..d7a528d52d 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/BarterInBlood.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/BarterInBlood.java
@@ -37,7 +37,7 @@ public class BarterInBlood extends mage.sets.avacynrestored.BarterInBlood {
 
     public BarterInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/BondsOfFaith.java b/Mage.Sets/src/mage/sets/blessedvscursed/BondsOfFaith.java
index edd6a151f8..421b8240dc 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/BondsOfFaith.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/BondsOfFaith.java
@@ -37,7 +37,7 @@ public class BondsOfFaith extends mage.sets.innistrad.BondsOfFaith {
 
     public BondsOfFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ButcherGhoul.java b/Mage.Sets/src/mage/sets/blessedvscursed/ButcherGhoul.java
index 0cd0e53575..48914e6aed 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ButcherGhoul.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ButcherGhoul.java
@@ -37,7 +37,7 @@ public class ButcherGhoul extends mage.sets.avacynrestored.ButcherGhoul {
 
     public ButcherGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ButchersCleaver.java b/Mage.Sets/src/mage/sets/blessedvscursed/ButchersCleaver.java
index 025c09da64..eed0a71c3f 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ButchersCleaver.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ButchersCleaver.java
@@ -37,7 +37,7 @@ public class ButchersCleaver extends mage.sets.innistrad.ButchersCleaver {
 
     public ButchersCleaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/CaptainOfTheMists.java b/Mage.Sets/src/mage/sets/blessedvscursed/CaptainOfTheMists.java
index 77c36aadd4..599c66e4ed 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/CaptainOfTheMists.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/CaptainOfTheMists.java
@@ -37,7 +37,7 @@ public class CaptainOfTheMists extends mage.sets.avacynrestored.CaptainOfTheMist
 
     public CaptainOfTheMists(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/CathedralSanctifier.java b/Mage.Sets/src/mage/sets/blessedvscursed/CathedralSanctifier.java
index 42e8b42990..99495f1821 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/CathedralSanctifier.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/CathedralSanctifier.java
@@ -37,7 +37,7 @@ public class CathedralSanctifier extends mage.sets.avacynrestored.CathedralSanct
 
     public CathedralSanctifier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ChampionOfTheParish.java b/Mage.Sets/src/mage/sets/blessedvscursed/ChampionOfTheParish.java
index f6f1e7a1a4..761a1f633d 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ChampionOfTheParish.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ChampionOfTheParish.java
@@ -37,7 +37,7 @@ public class ChampionOfTheParish extends mage.sets.innistrad.ChampionOfTheParish
 
     public ChampionOfTheParish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ChapelGeist.java b/Mage.Sets/src/mage/sets/blessedvscursed/ChapelGeist.java
index dae3ed26d8..a1c0597438 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ChapelGeist.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ChapelGeist.java
@@ -37,7 +37,7 @@ public class ChapelGeist extends mage.sets.innistrad.ChapelGeist {
 
     public ChapelGeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/CobbledWings.java b/Mage.Sets/src/mage/sets/blessedvscursed/CobbledWings.java
index 478c324eb8..0ec67f5eca 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/CobbledWings.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/CobbledWings.java
@@ -37,7 +37,7 @@ public class CobbledWings extends mage.sets.innistrad.CobbledWings {
 
     public CobbledWings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/CompellingDeterrence.java b/Mage.Sets/src/mage/sets/blessedvscursed/CompellingDeterrence.java
index 065993e3e6..6393a8b129 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/CompellingDeterrence.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/CompellingDeterrence.java
@@ -37,7 +37,7 @@ public class CompellingDeterrence extends mage.sets.shadowsoverinnistrad.Compell
 
     public CompellingDeterrence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DearlyDeparted.java b/Mage.Sets/src/mage/sets/blessedvscursed/DearlyDeparted.java
index 8a87b49955..3bba9a3b9b 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DearlyDeparted.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DearlyDeparted.java
@@ -37,7 +37,7 @@ public class DearlyDeparted extends mage.sets.innistrad.DearlyDeparted {
 
     public DearlyDeparted(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafCaptain.java b/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafCaptain.java
index 52c33d58b9..34ca58c308 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafCaptain.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafCaptain.java
@@ -37,7 +37,7 @@ public class DiregrafCaptain extends mage.sets.darkascension.DiregrafCaptain {
 
     public DiregrafCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafGhoul.java b/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafGhoul.java
index 1832e3bedd..61dfcc0920 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafGhoul.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DiregrafGhoul.java
@@ -37,7 +37,7 @@ public class DiregrafGhoul extends mage.sets.innistrad.DiregrafGhoul {
 
     public DiregrafGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DismalBackwater.java b/Mage.Sets/src/mage/sets/blessedvscursed/DismalBackwater.java
index e15c16e2f6..0d2f665775 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DismalBackwater.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DismalBackwater.java
@@ -37,7 +37,7 @@ public class DismalBackwater extends mage.sets.khansoftarkir.DismalBackwater {
 
     public DismalBackwater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DoomedTraveler.java b/Mage.Sets/src/mage/sets/blessedvscursed/DoomedTraveler.java
index 3c32a593c2..4f28a15136 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DoomedTraveler.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DoomedTraveler.java
@@ -37,7 +37,7 @@ public class DoomedTraveler extends mage.sets.innistrad.DoomedTraveler {
 
     public DoomedTraveler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DreadReturn.java b/Mage.Sets/src/mage/sets/blessedvscursed/DreadReturn.java
index a9a0d5cfe1..67140e402c 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DreadReturn.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DreadReturn.java
@@ -37,7 +37,7 @@ public class DreadReturn extends mage.sets.timespiral.DreadReturn {
 
     public DreadReturn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/DriverOfTheDead.java b/Mage.Sets/src/mage/sets/blessedvscursed/DriverOfTheDead.java
index 85e9958d0e..1f0d0e75cd 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/DriverOfTheDead.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/DriverOfTheDead.java
@@ -37,7 +37,7 @@ public class DriverOfTheDead extends mage.sets.avacynrestored.DriverOfTheDead {
 
     public DriverOfTheDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ElderCathar.java b/Mage.Sets/src/mage/sets/blessedvscursed/ElderCathar.java
index 1b7551e257..d78667085f 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ElderCathar.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ElderCathar.java
@@ -37,7 +37,7 @@ public class ElderCathar extends mage.sets.innistrad.ElderCathar {
 
     public ElderCathar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/EmancipationAngel.java b/Mage.Sets/src/mage/sets/blessedvscursed/EmancipationAngel.java
index cb874ef585..bed1d1610c 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/EmancipationAngel.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/EmancipationAngel.java
@@ -37,7 +37,7 @@ public class EmancipationAngel extends mage.sets.avacynrestored.EmancipationAnge
 
     public EmancipationAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/FalkenrathNoble.java b/Mage.Sets/src/mage/sets/blessedvscursed/FalkenrathNoble.java
index 15c8495ad1..a801b9b506 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/FalkenrathNoble.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/FalkenrathNoble.java
@@ -37,7 +37,7 @@ public class FalkenrathNoble extends mage.sets.innistrad.FalkenrathNoble {
 
     public FalkenrathNoble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/FiendHunter.java b/Mage.Sets/src/mage/sets/blessedvscursed/FiendHunter.java
index 2d7e689304..c74fe1fafc 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/FiendHunter.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/FiendHunter.java
@@ -37,7 +37,7 @@ public class FiendHunter extends mage.sets.innistrad.FiendHunter {
 
     public FiendHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ForbiddenAlchemy.java b/Mage.Sets/src/mage/sets/blessedvscursed/ForbiddenAlchemy.java
index 640fc7256a..da21a326e3 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ForbiddenAlchemy.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ForbiddenAlchemy.java
@@ -37,7 +37,7 @@ public class ForbiddenAlchemy extends mage.sets.innistrad.ForbiddenAlchemy {
 
     public ForbiddenAlchemy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/GatherTheTownsfolk.java b/Mage.Sets/src/mage/sets/blessedvscursed/GatherTheTownsfolk.java
index 7119f20410..11996d4844 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/GatherTheTownsfolk.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/GatherTheTownsfolk.java
@@ -37,7 +37,7 @@ public class GatherTheTownsfolk extends mage.sets.darkascension.GatherTheTownsfo
 
     public GatherTheTownsfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/GeistOfSaintTraft.java b/Mage.Sets/src/mage/sets/blessedvscursed/GeistOfSaintTraft.java
index f2bc205e4e..879472c9dd 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/GeistOfSaintTraft.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/GeistOfSaintTraft.java
@@ -37,7 +37,7 @@ public class GeistOfSaintTraft extends mage.sets.innistrad.GeistOfSaintTraft {
 
     public GeistOfSaintTraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/Ghoulraiser.java b/Mage.Sets/src/mage/sets/blessedvscursed/Ghoulraiser.java
index 01adf8f75c..ce12e9227b 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/Ghoulraiser.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/Ghoulraiser.java
@@ -37,7 +37,7 @@ public class Ghoulraiser extends mage.sets.innistrad.Ghoulraiser {
 
     public Ghoulraiser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/GoldnightRedeemer.java b/Mage.Sets/src/mage/sets/blessedvscursed/GoldnightRedeemer.java
index 7ef83e0921..8563a4ecca 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/GoldnightRedeemer.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/GoldnightRedeemer.java
@@ -37,7 +37,7 @@ public class GoldnightRedeemer extends mage.sets.avacynrestored.GoldnightRedeeme
 
     public GoldnightRedeemer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/Gravecrawler.java b/Mage.Sets/src/mage/sets/blessedvscursed/Gravecrawler.java
index 28a9d0c32b..867f4edec1 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/Gravecrawler.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/Gravecrawler.java
@@ -37,7 +37,7 @@ public class Gravecrawler extends mage.sets.darkascension.Gravecrawler {
 
     public Gravecrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/GryffVanguard.java b/Mage.Sets/src/mage/sets/blessedvscursed/GryffVanguard.java
index 4ffa1b3e08..15ee74ebb8 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/GryffVanguard.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/GryffVanguard.java
@@ -37,7 +37,7 @@ public class GryffVanguard extends mage.sets.avacynrestored.GryffVanguard {
 
     public GryffVanguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/HarvesterOfSouls.java b/Mage.Sets/src/mage/sets/blessedvscursed/HarvesterOfSouls.java
index fb2f61f0cc..7c5fa7f4d2 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/HarvesterOfSouls.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/HarvesterOfSouls.java
@@ -37,7 +37,7 @@ public class HarvesterOfSouls extends mage.sets.avacynrestored.HarvesterOfSouls
 
     public HarvesterOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/HavengulRunebinder.java b/Mage.Sets/src/mage/sets/blessedvscursed/HavengulRunebinder.java
index 04a8b9cd86..0233478263 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/HavengulRunebinder.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/HavengulRunebinder.java
@@ -37,7 +37,7 @@ public class HavengulRunebinder extends mage.sets.darkascension.HavengulRunebind
 
     public HavengulRunebinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/HumanFrailty.java b/Mage.Sets/src/mage/sets/blessedvscursed/HumanFrailty.java
index 4b2f7eba58..87f91370ea 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/HumanFrailty.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/HumanFrailty.java
@@ -37,7 +37,7 @@ public class HumanFrailty extends mage.sets.avacynrestored.HumanFrailty {
 
     public HumanFrailty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/IncreasingDevotion.java b/Mage.Sets/src/mage/sets/blessedvscursed/IncreasingDevotion.java
index 4b6b7ef4a5..cc22771eec 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/IncreasingDevotion.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/IncreasingDevotion.java
@@ -37,7 +37,7 @@ public class IncreasingDevotion extends mage.sets.darkascension.IncreasingDevoti
 
     public IncreasingDevotion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/MakeshiftMauler.java b/Mage.Sets/src/mage/sets/blessedvscursed/MakeshiftMauler.java
index ff3efe8eb0..f5d84e7c18 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/MakeshiftMauler.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/MakeshiftMauler.java
@@ -37,7 +37,7 @@ public class MakeshiftMauler extends mage.sets.innistrad.MakeshiftMauler {
 
     public MakeshiftMauler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/MistRaven.java b/Mage.Sets/src/mage/sets/blessedvscursed/MistRaven.java
index 2246e8ba1a..2f9628d17e 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/MistRaven.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/MistRaven.java
@@ -37,7 +37,7 @@ public class MistRaven extends mage.sets.avacynrestored.MistRaven {
 
     public MistRaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/MoanOfTheUnhallowed.java b/Mage.Sets/src/mage/sets/blessedvscursed/MoanOfTheUnhallowed.java
index da51275ad3..0f068ca443 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/MoanOfTheUnhallowed.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/MoanOfTheUnhallowed.java
@@ -37,7 +37,7 @@ public class MoanOfTheUnhallowed extends mage.sets.innistrad.MoanOfTheUnhallowed
 
     public MoanOfTheUnhallowed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/MomentaryBlink.java b/Mage.Sets/src/mage/sets/blessedvscursed/MomentaryBlink.java
index 26c442b6ef..6d339c819f 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/MomentaryBlink.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/MomentaryBlink.java
@@ -37,7 +37,7 @@ public class MomentaryBlink extends mage.sets.timespiral.MomentaryBlink {
 
     public MomentaryBlink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/MoorlandInquisitor.java b/Mage.Sets/src/mage/sets/blessedvscursed/MoorlandInquisitor.java
index 1f8c605136..592538c2d2 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/MoorlandInquisitor.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/MoorlandInquisitor.java
@@ -37,7 +37,7 @@ public class MoorlandInquisitor extends mage.sets.avacynrestored.MoorlandInquisi
 
     public MoorlandInquisitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/NephaliaSmuggler.java b/Mage.Sets/src/mage/sets/blessedvscursed/NephaliaSmuggler.java
index ecad87391b..b0a5e11d78 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/NephaliaSmuggler.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/NephaliaSmuggler.java
@@ -37,7 +37,7 @@ public class NephaliaSmuggler extends mage.sets.avacynrestored.NephaliaSmuggler
 
     public NephaliaSmuggler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/PoreOverThePages.java b/Mage.Sets/src/mage/sets/blessedvscursed/PoreOverThePages.java
index 81fbad1d7f..bad18cbb5e 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/PoreOverThePages.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/PoreOverThePages.java
@@ -37,7 +37,7 @@ public class PoreOverThePages extends mage.sets.shadowsoverinnistrad.PoreOverThe
 
     public PoreOverThePages(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/Rebuke.java b/Mage.Sets/src/mage/sets/blessedvscursed/Rebuke.java
index 5aafdc78f3..26b7ad8329 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/Rebuke.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/Rebuke.java
@@ -37,7 +37,7 @@ public class Rebuke extends mage.sets.innistrad.Rebuke {
 
     public Rebuke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/RelentlessSkaabs.java b/Mage.Sets/src/mage/sets/blessedvscursed/RelentlessSkaabs.java
index 2d16fbd9df..a76475f8a9 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/RelentlessSkaabs.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/RelentlessSkaabs.java
@@ -37,7 +37,7 @@ public class RelentlessSkaabs extends mage.sets.darkascension.RelentlessSkaabs {
 
     public RelentlessSkaabs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ScrapskinDrake.java b/Mage.Sets/src/mage/sets/blessedvscursed/ScrapskinDrake.java
index 060ddea02b..2824aa88d0 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ScrapskinDrake.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ScrapskinDrake.java
@@ -37,7 +37,7 @@ public class ScrapskinDrake extends mage.sets.avacynrestored.ScrapskinDrake {
 
     public ScrapskinDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ScreechingSkaab.java b/Mage.Sets/src/mage/sets/blessedvscursed/ScreechingSkaab.java
index 2197b067fc..cb382ad04d 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ScreechingSkaab.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ScreechingSkaab.java
@@ -37,7 +37,7 @@ public class ScreechingSkaab extends mage.sets.darkascension.ScreechingSkaab {
 
     public ScreechingSkaab(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/SeraphSanctuary.java b/Mage.Sets/src/mage/sets/blessedvscursed/SeraphSanctuary.java
index 655dbf404b..0126c6ecbd 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/SeraphSanctuary.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/SeraphSanctuary.java
@@ -37,7 +37,7 @@ public class SeraphSanctuary extends mage.sets.avacynrestored.SeraphSanctuary {
 
     public SeraphSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/SeverTheBloodline.java b/Mage.Sets/src/mage/sets/blessedvscursed/SeverTheBloodline.java
index 980d806ff0..95cf4f583a 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/SeverTheBloodline.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/SeverTheBloodline.java
@@ -37,7 +37,7 @@ public class SeverTheBloodline extends mage.sets.innistrad.SeverTheBloodline {
 
     public SeverTheBloodline(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/SharpenedPitchfork.java b/Mage.Sets/src/mage/sets/blessedvscursed/SharpenedPitchfork.java
index 4914df1f30..d99a81391d 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/SharpenedPitchfork.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/SharpenedPitchfork.java
@@ -37,7 +37,7 @@ public class SharpenedPitchfork extends mage.sets.innistrad.SharpenedPitchfork {
 
     public SharpenedPitchfork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/SlayerOfTheWicked.java b/Mage.Sets/src/mage/sets/blessedvscursed/SlayerOfTheWicked.java
index 03aa8eed4b..07f5d993d0 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/SlayerOfTheWicked.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/SlayerOfTheWicked.java
@@ -37,7 +37,7 @@ public class SlayerOfTheWicked extends mage.sets.innistrad.SlayerOfTheWicked {
 
     public SlayerOfTheWicked(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/SpectralGateguards.java b/Mage.Sets/src/mage/sets/blessedvscursed/SpectralGateguards.java
index 77a574efad..9979e9755e 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/SpectralGateguards.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/SpectralGateguards.java
@@ -37,7 +37,7 @@ public class SpectralGateguards extends mage.sets.avacynrestored.SpectralGategua
 
     public SpectralGateguards(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/StitchedDrake.java b/Mage.Sets/src/mage/sets/blessedvscursed/StitchedDrake.java
index 5c45883794..35d67adc79 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/StitchedDrake.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/StitchedDrake.java
@@ -37,7 +37,7 @@ public class StitchedDrake extends mage.sets.innistrad.StitchedDrake {
 
     public StitchedDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/TandemLookout.java b/Mage.Sets/src/mage/sets/blessedvscursed/TandemLookout.java
index fb601d7988..bc217a8138 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/TandemLookout.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/TandemLookout.java
@@ -37,7 +37,7 @@ public class TandemLookout extends mage.sets.avacynrestored.TandemLookout {
 
     public TandemLookout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/ThrabenHeretic.java b/Mage.Sets/src/mage/sets/blessedvscursed/ThrabenHeretic.java
index 4f77587ca1..1d135d12db 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/ThrabenHeretic.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/ThrabenHeretic.java
@@ -37,7 +37,7 @@ public class ThrabenHeretic extends mage.sets.darkascension.ThrabenHeretic {
 
     public ThrabenHeretic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/Topplegeist.java b/Mage.Sets/src/mage/sets/blessedvscursed/Topplegeist.java
index 3984d90aa6..f6322168c4 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/Topplegeist.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/Topplegeist.java
@@ -37,7 +37,7 @@ public class Topplegeist extends mage.sets.shadowsoverinnistrad.Topplegeist {
 
     public Topplegeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/TowerGeist.java b/Mage.Sets/src/mage/sets/blessedvscursed/TowerGeist.java
index 9b8e2f9e10..1d872094b3 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/TowerGeist.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/TowerGeist.java
@@ -37,7 +37,7 @@ public class TowerGeist extends mage.sets.darkascension.TowerGeist {
 
     public TowerGeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/TranquilCove.java b/Mage.Sets/src/mage/sets/blessedvscursed/TranquilCove.java
index b5dd5267ef..a2607d79a4 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/TranquilCove.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/TranquilCove.java
@@ -37,7 +37,7 @@ public class TranquilCove extends mage.sets.khansoftarkir.TranquilCove {
 
     public TranquilCove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/TributeToHunger.java b/Mage.Sets/src/mage/sets/blessedvscursed/TributeToHunger.java
index bacc80b44b..f07bf0ab37 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/TributeToHunger.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/TributeToHunger.java
@@ -37,7 +37,7 @@ public class TributeToHunger extends mage.sets.innistrad.TributeToHunger {
 
     public TributeToHunger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/UnbreathingHorde.java b/Mage.Sets/src/mage/sets/blessedvscursed/UnbreathingHorde.java
index bbde9cd3b5..1860a3f927 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/UnbreathingHorde.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/UnbreathingHorde.java
@@ -37,7 +37,7 @@ public class UnbreathingHorde extends mage.sets.innistrad.UnbreathingHorde {
 
     public UnbreathingHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/VictimOfNight.java b/Mage.Sets/src/mage/sets/blessedvscursed/VictimOfNight.java
index e4e2ee2e11..c95a83cd63 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/VictimOfNight.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/VictimOfNight.java
@@ -37,7 +37,7 @@ public class VictimOfNight extends mage.sets.innistrad.VictimOfNight {
 
     public VictimOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/VillageBellRinger.java b/Mage.Sets/src/mage/sets/blessedvscursed/VillageBellRinger.java
index 7f31087457..1b62e7e61e 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/VillageBellRinger.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/VillageBellRinger.java
@@ -37,7 +37,7 @@ public class VillageBellRinger extends mage.sets.innistrad.VillageBellRinger {
 
     public VillageBellRinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/blessedvscursed/VoiceOfTheProvinces.java b/Mage.Sets/src/mage/sets/blessedvscursed/VoiceOfTheProvinces.java
index f7f36a82f9..28b5179c3f 100644
--- a/Mage.Sets/src/mage/sets/blessedvscursed/VoiceOfTheProvinces.java
+++ b/Mage.Sets/src/mage/sets/blessedvscursed/VoiceOfTheProvinces.java
@@ -37,7 +37,7 @@ public class VoiceOfTheProvinces extends mage.sets.avacynrestored.VoiceOfTheProv
 
     public VoiceOfTheProvinces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Divination.java b/Mage.Sets/src/mage/sets/bornofthegods/Divination.java
index b7f7799baf..7573f0ba88 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/Divination.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/Divination.java
@@ -37,7 +37,7 @@ public class Divination extends mage.sets.magic2012.Divination {
 
     public Divination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "BNG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EternitySnare.java b/Mage.Sets/src/mage/sets/bornofthegods/EternitySnare.java
index 45c4a1caaf..a0e1fb4b21 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/EternitySnare.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/EternitySnare.java
@@ -38,7 +38,7 @@ public class EternitySnare extends mage.sets.timespiral.EternitySnare {
 
     public EternitySnare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "BNG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Necrobite.java b/Mage.Sets/src/mage/sets/bornofthegods/Necrobite.java
index 3440762de8..063b246547 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/Necrobite.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/Necrobite.java
@@ -37,7 +37,7 @@ public class Necrobite extends mage.sets.avacynrestored.Necrobite {
 
     public Necrobite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "BNG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/RevokeExistence.java b/Mage.Sets/src/mage/sets/bornofthegods/RevokeExistence.java
index 617c3db1ff..2bbce86ac1 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/RevokeExistence.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/RevokeExistence.java
@@ -37,7 +37,7 @@ public class RevokeExistence extends mage.sets.scarsofmirrodin.RevokeExistence {
 
     public RevokeExistence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "BNG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpringleafDrum.java b/Mage.Sets/src/mage/sets/bornofthegods/SpringleafDrum.java
index c7efec2839..29c791e1be 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SpringleafDrum.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SpringleafDrum.java
@@ -38,7 +38,7 @@ public class SpringleafDrum extends mage.sets.lorwyn.SpringleafDrum {
 
     public SpringleafDrum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "BNG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki1.java
similarity index 93%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki1.java
index fb9ee621cf..67ead7c188 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki1.java
@@ -54,7 +54,7 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class BrothersYamazaki extends CardImpl {
+public class BrothersYamazaki1 extends CardImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
@@ -62,8 +62,8 @@ public class BrothersYamazaki extends CardImpl {
         filter.add(new NamePredicate("Brothers Yamazaki"));
     }
 
-    public BrothersYamazaki(UUID ownerId) {
-        super(ownerId, 160, "Brothers Yamazaki", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
+    public BrothersYamazaki1(UUID ownerId) {
+        super(ownerId, "160a", "Brothers Yamazaki", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
         this.subtype.add("Human");
@@ -87,13 +87,13 @@ public class BrothersYamazaki extends CardImpl {
         this.addAbility(ability);
     }
 
-    public BrothersYamazaki(final BrothersYamazaki card) {
+    public BrothersYamazaki1(final BrothersYamazaki1 card) {
         super(card);
     }
 
     @Override
-    public BrothersYamazaki copy() {
-        return new BrothersYamazaki(this);
+    public BrothersYamazaki1 copy() {
+        return new BrothersYamazaki1(this);
     }
 }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki2.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki2.java
new file mode 100644
index 0000000000..a6101117bb
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BrothersYamazaki2.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.championsofkamigawa;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class BrothersYamazaki2 extends BrothersYamazaki1 {
+
+    public BrothersYamazaki2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = "160b";
+    }
+
+    public BrothersYamazaki2(final BrothersYamazaki2 card) {
+        super(card);
+    }
+
+    @Override
+    public BrothersYamazaki2 copy() {
+        return new BrothersYamazaki2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DampenThought.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DampenThought.java
index ba90507acd..8c7b98829b 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/DampenThought.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DampenThought.java
@@ -38,7 +38,7 @@ public class DampenThought extends mage.sets.modernmasters.DampenThought {
 
     public DampenThought(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "CHK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DesperateRitual.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DesperateRitual.java
index 0e50a1281c..214e914f8c 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/DesperateRitual.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DesperateRitual.java
@@ -38,7 +38,7 @@ public class DesperateRitual extends mage.sets.modernmasters.DesperateRitual {
 
     public DesperateRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "CHK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Distress.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Distress.java
index 457303becc..70ad3c428d 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/Distress.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Distress.java
@@ -37,7 +37,7 @@ public class Distress extends mage.sets.tenthedition.Distress {
 
     public Distress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "CHK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GlacialRay.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GlacialRay.java
index 88c74a5523..5ca95b75fe 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/GlacialRay.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GlacialRay.java
@@ -37,7 +37,7 @@ public class GlacialRay extends mage.sets.modernmasters.GlacialRay {
 
     public GlacialRay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "CHK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasReach.java
index 2f7b5da82a..ca28dc1a7a 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasReach.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasReach.java
@@ -37,7 +37,7 @@ public class KodamasReach extends mage.sets.commander.KodamasReach {
 
     public KodamasReach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "CHK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java
index 9e609dfa67..a853727529 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java
@@ -38,7 +38,7 @@ public class PetalsOfInsight extends mage.sets.modernmasters.PetalsOfInsight {
 
     public PetalsOfInsight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "CHK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Soulblast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Soulblast.java
index eec230ecaa..2e3ca9a9f0 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/Soulblast.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Soulblast.java
@@ -37,7 +37,7 @@ public class Soulblast extends mage.sets.tenthedition.Soulblast {
 
     public Soulblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "CHK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StoneRain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StoneRain.java
index b66cbb7e9d..344cf0def2 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "CHK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java
index 48a2102d02..1f6939080c 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java
@@ -37,7 +37,7 @@ public class TimeStop extends mage.sets.tenthedition.TimeStop {
 
     public TimeStop(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "CHK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/champs/BloodKnight.java b/Mage.Sets/src/mage/sets/champs/BloodKnight.java
index 909516dffb..8a78059997 100644
--- a/Mage.Sets/src/mage/sets/champs/BloodKnight.java
+++ b/Mage.Sets/src/mage/sets/champs/BloodKnight.java
@@ -38,7 +38,7 @@ public class BloodKnight extends mage.sets.planarchaos.BloodKnight {
 
     public BloodKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/BramblewoodParagon.java b/Mage.Sets/src/mage/sets/champs/BramblewoodParagon.java
index a5a125c1ff..e28ccbf11a 100644
--- a/Mage.Sets/src/mage/sets/champs/BramblewoodParagon.java
+++ b/Mage.Sets/src/mage/sets/champs/BramblewoodParagon.java
@@ -38,7 +38,7 @@ public class BramblewoodParagon extends mage.sets.morningtide.BramblewoodParagon
 
     public BramblewoodParagon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/DoranTheSiegeTower.java b/Mage.Sets/src/mage/sets/champs/DoranTheSiegeTower.java
index 067a5a0908..6dc3542073 100644
--- a/Mage.Sets/src/mage/sets/champs/DoranTheSiegeTower.java
+++ b/Mage.Sets/src/mage/sets/champs/DoranTheSiegeTower.java
@@ -38,7 +38,7 @@ public class DoranTheSiegeTower extends mage.sets.lorwyn.DoranTheSiegeTower {
 
     public DoranTheSiegeTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/Electrolyze.java b/Mage.Sets/src/mage/sets/champs/Electrolyze.java
index 1605d10725..4cd95c4310 100644
--- a/Mage.Sets/src/mage/sets/champs/Electrolyze.java
+++ b/Mage.Sets/src/mage/sets/champs/Electrolyze.java
@@ -38,7 +38,7 @@ public class Electrolyze extends mage.sets.guildpact.Electrolyze {
 
     public Electrolyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/Groundbreaker.java b/Mage.Sets/src/mage/sets/champs/Groundbreaker.java
index 4959f52104..3fafa56888 100644
--- a/Mage.Sets/src/mage/sets/champs/Groundbreaker.java
+++ b/Mage.Sets/src/mage/sets/champs/Groundbreaker.java
@@ -38,7 +38,7 @@ public class Groundbreaker extends mage.sets.planarchaos.Groundbreaker {
 
     public Groundbreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/champs/ImperiousPerfect.java
index a1a465c2d8..0eeb149f47 100644
--- a/Mage.Sets/src/mage/sets/champs/ImperiousPerfect.java
+++ b/Mage.Sets/src/mage/sets/champs/ImperiousPerfect.java
@@ -38,7 +38,7 @@ public class ImperiousPerfect extends mage.sets.lorwyn.ImperiousPerfect {
 
     public ImperiousPerfect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/Mutavault.java b/Mage.Sets/src/mage/sets/champs/Mutavault.java
index bac75c2f32..2691c2521a 100644
--- a/Mage.Sets/src/mage/sets/champs/Mutavault.java
+++ b/Mage.Sets/src/mage/sets/champs/Mutavault.java
@@ -38,7 +38,7 @@ public class Mutavault extends mage.sets.morningtide.Mutavault {
 
     public Mutavault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/champs/NivMizzetTheFiremind.java
index 922c4da067..add661b1d7 100644
--- a/Mage.Sets/src/mage/sets/champs/NivMizzetTheFiremind.java
+++ b/Mage.Sets/src/mage/sets/champs/NivMizzetTheFiremind.java
@@ -38,7 +38,7 @@ public class NivMizzetTheFiremind extends mage.sets.guildpact.NivMizzetTheFiremi
 
     public NivMizzetTheFiremind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/RakdosGuildmage.java b/Mage.Sets/src/mage/sets/champs/RakdosGuildmage.java
index 548df18fef..f837b80ba5 100644
--- a/Mage.Sets/src/mage/sets/champs/RakdosGuildmage.java
+++ b/Mage.Sets/src/mage/sets/champs/RakdosGuildmage.java
@@ -38,7 +38,7 @@ public class RakdosGuildmage extends mage.sets.dissension.RakdosGuildmage {
 
     public RakdosGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/SerraAvenger.java b/Mage.Sets/src/mage/sets/champs/SerraAvenger.java
index e7cd605e2e..1c046d3240 100644
--- a/Mage.Sets/src/mage/sets/champs/SerraAvenger.java
+++ b/Mage.Sets/src/mage/sets/champs/SerraAvenger.java
@@ -38,7 +38,7 @@ public class SerraAvenger extends mage.sets.timespiral.SerraAvenger {
 
     public SerraAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/UrzasFactory.java b/Mage.Sets/src/mage/sets/champs/UrzasFactory.java
index 25ac014e1f..b8f980ec53 100644
--- a/Mage.Sets/src/mage/sets/champs/UrzasFactory.java
+++ b/Mage.Sets/src/mage/sets/champs/UrzasFactory.java
@@ -38,7 +38,7 @@ public class UrzasFactory extends mage.sets.timespiral.UrzasFactory {
 
     public UrzasFactory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/champs/Voidslime.java b/Mage.Sets/src/mage/sets/champs/Voidslime.java
index 951b2ababa..aeebb85558 100644
--- a/Mage.Sets/src/mage/sets/champs/Voidslime.java
+++ b/Mage.Sets/src/mage/sets/champs/Voidslime.java
@@ -38,7 +38,7 @@ public class Voidslime extends mage.sets.dissension.Voidslime {
 
     public Voidslime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "CP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/AbuJafar.java b/Mage.Sets/src/mage/sets/chronicles/AbuJafar.java
index fa1f4e939f..34ecc20c5d 100644
--- a/Mage.Sets/src/mage/sets/chronicles/AbuJafar.java
+++ b/Mage.Sets/src/mage/sets/chronicles/AbuJafar.java
@@ -37,7 +37,7 @@ public class AbuJafar extends mage.sets.arabiannights.AbuJafar {
 
     public AbuJafar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ActiveVolcano.java b/Mage.Sets/src/mage/sets/chronicles/ActiveVolcano.java
index 4abb88e704..46e80fa14d 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ActiveVolcano.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ActiveVolcano.java
@@ -37,7 +37,7 @@ public class ActiveVolcano extends mage.sets.legends.ActiveVolcano {
 
     public ActiveVolcano(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/AkronLegionnaire.java b/Mage.Sets/src/mage/sets/chronicles/AkronLegionnaire.java
index fe4b166272..a583956666 100644
--- a/Mage.Sets/src/mage/sets/chronicles/AkronLegionnaire.java
+++ b/Mage.Sets/src/mage/sets/chronicles/AkronLegionnaire.java
@@ -37,7 +37,7 @@ public class AkronLegionnaire extends mage.sets.legends.AkronLegionnaire {
 
     public AkronLegionnaire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Aladdin.java b/Mage.Sets/src/mage/sets/chronicles/Aladdin.java
index b10814adaa..1763a8cc37 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Aladdin.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Aladdin.java
@@ -38,7 +38,7 @@ public class Aladdin extends mage.sets.masterseditioniv.Aladdin {
 
     public Aladdin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.RARE; // U1
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/ArcadesSabboth.java b/Mage.Sets/src/mage/sets/chronicles/ArcadesSabboth.java
index e59355698a..ea57e9be13 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ArcadesSabboth.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ArcadesSabboth.java
@@ -37,7 +37,7 @@ public class ArcadesSabboth extends mage.sets.masterseditioniii.ArcadesSabboth {
 
     public ArcadesSabboth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ArenaOfTheAncients.java b/Mage.Sets/src/mage/sets/chronicles/ArenaOfTheAncients.java
index 1fdf4bd91a..f83ea1c269 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ArenaOfTheAncients.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ArenaOfTheAncients.java
@@ -37,7 +37,7 @@ public class ArenaOfTheAncients extends mage.sets.legends.ArenaOfTheAncients {
 
     public ArenaOfTheAncients(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ArgothianPixies.java b/Mage.Sets/src/mage/sets/chronicles/ArgothianPixies.java
index b256a1d5fe..57dc0719c9 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ArgothianPixies.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ArgothianPixies.java
@@ -37,7 +37,7 @@ public class ArgothianPixies extends mage.sets.antiquities.ArgothianPixies {
 
     public ArgothianPixies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/AshnodsAltar.java b/Mage.Sets/src/mage/sets/chronicles/AshnodsAltar.java
index 8f33ba8a6c..64d323c02c 100644
--- a/Mage.Sets/src/mage/sets/chronicles/AshnodsAltar.java
+++ b/Mage.Sets/src/mage/sets/chronicles/AshnodsAltar.java
@@ -38,7 +38,7 @@ public class AshnodsAltar extends mage.sets.fifthedition.AshnodsAltar {
 
     public AshnodsAltar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/AshnodsTransmogrant.java b/Mage.Sets/src/mage/sets/chronicles/AshnodsTransmogrant.java
index fa98e4d320..26d4c6e86e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/AshnodsTransmogrant.java
+++ b/Mage.Sets/src/mage/sets/chronicles/AshnodsTransmogrant.java
@@ -37,7 +37,7 @@ public class AshnodsTransmogrant extends mage.sets.fifthedition.AshnodsTransmogr
 
     public AshnodsTransmogrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/AzureDrake.java b/Mage.Sets/src/mage/sets/chronicles/AzureDrake.java
index eeabe4b911..4e015ef0cc 100644
--- a/Mage.Sets/src/mage/sets/chronicles/AzureDrake.java
+++ b/Mage.Sets/src/mage/sets/chronicles/AzureDrake.java
@@ -38,7 +38,7 @@ public class AzureDrake extends mage.sets.magic2011.AzureDrake {
 
     public AzureDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/BarlsCage.java b/Mage.Sets/src/mage/sets/chronicles/BarlsCage.java
index 9c52938433..bdb364e95a 100644
--- a/Mage.Sets/src/mage/sets/chronicles/BarlsCage.java
+++ b/Mage.Sets/src/mage/sets/chronicles/BarlsCage.java
@@ -37,7 +37,7 @@ public class BarlsCage extends mage.sets.thedark.BarlsCage {
 
     public BarlsCage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/BloodMoon.java b/Mage.Sets/src/mage/sets/chronicles/BloodMoon.java
index 99e71d0670..6e59d11d29 100644
--- a/Mage.Sets/src/mage/sets/chronicles/BloodMoon.java
+++ b/Mage.Sets/src/mage/sets/chronicles/BloodMoon.java
@@ -37,7 +37,7 @@ public class BloodMoon extends mage.sets.ninthedition.BloodMoon {
 
     public BloodMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/BogRats.java b/Mage.Sets/src/mage/sets/chronicles/BogRats.java
index 16ae5736cd..eb8246ee87 100644
--- a/Mage.Sets/src/mage/sets/chronicles/BogRats.java
+++ b/Mage.Sets/src/mage/sets/chronicles/BogRats.java
@@ -37,7 +37,7 @@ public class BogRats extends mage.sets.thedark.BogRats {
 
     public BogRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/BookOfRass.java b/Mage.Sets/src/mage/sets/chronicles/BookOfRass.java
index 30538575b7..6b9b054e57 100644
--- a/Mage.Sets/src/mage/sets/chronicles/BookOfRass.java
+++ b/Mage.Sets/src/mage/sets/chronicles/BookOfRass.java
@@ -38,7 +38,7 @@ public class BookOfRass extends mage.sets.thedark.BookOfRass {
 
     public BookOfRass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/Boomerang.java b/Mage.Sets/src/mage/sets/chronicles/Boomerang.java
index bb7b8aa8fc..4339ab620b 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/CatWarriors.java b/Mage.Sets/src/mage/sets/chronicles/CatWarriors.java
index 9662005692..2bcfb47f83 100644
--- a/Mage.Sets/src/mage/sets/chronicles/CatWarriors.java
+++ b/Mage.Sets/src/mage/sets/chronicles/CatWarriors.java
@@ -37,7 +37,7 @@ public class CatWarriors extends mage.sets.fifthedition.CatWarriors {
 
     public CatWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Chromium.java b/Mage.Sets/src/mage/sets/chronicles/Chromium.java
index 55e5249dc8..09fbbcbd5f 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Chromium.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Chromium.java
@@ -37,7 +37,7 @@ public class Chromium extends mage.sets.masterseditioniii.Chromium {
 
     public Chromium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/CityOfBrass.java b/Mage.Sets/src/mage/sets/chronicles/CityOfBrass.java
index 44c3d5a48d..23b570a74e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/chronicles/CityOfBrass.java
@@ -37,7 +37,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ConcordantCrossroads.java b/Mage.Sets/src/mage/sets/chronicles/ConcordantCrossroads.java
index add8e8264d..f0e7223029 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ConcordantCrossroads.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ConcordantCrossroads.java
@@ -37,7 +37,7 @@ public class ConcordantCrossroads extends mage.sets.masterseditioniii.Concordant
 
     public ConcordantCrossroads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/CrawGiant.java b/Mage.Sets/src/mage/sets/chronicles/CrawGiant.java
index b038730810..21696a4dda 100644
--- a/Mage.Sets/src/mage/sets/chronicles/CrawGiant.java
+++ b/Mage.Sets/src/mage/sets/chronicles/CrawGiant.java
@@ -37,7 +37,7 @@ public class CrawGiant extends mage.sets.legends.CrawGiant {
 
     public CrawGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/CuombajjWitches.java b/Mage.Sets/src/mage/sets/chronicles/CuombajjWitches.java
index 7381e9d0cb..73b431b1a7 100644
--- a/Mage.Sets/src/mage/sets/chronicles/CuombajjWitches.java
+++ b/Mage.Sets/src/mage/sets/chronicles/CuombajjWitches.java
@@ -37,7 +37,7 @@ public class CuombajjWitches extends mage.sets.mastersedition.CuombajjWitches {
 
     public CuombajjWitches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Cyclone.java b/Mage.Sets/src/mage/sets/chronicles/Cyclone.java
index d4d88791f3..c477fabc26 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Cyclone.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Cyclone.java
@@ -37,7 +37,7 @@ public class Cyclone extends mage.sets.masterseditioniv.Cyclone {
 
     public Cyclone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/DAvenantArcher.java b/Mage.Sets/src/mage/sets/chronicles/DAvenantArcher.java
index 310edb2307..d208e9b3e5 100644
--- a/Mage.Sets/src/mage/sets/chronicles/DAvenantArcher.java
+++ b/Mage.Sets/src/mage/sets/chronicles/DAvenantArcher.java
@@ -37,7 +37,7 @@ public class DAvenantArcher extends mage.sets.fifthedition.DAvenantArcher {
 
     public DAvenantArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/DakkonBlackblade.java b/Mage.Sets/src/mage/sets/chronicles/DakkonBlackblade.java
index 00ada61507..200008a8b1 100644
--- a/Mage.Sets/src/mage/sets/chronicles/DakkonBlackblade.java
+++ b/Mage.Sets/src/mage/sets/chronicles/DakkonBlackblade.java
@@ -37,7 +37,7 @@ public class DakkonBlackblade extends mage.sets.legends.DakkonBlackblade {
 
     public DakkonBlackblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/DanceOfMany.java b/Mage.Sets/src/mage/sets/chronicles/DanceOfMany.java
index 5a872a2df3..f2aed9920f 100644
--- a/Mage.Sets/src/mage/sets/chronicles/DanceOfMany.java
+++ b/Mage.Sets/src/mage/sets/chronicles/DanceOfMany.java
@@ -37,7 +37,7 @@ public class DanceOfMany extends mage.sets.thedark.DanceOfMany {
 
     public DanceOfMany(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Dandan.java b/Mage.Sets/src/mage/sets/chronicles/Dandan.java
index 611c7439e3..cd973743d1 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Dandan.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Dandan.java
@@ -37,7 +37,7 @@ public class Dandan extends mage.sets.fifthedition.Dandan {
 
     public Dandan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/DivineOffering.java b/Mage.Sets/src/mage/sets/chronicles/DivineOffering.java
index 9bc27c7463..c995408a1a 100644
--- a/Mage.Sets/src/mage/sets/chronicles/DivineOffering.java
+++ b/Mage.Sets/src/mage/sets/chronicles/DivineOffering.java
@@ -37,7 +37,7 @@ public class DivineOffering extends mage.sets.mirrodinbesieged.DivineOffering {
 
     public DivineOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ErhnamDjinn.java b/Mage.Sets/src/mage/sets/chronicles/ErhnamDjinn.java
index 2f6aebc7b1..2b8683eb70 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ErhnamDjinn.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ErhnamDjinn.java
@@ -38,7 +38,7 @@ public class ErhnamDjinn extends mage.sets.judgment.ErhnamDjinn {
 
     public ErhnamDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/FallenAngel.java b/Mage.Sets/src/mage/sets/chronicles/FallenAngel.java
index c14035b11b..5b4252eab1 100644
--- a/Mage.Sets/src/mage/sets/chronicles/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/chronicles/FallenAngel.java
@@ -38,7 +38,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/FeldonsCane.java b/Mage.Sets/src/mage/sets/chronicles/FeldonsCane.java
index e0aecafa92..6898d255f5 100644
--- a/Mage.Sets/src/mage/sets/chronicles/FeldonsCane.java
+++ b/Mage.Sets/src/mage/sets/chronicles/FeldonsCane.java
@@ -38,7 +38,7 @@ public class FeldonsCane extends mage.sets.timeshifted.FeldonsCane {
 
     public FeldonsCane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/FireDrake.java b/Mage.Sets/src/mage/sets/chronicles/FireDrake.java
index 94b021618b..49a9e90fe8 100644
--- a/Mage.Sets/src/mage/sets/chronicles/FireDrake.java
+++ b/Mage.Sets/src/mage/sets/chronicles/FireDrake.java
@@ -37,7 +37,7 @@ public class FireDrake extends mage.sets.fifthedition.FireDrake {
 
     public FireDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/FlashFlood.java b/Mage.Sets/src/mage/sets/chronicles/FlashFlood.java
index 2031114bf8..052d3e207e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/FlashFlood.java
+++ b/Mage.Sets/src/mage/sets/chronicles/FlashFlood.java
@@ -37,7 +37,7 @@ public class FlashFlood extends mage.sets.legends.FlashFlood {
 
     public FlashFlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/FountainOfYouth.java b/Mage.Sets/src/mage/sets/chronicles/FountainOfYouth.java
index e511b04673..873cf650d3 100644
--- a/Mage.Sets/src/mage/sets/chronicles/FountainOfYouth.java
+++ b/Mage.Sets/src/mage/sets/chronicles/FountainOfYouth.java
@@ -38,7 +38,7 @@ public class FountainOfYouth extends mage.sets.tenthedition.FountainOfYouth {
 
     public FountainOfYouth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/GhazbanOgre.java b/Mage.Sets/src/mage/sets/chronicles/GhazbanOgre.java
index 62887e6957..0eaa97a006 100644
--- a/Mage.Sets/src/mage/sets/chronicles/GhazbanOgre.java
+++ b/Mage.Sets/src/mage/sets/chronicles/GhazbanOgre.java
@@ -37,7 +37,7 @@ public class GhazbanOgre extends mage.sets.fifthedition.GhazbanOgre {
 
     public GhazbanOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/chronicles/GoblinDiggingTeam.java
index fc559f9347..e4335b82e2 100644
--- a/Mage.Sets/src/mage/sets/chronicles/GoblinDiggingTeam.java
+++ b/Mage.Sets/src/mage/sets/chronicles/GoblinDiggingTeam.java
@@ -37,7 +37,7 @@ public class GoblinDiggingTeam extends mage.sets.thedark.GoblinDiggingTeam {
 
     public GoblinDiggingTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/GoblinsOfTheFlarg.java b/Mage.Sets/src/mage/sets/chronicles/GoblinsOfTheFlarg.java
index 10a5c94fd9..9464b47d78 100644
--- a/Mage.Sets/src/mage/sets/chronicles/GoblinsOfTheFlarg.java
+++ b/Mage.Sets/src/mage/sets/chronicles/GoblinsOfTheFlarg.java
@@ -37,7 +37,7 @@ public class GoblinsOfTheFlarg extends mage.sets.thedark.GoblinsOfTheFlarg {
 
     public GoblinsOfTheFlarg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/HasranOgress.java b/Mage.Sets/src/mage/sets/chronicles/HasranOgress.java
index 299aebca5f..b6a5978901 100644
--- a/Mage.Sets/src/mage/sets/chronicles/HasranOgress.java
+++ b/Mage.Sets/src/mage/sets/chronicles/HasranOgress.java
@@ -37,7 +37,7 @@ public class HasranOgress extends mage.sets.masterseditioniv.HasranOgress {
 
     public HasranOgress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/HellsCaretaker.java b/Mage.Sets/src/mage/sets/chronicles/HellsCaretaker.java
index b6c8642258..aaa9d099db 100644
--- a/Mage.Sets/src/mage/sets/chronicles/HellsCaretaker.java
+++ b/Mage.Sets/src/mage/sets/chronicles/HellsCaretaker.java
@@ -37,7 +37,7 @@ public class HellsCaretaker extends mage.sets.ninthedition.HellsCaretaker {
 
     public HellsCaretaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/HornOfDeafening.java b/Mage.Sets/src/mage/sets/chronicles/HornOfDeafening.java
index 0abee57407..3c788890e5 100644
--- a/Mage.Sets/src/mage/sets/chronicles/HornOfDeafening.java
+++ b/Mage.Sets/src/mage/sets/chronicles/HornOfDeafening.java
@@ -37,7 +37,7 @@ public class HornOfDeafening extends mage.sets.legends.HornOfDeafening {
 
     public HornOfDeafening(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/IvoryGuardians.java b/Mage.Sets/src/mage/sets/chronicles/IvoryGuardians.java
index 6e5196eccd..d9fd30d2c6 100644
--- a/Mage.Sets/src/mage/sets/chronicles/IvoryGuardians.java
+++ b/Mage.Sets/src/mage/sets/chronicles/IvoryGuardians.java
@@ -37,7 +37,7 @@ public class IvoryGuardians extends mage.sets.legends.IvoryGuardians {
 
     public IvoryGuardians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/JalumTome.java b/Mage.Sets/src/mage/sets/chronicles/JalumTome.java
index 1db8e0b93f..51f80fcbbb 100644
--- a/Mage.Sets/src/mage/sets/chronicles/JalumTome.java
+++ b/Mage.Sets/src/mage/sets/chronicles/JalumTome.java
@@ -37,7 +37,7 @@ public class JalumTome extends mage.sets.seventhedition.JalumTome {
 
     public JalumTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Juxtapose.java b/Mage.Sets/src/mage/sets/chronicles/Juxtapose.java
index 26d5dc80f1..58f0952fde 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Juxtapose.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Juxtapose.java
@@ -37,7 +37,7 @@ public class Juxtapose extends mage.sets.fifthedition.Juxtapose {
 
     public Juxtapose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/KeepersOfTheFaith.java b/Mage.Sets/src/mage/sets/chronicles/KeepersOfTheFaith.java
index 35c790d840..1f5601a418 100644
--- a/Mage.Sets/src/mage/sets/chronicles/KeepersOfTheFaith.java
+++ b/Mage.Sets/src/mage/sets/chronicles/KeepersOfTheFaith.java
@@ -37,7 +37,7 @@ public class KeepersOfTheFaith extends mage.sets.legends.KeepersOfTheFaith {
 
     public KeepersOfTheFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/KeiTakahashi.java b/Mage.Sets/src/mage/sets/chronicles/KeiTakahashi.java
index 3bee6c1015..9c1338a64a 100644
--- a/Mage.Sets/src/mage/sets/chronicles/KeiTakahashi.java
+++ b/Mage.Sets/src/mage/sets/chronicles/KeiTakahashi.java
@@ -37,7 +37,7 @@ public class KeiTakahashi extends mage.sets.masterseditioniii.KeiTakahashi {
 
     public KeiTakahashi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/MarhaultElsdragon.java b/Mage.Sets/src/mage/sets/chronicles/MarhaultElsdragon.java
index 4e1a1836f7..c381a65e95 100644
--- a/Mage.Sets/src/mage/sets/chronicles/MarhaultElsdragon.java
+++ b/Mage.Sets/src/mage/sets/chronicles/MarhaultElsdragon.java
@@ -37,7 +37,7 @@ public class MarhaultElsdragon extends mage.sets.legends.MarhaultElsdragon {
 
     public MarhaultElsdragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Metamorphosis.java b/Mage.Sets/src/mage/sets/chronicles/Metamorphosis.java
index bae8506e89..b7171a84ac 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Metamorphosis.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Metamorphosis.java
@@ -37,7 +37,7 @@ public class Metamorphosis extends mage.sets.arabiannights.Metamorphosis {
 
     public Metamorphosis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/MountainYeti.java b/Mage.Sets/src/mage/sets/chronicles/MountainYeti.java
index 7a9ce1a3ff..fc285092cd 100644
--- a/Mage.Sets/src/mage/sets/chronicles/MountainYeti.java
+++ b/Mage.Sets/src/mage/sets/chronicles/MountainYeti.java
@@ -38,7 +38,7 @@ public class MountainYeti extends mage.sets.legends.MountainYeti {
 
     public MountainYeti(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/NicolBolas.java b/Mage.Sets/src/mage/sets/chronicles/NicolBolas.java
index d50cb86f39..e8372079e5 100644
--- a/Mage.Sets/src/mage/sets/chronicles/NicolBolas.java
+++ b/Mage.Sets/src/mage/sets/chronicles/NicolBolas.java
@@ -37,7 +37,7 @@ public class NicolBolas extends mage.sets.legends.NicolBolas {
 
     public NicolBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/PalladiaMors.java b/Mage.Sets/src/mage/sets/chronicles/PalladiaMors.java
index aeda422166..28b18208ca 100644
--- a/Mage.Sets/src/mage/sets/chronicles/PalladiaMors.java
+++ b/Mage.Sets/src/mage/sets/chronicles/PalladiaMors.java
@@ -37,7 +37,7 @@ public class PalladiaMors extends mage.sets.masterseditioniii.PalladiaMors {
 
     public PalladiaMors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Rakalite.java b/Mage.Sets/src/mage/sets/chronicles/Rakalite.java
index a36a8b3c27..552a8265fa 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Rakalite.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Rakalite.java
@@ -37,7 +37,7 @@ public class Rakalite extends mage.sets.masterseditioniv.Rakalite {
 
     public Rakalite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Recall.java b/Mage.Sets/src/mage/sets/chronicles/Recall.java
index 194ccf73dc..3185c3d829 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Recall.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Recall.java
@@ -38,7 +38,7 @@ public class Recall extends mage.sets.fifthedition.Recall {
 
     public Recall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/RemoveSoul.java b/Mage.Sets/src/mage/sets/chronicles/RemoveSoul.java
index f108d474db..6ef91446d1 100644
--- a/Mage.Sets/src/mage/sets/chronicles/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/chronicles/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/RepentantBlacksmith.java b/Mage.Sets/src/mage/sets/chronicles/RepentantBlacksmith.java
index 1cbd2be770..176d7f7c07 100644
--- a/Mage.Sets/src/mage/sets/chronicles/RepentantBlacksmith.java
+++ b/Mage.Sets/src/mage/sets/chronicles/RepentantBlacksmith.java
@@ -37,7 +37,7 @@ public class RepentantBlacksmith extends mage.sets.fifthedition.RepentantBlacksm
 
     public RepentantBlacksmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Revelation.java b/Mage.Sets/src/mage/sets/chronicles/Revelation.java
index d5ac407eba..f95dc2963e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Revelation.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Revelation.java
@@ -37,7 +37,7 @@ public class Revelation extends mage.sets.legends.Revelation {
 
     public Revelation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/RubiniaSoulsinger.java b/Mage.Sets/src/mage/sets/chronicles/RubiniaSoulsinger.java
index 0b58cd79bf..9db7383ac6 100644
--- a/Mage.Sets/src/mage/sets/chronicles/RubiniaSoulsinger.java
+++ b/Mage.Sets/src/mage/sets/chronicles/RubiniaSoulsinger.java
@@ -37,7 +37,7 @@ public class RubiniaSoulsinger extends mage.sets.commander2013.RubiniaSoulsinger
 
     public RubiniaSoulsinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/SafeHaven.java b/Mage.Sets/src/mage/sets/chronicles/SafeHaven.java
index cefa411941..f76a372729 100644
--- a/Mage.Sets/src/mage/sets/chronicles/SafeHaven.java
+++ b/Mage.Sets/src/mage/sets/chronicles/SafeHaven.java
@@ -37,7 +37,7 @@ public class SafeHaven extends mage.sets.thedark.SafeHaven {
 
     public SafeHaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ScavengerFolk.java b/Mage.Sets/src/mage/sets/chronicles/ScavengerFolk.java
index 6fb0960ff0..789a6e4a8c 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ScavengerFolk.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ScavengerFolk.java
@@ -37,7 +37,7 @@ public class ScavengerFolk extends mage.sets.fifthedition.ScavengerFolk {
 
     public ScavengerFolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/Sentinel.java b/Mage.Sets/src/mage/sets/chronicles/Sentinel.java
index 1a91cfbf2b..fbf4c2c8ef 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Sentinel.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Sentinel.java
@@ -37,7 +37,7 @@ public class Sentinel extends mage.sets.legends.Sentinel {
 
     public Sentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/SerpentGenerator.java b/Mage.Sets/src/mage/sets/chronicles/SerpentGenerator.java
index 71eb9cf3c9..114a5f0115 100644
--- a/Mage.Sets/src/mage/sets/chronicles/SerpentGenerator.java
+++ b/Mage.Sets/src/mage/sets/chronicles/SerpentGenerator.java
@@ -37,7 +37,7 @@ public class SerpentGenerator extends mage.sets.fifthedition.SerpentGenerator {
 
     public SerpentGenerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/ShieldWall.java b/Mage.Sets/src/mage/sets/chronicles/ShieldWall.java
index 79f4aedd93..63528db136 100644
--- a/Mage.Sets/src/mage/sets/chronicles/ShieldWall.java
+++ b/Mage.Sets/src/mage/sets/chronicles/ShieldWall.java
@@ -37,7 +37,7 @@ public class ShieldWall extends mage.sets.legends.ShieldWall {
 
     public ShieldWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/SivitriScarzam.java b/Mage.Sets/src/mage/sets/chronicles/SivitriScarzam.java
index 6539e31b0b..0937627bfc 100644
--- a/Mage.Sets/src/mage/sets/chronicles/SivitriScarzam.java
+++ b/Mage.Sets/src/mage/sets/chronicles/SivitriScarzam.java
@@ -37,7 +37,7 @@ public class SivitriScarzam extends mage.sets.legends.SivitriScarzam {
 
     public SivitriScarzam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/sets/chronicles/SolkanarTheSwampKing.java
index 9ea9d7a439..3f356fc653 100644
--- a/Mage.Sets/src/mage/sets/chronicles/SolkanarTheSwampKing.java
+++ b/Mage.Sets/src/mage/sets/chronicles/SolkanarTheSwampKing.java
@@ -38,7 +38,7 @@ public class SolkanarTheSwampKing extends mage.sets.timeshifted.SolkanarTheSwamp
 
     public SolkanarTheSwampKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/StormSeeker.java b/Mage.Sets/src/mage/sets/chronicles/StormSeeker.java
index dda14d36b5..e19fc10f0e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/StormSeeker.java
+++ b/Mage.Sets/src/mage/sets/chronicles/StormSeeker.java
@@ -37,7 +37,7 @@ public class StormSeeker extends mage.sets.mastersedition.StormSeeker {
 
     public StormSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/TheWretched.java b/Mage.Sets/src/mage/sets/chronicles/TheWretched.java
index 8a1c2cfa39..3f17460616 100644
--- a/Mage.Sets/src/mage/sets/chronicles/TheWretched.java
+++ b/Mage.Sets/src/mage/sets/chronicles/TheWretched.java
@@ -37,7 +37,7 @@ public class TheWretched extends mage.sets.fifthedition.TheWretched {
 
     public TheWretched(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/TobiasAndrion.java b/Mage.Sets/src/mage/sets/chronicles/TobiasAndrion.java
index 0cf5600616..bb2fb91cca 100644
--- a/Mage.Sets/src/mage/sets/chronicles/TobiasAndrion.java
+++ b/Mage.Sets/src/mage/sets/chronicles/TobiasAndrion.java
@@ -37,7 +37,7 @@ public class TobiasAndrion extends mage.sets.legends.TobiasAndrion {
 
     public TobiasAndrion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/TorWauki.java b/Mage.Sets/src/mage/sets/chronicles/TorWauki.java
index 61580da5e2..690b44300a 100644
--- a/Mage.Sets/src/mage/sets/chronicles/TorWauki.java
+++ b/Mage.Sets/src/mage/sets/chronicles/TorWauki.java
@@ -37,7 +37,7 @@ public class TorWauki extends mage.sets.legends.TorWauki {
 
     public TorWauki(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/TormodsCrypt.java b/Mage.Sets/src/mage/sets/chronicles/TormodsCrypt.java
index 140ba32228..1b18f97217 100644
--- a/Mage.Sets/src/mage/sets/chronicles/TormodsCrypt.java
+++ b/Mage.Sets/src/mage/sets/chronicles/TormodsCrypt.java
@@ -38,7 +38,7 @@ public class TormodsCrypt extends mage.sets.timeshifted.TormodsCrypt {
 
     public TormodsCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/Transmutation.java b/Mage.Sets/src/mage/sets/chronicles/Transmutation.java
index 7d8d7ab26b..de15d82830 100644
--- a/Mage.Sets/src/mage/sets/chronicles/Transmutation.java
+++ b/Mage.Sets/src/mage/sets/chronicles/Transmutation.java
@@ -37,7 +37,7 @@ public class Transmutation extends mage.sets.legends.Transmutation {
 
     public Transmutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/TriassicEgg.java b/Mage.Sets/src/mage/sets/chronicles/TriassicEgg.java
index 2fd290401f..94ce2ccd3d 100644
--- a/Mage.Sets/src/mage/sets/chronicles/TriassicEgg.java
+++ b/Mage.Sets/src/mage/sets/chronicles/TriassicEgg.java
@@ -37,7 +37,7 @@ public class TriassicEgg extends mage.sets.legends.TriassicEgg {
 
     public TriassicEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasMine1.java b/Mage.Sets/src/mage/sets/chronicles/UrzasMine1.java
index 1fb9939f7c..fbb8c3db94 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasMine1.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasMine1.java
@@ -38,7 +38,7 @@ public class UrzasMine1 extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasMine2.java b/Mage.Sets/src/mage/sets/chronicles/UrzasMine2.java
index 011580e8f4..79510eab01 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasMine2.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasMine2.java
@@ -37,7 +37,7 @@ public class UrzasMine2 extends UrzasMine1 {
 
     public UrzasMine2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
     }
 
     public UrzasMine2(final UrzasMine2 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasMine3.java b/Mage.Sets/src/mage/sets/chronicles/UrzasMine3.java
index 0cfda86ad3..df4439785e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasMine3.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasMine3.java
@@ -37,7 +37,7 @@ public class UrzasMine3 extends UrzasMine1 {
 
     public UrzasMine3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
     }
 
     public UrzasMine3(final UrzasMine3 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasMine4.java b/Mage.Sets/src/mage/sets/chronicles/UrzasMine4.java
index 9ced5a5cf4..3f5012539b 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasMine4.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasMine4.java
@@ -37,7 +37,7 @@ public class UrzasMine4 extends UrzasMine1 {
 
     public UrzasMine4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
     }
 
     public UrzasMine4(final UrzasMine4 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant1.java b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant1.java
index c0e648aecc..ea133a523d 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant1.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant1.java
@@ -38,7 +38,7 @@ public class UrzasPowerPlant1 extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant2.java b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant2.java
index b0f1d2ed1a..8264a74c7a 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant2.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant2.java
@@ -37,7 +37,7 @@ public class UrzasPowerPlant2 extends UrzasPowerPlant1 {
 
     public UrzasPowerPlant2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
     }
 
     public UrzasPowerPlant2(final UrzasPowerPlant2 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant3.java b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant3.java
index 7e646edbf7..5f1a5e1a5e 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant3.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant3.java
@@ -37,7 +37,7 @@ public class UrzasPowerPlant3 extends UrzasPowerPlant1 {
 
     public UrzasPowerPlant3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
     }
 
     public UrzasPowerPlant3(final UrzasPowerPlant3 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant4.java b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant4.java
index e584a914b9..209900f090 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant4.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasPowerPlant4.java
@@ -37,7 +37,7 @@ public class UrzasPowerPlant4 extends UrzasPowerPlant1 {
 
     public UrzasPowerPlant4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
     }
 
     public UrzasPowerPlant4(final UrzasPowerPlant4 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasTower1.java b/Mage.Sets/src/mage/sets/chronicles/UrzasTower1.java
index 2eeb23f356..07acf285a0 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasTower1.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasTower1.java
@@ -38,7 +38,7 @@ public class UrzasTower1 extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasTower2.java b/Mage.Sets/src/mage/sets/chronicles/UrzasTower2.java
index dbe7d0d253..ab594729fc 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasTower2.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasTower2.java
@@ -37,7 +37,7 @@ public class UrzasTower2 extends UrzasTower1 {
 
     public UrzasTower2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
     }
 
     public UrzasTower2(final UrzasTower2 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasTower3.java b/Mage.Sets/src/mage/sets/chronicles/UrzasTower3.java
index 388a289dfa..17438f42e5 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasTower3.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasTower3.java
@@ -37,7 +37,7 @@ public class UrzasTower3 extends UrzasTower1 {
 
     public UrzasTower3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
     }
 
     public UrzasTower3(final UrzasTower3 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/UrzasTower4.java b/Mage.Sets/src/mage/sets/chronicles/UrzasTower4.java
index 1643aadcc9..36a1790a77 100644
--- a/Mage.Sets/src/mage/sets/chronicles/UrzasTower4.java
+++ b/Mage.Sets/src/mage/sets/chronicles/UrzasTower4.java
@@ -37,7 +37,7 @@ public class UrzasTower4 extends UrzasTower1 {
 
     public UrzasTower4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
     }
 
     public UrzasTower4(final UrzasTower4 card) {
diff --git a/Mage.Sets/src/mage/sets/chronicles/VaevictisAsmadi.java b/Mage.Sets/src/mage/sets/chronicles/VaevictisAsmadi.java
index ae223a38fc..bcda38381f 100644
--- a/Mage.Sets/src/mage/sets/chronicles/VaevictisAsmadi.java
+++ b/Mage.Sets/src/mage/sets/chronicles/VaevictisAsmadi.java
@@ -37,7 +37,7 @@ public class VaevictisAsmadi extends mage.sets.masterseditioniii.VaevictisAsmadi
 
     public VaevictisAsmadi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/WallOfHeat.java b/Mage.Sets/src/mage/sets/chronicles/WallOfHeat.java
index 277565f84a..f0725b7596 100644
--- a/Mage.Sets/src/mage/sets/chronicles/WallOfHeat.java
+++ b/Mage.Sets/src/mage/sets/chronicles/WallOfHeat.java
@@ -37,7 +37,7 @@ public class WallOfHeat extends mage.sets.legends.WallOfHeat {
 
     public WallOfHeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/WallOfWonder.java b/Mage.Sets/src/mage/sets/chronicles/WallOfWonder.java
index 25899c6b71..ce97c444c4 100644
--- a/Mage.Sets/src/mage/sets/chronicles/WallOfWonder.java
+++ b/Mage.Sets/src/mage/sets/chronicles/WallOfWonder.java
@@ -38,7 +38,7 @@ public class WallOfWonder extends mage.sets.seventhedition.WallOfWonder {
 
     public WallOfWonder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/WitchHunter.java b/Mage.Sets/src/mage/sets/chronicles/WitchHunter.java
index dea65f8af0..285783b3ed 100644
--- a/Mage.Sets/src/mage/sets/chronicles/WitchHunter.java
+++ b/Mage.Sets/src/mage/sets/chronicles/WitchHunter.java
@@ -38,7 +38,7 @@ public class WitchHunter extends mage.sets.thedark.WitchHunter {
 
     public WitchHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "CHR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/chronicles/XiraArien.java b/Mage.Sets/src/mage/sets/chronicles/XiraArien.java
index a547309170..83209c5e61 100644
--- a/Mage.Sets/src/mage/sets/chronicles/XiraArien.java
+++ b/Mage.Sets/src/mage/sets/chronicles/XiraArien.java
@@ -37,7 +37,7 @@ public class XiraArien extends mage.sets.legends.XiraArien {
 
     public XiraArien(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/chronicles/YawgmothDemon.java b/Mage.Sets/src/mage/sets/chronicles/YawgmothDemon.java
index 9c6c7617ca..654adc6651 100644
--- a/Mage.Sets/src/mage/sets/chronicles/YawgmothDemon.java
+++ b/Mage.Sets/src/mage/sets/chronicles/YawgmothDemon.java
@@ -37,7 +37,7 @@ public class YawgmothDemon extends mage.sets.ninthedition.YawgmothDemon {
 
     public YawgmothDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "CHR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java b/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java
index 98524ef6af..3ff28617fb 100644
--- a/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java
+++ b/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java
@@ -38,7 +38,7 @@ public class CourserOfKruphix extends mage.sets.bornofthegods.CourserOfKruphix {
 
     public CourserOfKruphix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java b/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java
index df451800e4..dce86b5ae5 100644
--- a/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java
+++ b/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java
@@ -38,7 +38,7 @@ public class FatedIntervention extends mage.sets.bornofthegods.FatedIntervention
 
     public FatedIntervention(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java b/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java
index 65dc6e6c42..689d1c8b8a 100644
--- a/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java
+++ b/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java
@@ -38,7 +38,7 @@ public class FontOfFertility extends mage.sets.journeyintonyx.FontOfFertility {
 
     public FontOfFertility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java b/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java
index 94d55e720b..aadb0daff2 100644
--- a/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java
+++ b/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java
@@ -38,7 +38,7 @@ public class HerosDownfall extends mage.sets.theros.HerosDownfall {
 
     public HerosDownfall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java b/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java
index be735b6dbd..5204f7b57d 100644
--- a/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java
+++ b/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java
@@ -38,7 +38,7 @@ public class HydraBroodmaster extends mage.sets.journeyintonyx.HydraBroodmaster
 
     public HydraBroodmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java b/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java
index 920343b98e..f10c5143ad 100644
--- a/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java
+++ b/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java
@@ -38,7 +38,7 @@ public class NecropolisFiend extends mage.sets.khansoftarkir.NecropolisFiend {
 
     public NecropolisFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java b/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java
index 1c831c9ab0..ccc0990110 100644
--- a/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java
+++ b/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java
@@ -38,7 +38,7 @@ public class PrognosticSphinx extends mage.sets.theros.PrognosticSphinx {
 
     public PrognosticSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java b/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java
index 7437e2fab4..f9799beb6a 100644
--- a/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java
+++ b/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java
@@ -38,7 +38,7 @@ public class ProphetOfKruphix extends mage.sets.theros.ProphetOfKruphix {
 
     public ProphetOfKruphix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java b/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java
index dcaa6a5812..797ee8dc1d 100644
--- a/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java
+++ b/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java
@@ -38,7 +38,7 @@ public class ReaperOfTheWilds extends mage.sets.theros.ReaperOfTheWilds {
 
     public ReaperOfTheWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java b/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java
index 3cba2cae8f..60725ba64d 100644
--- a/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java
+++ b/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java
@@ -38,7 +38,7 @@ public class SultaiAscendancy extends mage.sets.khansoftarkir.SultaiAscendancy {
 
     public SultaiAscendancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java b/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java
index fb8fbee480..9c6aa6455b 100644
--- a/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java
+++ b/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java
@@ -38,7 +38,7 @@ public class TempleOfMystery extends mage.sets.theros.TempleOfMystery {
 
     public TempleOfMystery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java b/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java
index f48c4ba085..8650a4a0df 100644
--- a/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java
+++ b/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java
@@ -38,7 +38,7 @@ public class WhipOfErebos extends mage.sets.theros.WhipOfErebos {
 
     public WhipOfErebos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "CLASH";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java b/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java
index 32dd245ba7..428a34b9dc 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java
@@ -37,7 +37,7 @@ public class AEtherFlash extends mage.sets.seventhedition.AEtherFlash {
 
     public AEtherFlash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java b/Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java
index d5f052383f..f93f2325bb 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java
@@ -37,7 +37,7 @@ public class Abduction extends mage.sets.weatherlight.Abduction {
 
     public Abduction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java
index ba26859019..d844e677e1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java
@@ -37,7 +37,7 @@ public class AbyssalHunter extends mage.sets.mirage.AbyssalHunter {
 
     public AbyssalHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java
index bbacda643b..91e83eb114 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java
@@ -37,7 +37,7 @@ public class AbyssalSpecter extends mage.sets.fifthedition.AbyssalSpecter {
 
     public AbyssalSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java b/Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java
index 8be1568aac..33e163955f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java
@@ -37,7 +37,7 @@ public class AdarkarWastes extends mage.sets.tenthedition.AdarkarWastes {
 
     public AdarkarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java b/Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java
index d82df1d76c..0ee06d42f9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java
@@ -37,7 +37,7 @@ public class AgonizingMemories extends mage.sets.seventhedition.AgonizingMemorie
 
     public AgonizingMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java b/Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java
index e1ae3a101a..6300266459 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java
index 0a3ff311fe..a5231b5f3c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java b/Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java
index 3ff970522a..c1b1988c29 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java
@@ -37,7 +37,7 @@ public class AmberPrison extends mage.sets.mirage.AmberPrison {
 
     public AmberPrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java
index 13d3fb2c70..a2ade22739 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java
@@ -37,7 +37,7 @@ public class AnabaBodyguard extends mage.sets.tenthedition.AnabaBodyguard {
 
     public AnabaBodyguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java
index 4412245013..4d948c508b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java
@@ -37,7 +37,7 @@ public class AnabaShaman extends mage.sets.ninthedition.AnabaShaman {
 
     public AnabaShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java b/Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java
index b55497e212..d985896207 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java
@@ -37,7 +37,7 @@ public class AncestralMemories extends mage.sets.seventhedition.AncestralMemorie
 
     public AncestralMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java
index fef7715b79..3bc6b7091f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java
@@ -37,7 +37,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java
index ac1d5179f3..baae1e16c1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java
@@ -38,7 +38,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java b/Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java
index dfe325adbe..b85fcfc28c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java
@@ -38,7 +38,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel {
 
     public Archangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java b/Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java
index 5751de2833..cdde857613 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java
@@ -37,7 +37,7 @@ public class ArdentMilitia extends mage.sets.eighthedition.ArdentMilitia {
 
     public ArdentMilitia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java b/Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java
index b5452a6ed6..5f5094c296 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java
index ef7a5746ca..4e77dfd3ce 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java
@@ -37,7 +37,7 @@ public class ArmoredPegasus extends mage.sets.tempest.ArmoredPegasus {
 
     public ArmoredPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java b/Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java
index 2c506e696b..fe8f5788b7 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java
@@ -37,7 +37,7 @@ public class AshenPowder extends mage.sets.mirage.AshenPowder {
 
     public AshenPowder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java b/Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java
index 4a5e6f4da5..dc4fbd83f5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java
@@ -37,7 +37,7 @@ public class AshnodsAltar extends mage.sets.fifthedition.AshnodsAltar {
 
     public AshnodsAltar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java
index 00a4ec2c1f..497333a9c5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java
@@ -37,7 +37,7 @@ public class BalduvianBarbarians extends mage.sets.ninthedition.BalduvianBarbari
 
     public BalduvianBarbarians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java
index 84a0db6a2f..1468b5115b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java
@@ -37,7 +37,7 @@ public class BalduvianHorde extends mage.sets.alliances.BalduvianHorde {
 
     public BalduvianHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java
index a9733ffadc..94373b7aac 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java b/Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java
index 77b88becdd..b37271037b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Blight.java b/Mage.Sets/src/mage/sets/classicsixthedition/Blight.java
index fc18b26b70..9c4762703c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Blight.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Blight.java
@@ -37,7 +37,7 @@ public class Blight extends mage.sets.fifthedition.Blight {
 
     public Blight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java b/Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java
index 0b31baf2f0..6c1f4b12e4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java
@@ -37,7 +37,7 @@ public class BlightedShaman extends mage.sets.mirage.BlightedShaman {
 
     public BlightedShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java b/Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java
index 1222ae7d8c..ecf38bac76 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java
@@ -37,7 +37,7 @@ public class BloodPet extends mage.sets.tempest.BloodPet {
 
     public BloodPet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java b/Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java
index cbda6a25c9..90deff5f6a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java b/Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java
index 92e9a214eb..9449093d3d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java
@@ -37,7 +37,7 @@ public class BogRats extends mage.sets.thedark.BogRats {
 
     public BogRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java b/Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java
index de6859a3b3..16838859a4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Boil.java b/Mage.Sets/src/mage/sets/classicsixthedition/Boil.java
index 22d8729380..1dab3da467 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Boil.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Boil.java
@@ -37,7 +37,7 @@ public class Boil extends mage.sets.tempest.Boil {
 
     public Boil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java b/Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java
index 8135ef412b..5c9bc69924 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java b/Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java
index 8a26d9a7ea..eb205659c8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java
@@ -37,7 +37,7 @@ public class BottleOfSuleiman extends mage.sets.fifthedition.BottleOfSuleiman {
 
     public BottleOfSuleiman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Browse.java b/Mage.Sets/src/mage/sets/classicsixthedition/Browse.java
index 56c0a76a39..1b007ed5cb 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Browse.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Browse.java
@@ -37,7 +37,7 @@ public class Browse extends mage.sets.alliances.Browse {
 
     public Browse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java b/Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java
index 1be525962b..bb670e491d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java
@@ -37,7 +37,7 @@ public class Brushland extends mage.sets.tenthedition.Brushland {
 
     public Brushland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java b/Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java
index 7210294e4f..830fc560b8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java
@@ -38,7 +38,7 @@ public class Burrowing extends mage.sets.limitedalpha.Burrowing {
 
     public Burrowing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java b/Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java
index 5201f41d8b..1f0e57c228 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java
@@ -37,7 +37,7 @@ public class CallOfTheWild extends mage.sets.weatherlight.CallOfTheWild {
 
     public CallOfTheWild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Castle.java b/Mage.Sets/src/mage/sets/classicsixthedition/Castle.java
index ce299481b4..cc09ac8133 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Castle.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java b/Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java
index 054c4794e6..385b4ab35e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java
@@ -37,7 +37,7 @@ public class CatWarriors extends mage.sets.fifthedition.CatWarriors {
 
     public CatWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CelestialDawn.java b/Mage.Sets/src/mage/sets/classicsixthedition/CelestialDawn.java
index 0c235ff569..12d6e8ec56 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CelestialDawn.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CelestialDawn.java
@@ -38,7 +38,7 @@ public class CelestialDawn extends mage.sets.timeshifted.CelestialDawn {
 
     public CelestialDawn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java
index 84b273169c..2e25477a38 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java
@@ -37,7 +37,7 @@ public class CharcoalDiamond extends mage.sets.seventhedition.CharcoalDiamond {
 
     public CharcoalDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Chill.java b/Mage.Sets/src/mage/sets/classicsixthedition/Chill.java
index b2dfd8715a..7d6295873b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Chill.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Chill.java
@@ -37,7 +37,7 @@ public class Chill extends mage.sets.tempest.Chill {
 
     public Chill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java
index c66d68afd1..16e47b6d17 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java
index 8aed99a44c..0af5491a70 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java
index ef8fe3b730..4f5a747f84 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java
index 9cab0ff7e4..e61d101d4d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java
index 65487a57e5..aeeb5cb95d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java b/Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java
index d17bfd03d7..91e557dbc9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java
@@ -37,7 +37,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java b/Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java
index dacf6ebacb..eedd919206 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java
@@ -37,7 +37,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java b/Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java
index c3dc73d951..18d3871e09 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java
@@ -37,7 +37,7 @@ public class Conquer extends mage.sets.iceage.Conquer {
 
     public Conquer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java b/Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java
index 51034ff305..84441e7100 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java b/Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java
index d00cbe47bb..73557690f0 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java
@@ -37,7 +37,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java b/Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java
index d964d5299a..6d1a8d5036 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java
@@ -37,7 +37,7 @@ public class CrimsonHellkite extends mage.sets.seventhedition.CrimsonHellkite {
 
     public CrimsonHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java b/Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java
index 37b8a24d3f..dfa89c80b6 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java
index 75273fa7db..953882282c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java
index 3204bbd1be..fba90f9f64 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java
@@ -37,7 +37,7 @@ public class CrystalVein extends mage.sets.mirage.CrystalVein {
 
     public CrystalVein(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java b/Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java
index b8bf863931..1a0fe79357 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java
@@ -37,7 +37,7 @@ public class CursedTotem extends mage.sets.mirage.CursedTotem {
 
     public CursedTotem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java b/Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java
index 0aee811253..d2f99b6290 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java
@@ -37,7 +37,7 @@ public class DAvenantArcher extends mage.sets.fifthedition.DAvenantArcher {
 
     public DAvenantArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java
index 8c51d6cddc..14ef76652d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java
@@ -38,7 +38,7 @@ public class DancingScimitar extends mage.sets.ninthedition.DancingScimitar {
 
     public DancingScimitar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java b/Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java
index 0a061a75a6..ca1105f14a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java
@@ -37,7 +37,7 @@ public class DarajaGriffin extends mage.sets.visions.DarajaGriffin {
 
     public DarajaGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java b/Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java
index 0a7eb8bac6..9208a2d47a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java
@@ -37,7 +37,7 @@ public class DaringApprentice extends mage.sets.ninthedition.DaringApprentice {
 
     public DaringApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java b/Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java
index d7e9dcca2b..63502fdd36 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java
@@ -37,7 +37,7 @@ public class Deflection extends mage.sets.iceage.Deflection {
 
     public Deflection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java b/Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java
index 7e3545f262..133ffc99f3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java
@@ -37,7 +37,7 @@ public class DenseFoliage extends mage.sets.weatherlight.DenseFoliage {
 
     public DenseFoliage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java
index 797a6cdea9..9f61954d4a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java
@@ -37,7 +37,7 @@ public class Derelor extends mage.sets.fallenempires.Derelor {
 
     public Derelor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java b/Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java
index e56a3259e7..5153203a9f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java
@@ -37,7 +37,7 @@ public class Desertion extends mage.sets.visions.Desertion {
 
     public Desertion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java b/Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java
index 711ac285ae..cc3c75b8f9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java
@@ -37,7 +37,7 @@ public class DiminishingReturns extends mage.sets.alliances.DiminishingReturns {
 
     public DiminishingReturns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java b/Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java
index 5e139e8824..f2dbca6f92 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java b/Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java
index 83fab19b6d..3e1a81e23f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java
index be95ea6d1c..c8e0163a29 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java
index d6f14e59c2..b28df0e50f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java
@@ -37,7 +37,7 @@ public class DivineTransformation extends mage.sets.fifthedition.DivineTransform
 
     public DivineTransformation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java b/Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java
index f8ceeb41bc..6e6a4aa924 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java
@@ -37,7 +37,7 @@ public class Doomsday extends mage.sets.weatherlight.Doomsday {
 
     public Doomsday(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java b/Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java
index 450e1d2675..4625e65dbf 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java
@@ -37,7 +37,7 @@ public class DragonEngine extends mage.sets.fifthedition.DragonEngine {
 
     public DragonEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java b/Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java
index 16d096b973..7e38ffa912 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java
@@ -37,7 +37,7 @@ public class DragonMask extends mage.sets.visions.DragonMask {
 
     public DragonMask(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java b/Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java
index ee8fcc11b1..f28aa9d04d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java
@@ -37,7 +37,7 @@ public class DreadOfNight extends mage.sets.tempest.DreadOfNight {
 
     public DreadOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java b/Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java
index 4611509aea..c0c8e068c4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java
@@ -37,7 +37,7 @@ public class DreamCache extends mage.sets.tempest.DreamCache {
 
     public DreamCache(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java
index f57d6913d2..22b50834f5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java b/Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java
index 67c46c74ad..d4ccafd8aa 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java
@@ -37,7 +37,7 @@ public class DrySpell extends mage.sets.homelands.DrySpell1 {
 
     public DrySpell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java b/Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java
index 46a33979fb..273b6a3c31 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java
@@ -37,7 +37,7 @@ public class DwarvenRuins extends mage.sets.fallenempires.DwarvenRuins {
 
     public DwarvenRuins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java b/Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java
index 508b1e35fb..170f31bb0b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java
@@ -37,7 +37,7 @@ public class EarlyHarvest extends mage.sets.ninthedition.EarlyHarvest {
 
     public EarlyHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java b/Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java
index be8a6b222b..065f445485 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java b/Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java
index 165df7ed1c..939f363bd4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java
@@ -37,7 +37,7 @@ public class EbonStronghold extends mage.sets.fallenempires.EbonStronghold {
 
     public EbonStronghold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java b/Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java
index 531dd1029d..48da7d4183 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java
@@ -37,7 +37,7 @@ public class EkunduGriffin extends mage.sets.mirage.EkunduGriffin {
 
     public EkunduGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java
index 579bce918a..a98b8f083d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java
@@ -37,7 +37,7 @@ public class ElderDruid extends mage.sets.iceage.ElderDruid {
 
     public ElderDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java
index b06cda8f1e..4974a086c6 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java
@@ -37,7 +37,7 @@ public class ElvenCache extends mage.sets.visions.ElvenCache {
 
     public ElvenCache(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java
index a7415039bc..5be7bd0493 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java
@@ -37,7 +37,7 @@ public class ElvenRiders extends mage.sets.onslaught.ElvenRiders {
 
     public ElvenRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java
index f871e194cd..378c83c834 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java b/Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java
index 9a0ba37e3b..888f5e483b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java
@@ -37,7 +37,7 @@ public class Enfeeblement extends mage.sets.tempest.Enfeeblement {
 
     public Enfeeblement(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java
index e5b13ebf9f..1846fffe95 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java
@@ -37,7 +37,7 @@ public class EnlightenedTutor extends mage.sets.mirage.EnlightenedTutor {
 
     public EnlightenedTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java b/Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java
index b765fd4e57..b12f3a8d9d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java
@@ -37,7 +37,7 @@ public class EtherealChampion extends mage.sets.mirage.EtherealChampion {
 
     public EtherealChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java
index fb228c3ab4..c712e916b3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java
@@ -37,7 +37,7 @@ public class EvilEyeOfOrmsByGore extends mage.sets.fifthedition.EvilEyeOfOrmsByG
 
     public EvilEyeOfOrmsByGore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Exile.java b/Mage.Sets/src/mage/sets/classicsixthedition/Exile.java
index 354938a066..e284254b06 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Exile.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Exile.java
@@ -37,7 +37,7 @@ public class Exile extends mage.sets.alliances.Exile {
 
     public Exile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java b/Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java
index 4753806670..009791bad4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java
@@ -37,7 +37,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java b/Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java
index 04587e6c10..2d8f83d479 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java
@@ -37,7 +37,7 @@ public class FallowEarth extends mage.sets.mirage.FallowEarth {
 
     public FallowEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java b/Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java
index b1731dc502..706c8fff2f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java
@@ -37,7 +37,7 @@ public class FamiliarGround extends mage.sets.seventhedition.FamiliarGround {
 
     public FamiliarGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java b/Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java
index 4f7d7457f9..f2088e99ec 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java
@@ -37,7 +37,7 @@ public class FatalBlow extends mage.sets.weatherlight.FatalBlow {
 
     public FatalBlow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Fear.java b/Mage.Sets/src/mage/sets/classicsixthedition/Fear.java
index f3e77ffe34..edebd3fd49 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Fear.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java
index dd0d65dca4..d97134c932 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java
@@ -37,7 +37,7 @@ public class FeastOfTheUnicorn extends mage.sets.homelands.FeastOfTheUnicorn1 {
 
     public FeastOfTheUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java b/Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java
index 0806decd94..256d064c1c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java
@@ -37,7 +37,7 @@ public class FemerefArchers extends mage.sets.tenthedition.FemerefArchers {
 
     public FemerefArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java b/Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java
index 1ec9c3cb86..0b4887e7af 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java
@@ -37,7 +37,7 @@ public class FeralShadow extends mage.sets.mirage.FeralShadow {
 
     public FeralShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java
index e8794b1c0e..1135f977ac 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java
@@ -37,7 +37,7 @@ public class Fervor extends mage.sets.magic2013.Fervor {
 
     public Fervor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java b/Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java
index ebc93592e3..bc30c1d065 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java
@@ -37,7 +37,7 @@ public class FinalFortune extends mage.sets.seventhedition.FinalFortune {
 
     public FinalFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java
index c1c61914c0..14ea402272 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java
@@ -37,7 +37,7 @@ public class FireDiamond extends mage.sets.seventhedition.FireDiamond {
 
     public FireDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java b/Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java
index 05c55323e7..baa0b65963 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java b/Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java
index 5c4a9356d0..f3c48d93ce 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java b/Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java
index 67a44213c4..ba35d01215 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java
@@ -37,7 +37,7 @@ public class FitOfRage extends mage.sets.weatherlight.FitOfRage {
 
     public FitOfRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java
index 2622800b27..8e7d2b4522 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java
@@ -38,7 +38,7 @@ public class FlameSpirit extends mage.sets.iceage.FlameSpirit {
 
     public FlameSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Flash.java b/Mage.Sets/src/mage/sets/classicsixthedition/Flash.java
index 039e26358c..ec6f89ec8f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Flash.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Flash.java
@@ -37,7 +37,7 @@ public class Flash extends mage.sets.mirage.Flash {
 
     public Flash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java b/Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java
index a5b83d9a6d..284846c341 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Flight.java b/Mage.Sets/src/mage/sets/classicsixthedition/Flight.java
index f36ce06213..5830a4819d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Flight.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java
index 1dd632e10e..8fea5789ce 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java
@@ -37,7 +37,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Fog.java b/Mage.Sets/src/mage/sets/classicsixthedition/Fog.java
index 29ee2e7b0a..589d59cdb4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Fog.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java b/Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java
index f0b716e4f1..50b65da0d2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java
@@ -38,7 +38,7 @@ public class FogElemental extends mage.sets.tenthedition.FogElemental {
 
     public FogElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java b/Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java
index 5fbba0bd7e..cf2fa310d4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java
@@ -37,7 +37,7 @@ public class ForbiddenCrypt extends mage.sets.mirage.ForbiddenCrypt {
 
     public ForbiddenCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Forget.java b/Mage.Sets/src/mage/sets/classicsixthedition/Forget.java
index 6f0b08e96b..248e4d4366 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Forget.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Forget.java
@@ -37,7 +37,7 @@ public class Forget extends mage.sets.homelands.Forget {
 
     public Forget(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java b/Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java
index d6e9c4e030..be012c45ef 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java
@@ -37,7 +37,7 @@ public class FountainOfYouth extends mage.sets.tenthedition.FountainOfYouth {
 
     public FountainOfYouth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java
index 7d2e2d193d..da40560193 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java
@@ -37,7 +37,7 @@ public class FyndhornBrownie extends mage.sets.iceage.FyndhornBrownie {
 
     public FyndhornBrownie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java
index 323cfb17ca..847ed9fb0d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java
@@ -37,7 +37,7 @@ public class FyndhornElder extends mage.sets.iceage.FyndhornElder {
 
     public FyndhornElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java b/Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java
index c509e71c7b..0dbd6d4db0 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java
@@ -37,7 +37,7 @@ public class GaseousForm extends mage.sets.tempest.GaseousForm {
 
     public GaseousForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java
index 084d317245..9e0d498add 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java
index a7e4c3303c..7c8cd83eb2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java b/Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java
index f2336ea1ed..eb38e42202 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java
@@ -37,7 +37,7 @@ public class GiantStrength extends mage.sets.tempest.GiantStrength {
 
     public GiantStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java b/Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java
index 048fe5749c..28abef0e8e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java
@@ -37,7 +37,7 @@ public class GlacialWall extends mage.sets.fifthedition.GlacialWall {
 
     public GlacialWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java
index efcf78542c..490d257235 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java
@@ -37,7 +37,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java
index 574fb9ae10..f30fe9e32a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java
@@ -37,7 +37,7 @@ public class GoblinDiggingTeam extends mage.sets.thedark.GoblinDiggingTeam {
 
     public GoblinDiggingTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java
index 35f714b0c1..af35691811 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java
@@ -37,7 +37,7 @@ public class GoblinEliteInfantry extends mage.sets.tenthedition.GoblinEliteInfan
 
     public GoblinEliteInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java
index 79ec19ac82..6a47710f96 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java
@@ -37,7 +37,7 @@ public class GoblinHero extends mage.sets.fifthedition.GoblinHero {
 
     public GoblinHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java
index 6bd2c723a5..2c25587b32 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java
index f0be7ef51e..676adc56b9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java
@@ -37,7 +37,7 @@ public class GoblinRecruiter extends mage.sets.visions.GoblinRecruiter {
 
     public GoblinRecruiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java
index 909693ca28..c84f720049 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java
@@ -37,7 +37,7 @@ public class GoblinWarrens extends mage.sets.fallenempires.GoblinWarrens {
 
     public GoblinWarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java b/Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java
index 9705fc3bd2..fd95a5fc33 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java
@@ -37,7 +37,7 @@ public class GorillaChieftain extends mage.sets.seventhedition.GorillaChieftain
 
     public GorillaChieftain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java b/Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java
index b26dc73547..9da24b7924 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java
@@ -38,7 +38,7 @@ public class GravebaneZombie extends mage.sets.mirage.GravebaneZombie {
 
     public GravebaneZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java b/Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java
index 7aab663b6c..5781290bf5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Greed.java b/Mage.Sets/src/mage/sets/classicsixthedition/Greed.java
index 69414e799f..9ed88410fa 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Greed.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Greed.java
@@ -37,7 +37,7 @@ public class Greed extends mage.sets.commander2013.Greed {
 
     public Greed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java b/Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java
index 8f9a51b17e..5b90bd0c42 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java
@@ -38,7 +38,7 @@ public class GrinningTotem extends mage.sets.timeshifted.GrinningTotem {
 
     public GrinningTotem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java
index 7af5185822..b8468a2313 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java
index 6ea8e28576..dea687e892 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java
@@ -37,7 +37,7 @@ public class HammerOfBogardan extends mage.sets.mirage.HammerOfBogardan {
 
     public HammerOfBogardan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java b/Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java
index 23abb20461..4bdaf299eb 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java
@@ -37,7 +37,7 @@ public class HarmattanEfreet extends mage.sets.mirage.HarmattanEfreet {
 
     public HarmattanEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java b/Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java
index 6c31654821..3664066f3b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java
@@ -37,7 +37,7 @@ public class HavenwoodBattleground extends mage.sets.fallenempires.HavenwoodBatt
 
     public HavenwoodBattleground(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java b/Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java
index b5493b8375..3ebadc47c1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java b/Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java
index 8569fb936f..ccb992b610 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java
@@ -37,7 +37,7 @@ public class HeavyBallista extends mage.sets.seventhedition.HeavyBallista {
 
     public HeavyBallista(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java b/Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java
index e811781da2..48c3778703 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java
@@ -37,7 +37,7 @@ public class Hecatomb extends mage.sets.iceage.Hecatomb {
 
     public Hecatomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java b/Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java
index 46c534ae92..dc85bee8b5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java
@@ -37,7 +37,7 @@ public class HerosResolve extends mage.sets.tempest.HerosResolve {
 
     public HerosResolve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java b/Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java
index 3227b390c7..c51ed87aef 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java
@@ -37,7 +37,7 @@ public class HiddenHorror extends mage.sets.tenthedition.HiddenHorror {
 
     public HiddenHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java b/Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java
index 020cb99d2d..ecb59a625c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java
index fe4e153466..5b59e7b59e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java
index 1a71283dc0..33f823e8c3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java b/Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java
index 6dcfe01298..079f643d15 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java
@@ -37,7 +37,7 @@ public class HulkingCyclops extends mage.sets.visions.HulkingCyclops {
 
     public HulkingCyclops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java b/Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java
index 53e5ffa909..b9e7a189da 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java
@@ -38,7 +38,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java b/Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java
index f358e33869..b9d073268d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java
@@ -37,7 +37,7 @@ public class IcatianTown extends mage.sets.fallenempires.IcatianTown {
 
     public IcatianTown(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java b/Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java
index d05c2c2eab..2571457e41 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java
@@ -37,7 +37,7 @@ public class IllicitAuction extends mage.sets.mirage.IllicitAuction {
 
     public IllicitAuction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java b/Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java
index 3be31e9ae3..cc9537fbb8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java
@@ -37,7 +37,7 @@ public class InfantryVeteran extends mage.sets.magic2011.InfantryVeteran {
 
     public InfantryVeteran(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java b/Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java
index ac3e17116f..9c27dcec3d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java
@@ -37,7 +37,7 @@ public class InfernalContract extends mage.sets.seventhedition.InfernalContract
 
     public InfernalContract(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java b/Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java
index b5021d0780..84b0b06ac0 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java
@@ -37,7 +37,7 @@ public class Inferno extends mage.sets.thedark.Inferno {
 
     public Inferno(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Insight.java b/Mage.Sets/src/mage/sets/classicsixthedition/Insight.java
index af2beb8910..2a6342682f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Insight.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Insight.java
@@ -37,7 +37,7 @@ public class Insight extends mage.sets.tempest.Insight {
 
     public Insight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java b/Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java
index 120be32269..b8f23bb5e1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java
@@ -37,7 +37,7 @@ public class Inspiration extends mage.sets.returntoravnica.Inspiration {
 
     public Inspiration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java b/Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java
index 5b89eff212..eb1fc6fcf1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java b/Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java
index 6bb66ddc46..9c074c3517 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java b/Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java
index 7f878fb83f..99349439d3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java b/Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java
index 3f2c923e39..b8882835bf 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java
@@ -37,7 +37,7 @@ public class JalumTome extends mage.sets.seventhedition.JalumTome {
 
     public JalumTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java
index 0e6899af53..31c6e1daee 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java b/Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java
index ebcc04a3db..d0ca4d8dc1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java
@@ -37,7 +37,7 @@ public class Jokulhaups extends mage.sets.iceage.Jokulhaups {
 
     public Jokulhaups(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java b/Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java
index 64266f569c..bc969382f2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java
@@ -37,7 +37,7 @@ public class Juxtapose extends mage.sets.fifthedition.Juxtapose {
 
     public Juxtapose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java b/Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java
index dbd548a6ad..b6cf4f465c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java
@@ -37,7 +37,7 @@ public class KarplusanForest extends mage.sets.tenthedition.KarplusanForest {
 
     public KarplusanForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 326;
+        this.cardNumber = "326";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java b/Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java
index ddece83c08..83e4e9f154 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java
@@ -37,7 +37,7 @@ public class Kismet extends mage.sets.fifthedition.Kismet {
 
     public Kismet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java
index ca3fd6e0b4..a93ba2bdc4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java
@@ -37,7 +37,7 @@ public class KjeldoranDead extends mage.sets.iceage.KjeldoranDead {
 
     public KjeldoranDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java
index 55020159ae..5c1db3d007 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java
@@ -37,7 +37,7 @@ public class KjeldoranRoyalGuard extends mage.sets.iceage.KjeldoranRoyalGuard {
 
     public KjeldoranRoyalGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java b/Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java
index 59d652fc05..5adf9b2492 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java
@@ -37,7 +37,7 @@ public class LeadGolem extends mage.sets.mirage.LeadGolem {
 
     public LeadGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java b/Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java
index 0fcaa54e02..cf4b28e90c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java
@@ -37,7 +37,7 @@ public class LeshracsRite extends mage.sets.iceage.LeshracsRite {
 
     public LeshracsRite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java b/Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java
index 98e0bc34ff..9190441a8a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java
@@ -37,7 +37,7 @@ public class LibraryOfLatNam extends mage.sets.alliances.LibraryOfLatNam {
 
     public LibraryOfLatNam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java b/Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java
index 5e73b2e915..f3d76d6f0a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java
@@ -37,7 +37,7 @@ public class LightOfDay extends mage.sets.tempest.LightOfDay {
 
     public LightOfDay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java b/Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java
index 02e6cbddc9..ab26109574 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java
@@ -37,7 +37,7 @@ public class LightningBlast extends mage.sets.tempest.LightningBlast {
 
     public LightningBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java b/Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java
index 569f037edd..4a0e9ed3f3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java
index c70d092d4f..70c650ac92 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java b/Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java
index 54070c790b..04a1667f63 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java
@@ -37,7 +37,7 @@ public class LongbowArcher extends mage.sets.seventhedition.LongbowArcher {
 
     public LongbowArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java
index 2d4332b0ee..2336eb8e54 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java b/Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java
index 3d66d44ff6..ee99e81aa1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java
@@ -37,7 +37,7 @@ public class LostSoul extends mage.sets.fifthedition.LostSoul {
 
     public LostSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Lure.java b/Mage.Sets/src/mage/sets/classicsixthedition/Lure.java
index 416a9106bd..0a3204db6c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Lure.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java b/Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java
index 94be01eda6..5c32b1b876 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java
@@ -37,7 +37,7 @@ public class ManaPrism extends mage.sets.mirage.ManaPrism {
 
     public ManaPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java b/Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java
index 91ba80fc10..88c3bbc9c8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java
@@ -37,7 +37,7 @@ public class ManaShort extends mage.sets.limitedalpha.ManaShort {
 
     public ManaShort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java b/Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java
index 3bd0426aad..aa5c81925e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java
index 22e86d4af9..8009674609 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java
@@ -37,7 +37,7 @@ public class MarbleDiamond extends mage.sets.seventhedition.MarbleDiamond {
 
     public MarbleDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Maro.java b/Mage.Sets/src/mage/sets/classicsixthedition/Maro.java
index c149112723..12431f4fe3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Maro.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Maro.java
@@ -37,7 +37,7 @@ public class Maro extends mage.sets.ninthedition.Maro {
 
     public Maro(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java b/Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java
index 232abd5924..6cf9551620 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java b/Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java
index 03d161064a..05c7107a1a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java
@@ -37,7 +37,7 @@ public class MemoryLapse extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java
index 46b3a014a4..98022a3f57 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java b/Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java
index 186d069012..95d53ab152 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java
@@ -37,7 +37,7 @@ public class MesaFalcon extends mage.sets.homelands.MesaFalcon1 {
 
     public MesaFalcon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java b/Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java
index 51cd997658..51505eb964 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java b/Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java
index 8a91422c30..5355d63a80 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java
@@ -37,7 +37,7 @@ public class MindWarp extends mage.sets.iceage.MindWarp {
 
     public MindWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java b/Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java
index 3a68b35e98..b271fc04da 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java
@@ -37,7 +37,7 @@ public class MischievousPoltergeist extends mage.sets.weatherlight.MischievousPo
 
     public MischievousPoltergeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java
index 6a1ca5bcbf..a8a8854641 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java
@@ -37,7 +37,7 @@ public class MossDiamond extends mage.sets.seventhedition.MossDiamond {
 
     public MossDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java b/Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java
index d4c6071fea..42c6acf484 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java
@@ -37,7 +37,7 @@ public class MountainGoat extends mage.sets.fifthedition.MountainGoat {
 
     public MountainGoat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java b/Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java
index ed3f488ac2..f914025ace 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java
@@ -37,7 +37,7 @@ public class MysticCompass extends mage.sets.alliances.MysticCompass {
 
     public MysticCompass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java
index 805ae1aee0..d226e6af1c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java
@@ -37,7 +37,7 @@ public class MysticalTutor extends mage.sets.mirage.MysticalTutor {
 
     public MysticalTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java b/Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java
index 0f621094ac..d88e300cb5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java
@@ -37,7 +37,7 @@ public class NaturesResurgence extends mage.sets.seventhedition.NaturesResurgenc
 
     public NaturesResurgence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java b/Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java
index 378070e604..c5dc9f36dc 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java
@@ -37,7 +37,7 @@ public class Necrosavant extends mage.sets.visions.Necrosavant {
 
     public Necrosavant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java b/Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java
index f8a7c466f5..e4d984ad69 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java
index 0605b79bbd..90eec38224 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java
index 286d70ed30..3faa04afdf 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java
index bea819eebf..15ef48db9b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java
@@ -37,7 +37,7 @@ public class OrderOfTheSacredTorch extends mage.sets.iceage.OrderOfTheSacredTorc
 
     public OrderOfTheSacredTorch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java b/Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java
index 51c9d66b1c..a08fcc994e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java
@@ -37,7 +37,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java
index 1a07b4e128..c069dbbcb9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java b/Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java
index 18c3016f41..49c862e1ab 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java
@@ -38,7 +38,7 @@ public class PainfulMemories extends mage.sets.mirage.PainfulMemories {
 
     public PainfulMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java b/Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java
index 37c1bff77c..376968ebd7 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java
@@ -37,7 +37,7 @@ public class PantherWarriors extends mage.sets.visions.PantherWarriors {
 
     public PantherWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java b/Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java
index b5a8076ae1..be12e21462 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java
@@ -37,7 +37,7 @@ public class PatagiaGolem extends mage.sets.seventhedition.PatagiaGolem {
 
     public PatagiaGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java b/Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java
index b1266147a6..62ad6c5ee6 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java
@@ -37,7 +37,7 @@ public class PearlDragon extends mage.sets.mirage.PearlDragon {
 
     public PearlDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java b/Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java
index f8386d0d77..8a553ca455 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java
@@ -37,7 +37,7 @@ public class PentagramOfTheAges extends mage.sets.iceage.PentagramOfTheAges {
 
     public PentagramOfTheAges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Perish.java b/Mage.Sets/src/mage/sets/classicsixthedition/Perish.java
index 35dd112a00..f1641058fc 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Perish.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Perish.java
@@ -37,7 +37,7 @@ public class Perish extends mage.sets.tempest.Perish {
 
     public Perish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java
index 5916f045f6..a2086f4deb 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java
index 6d96284a1c..b2f216c8b0 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java b/Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java
index 9be67014a2..9fcf1eab3c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java b/Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java
index c69e834a32..0f197b972b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java
@@ -37,7 +37,7 @@ public class PhyrexianVault extends mage.sets.tenthedition.PhyrexianVault {
 
     public PhyrexianVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java
index e28011491f..e64fd50f30 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java
@@ -37,7 +37,7 @@ public class Pillage extends mage.sets.seventhedition.Pillage {
 
     public Pillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java b/Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java
index adb0a0caab..2f5575436d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java
@@ -37,7 +37,7 @@ public class Polymorph extends mage.sets.magic2010.Polymorph {
 
     public Polymorph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java b/Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java
index 4e14fd0afd..f53048ab60 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java
@@ -38,7 +38,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java b/Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java
index dcb3f789d0..c19860d58f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java
@@ -37,7 +37,7 @@ public class PradeshGypsies extends mage.sets.fifthedition.PradeshGypsies {
 
     public PradeshGypsies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java b/Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java
index 4c5360317a..f73d910344 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java
@@ -37,7 +37,7 @@ public class PrimalClay extends mage.sets.fifthedition.PrimalClay {
 
     public PrimalClay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java
index a0b1c95715..f97716d7f2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java b/Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java
index dbb0aec4dc..f9a1e7c649 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java
@@ -37,7 +37,7 @@ public class Prosperity extends mage.sets.commander2013.Prosperity {
 
     public Prosperity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java
index 7bd131cc2d..75696edccf 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java
@@ -37,7 +37,7 @@ public class PsychicTransfer extends mage.sets.mirage.PsychicTransfer {
 
     public PsychicTransfer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java
index a502c7e08c..d0718293a6 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java
@@ -38,7 +38,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java
index edd5b3ab35..34bc03c89d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java
@@ -38,7 +38,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Python.java b/Mage.Sets/src/mage/sets/classicsixthedition/Python.java
index 603457479a..62c7a9eb2e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Python.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Python.java
@@ -37,7 +37,7 @@ public class Python extends mage.sets.visions.Python {
 
     public Python(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java
index abf0695dd7..22d4b47257 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java
@@ -37,7 +37,7 @@ public class RadjanSpirit extends mage.sets.fifthedition.RadjanSpirit {
 
     public RadjanSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java b/Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java
index 5a71862122..0ef2546224 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java
@@ -37,7 +37,7 @@ public class RagMan extends mage.sets.thedark.RagMan {
 
     public RagMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java b/Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java
index 89acd1a3e0..469b80117c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java b/Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java
index 67ea5c2402..5c42c804e0 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java b/Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java
index eb333e00b3..8e5d61432a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java b/Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java
index c5e26af536..93b6c9ae2a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java
@@ -37,7 +37,7 @@ public class RazortoothRats extends mage.sets.ninthedition.RazortoothRats {
 
     public RazortoothRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Recall.java b/Mage.Sets/src/mage/sets/classicsixthedition/Recall.java
index 88ab427ec0..1cd2577784 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Recall.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Recall.java
@@ -37,7 +37,7 @@ public class Recall extends mage.sets.fifthedition.Recall {
 
     public Recall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java b/Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java
index 69369703d2..e017dc41bc 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java
@@ -37,7 +37,7 @@ public class RecklessEmbermage extends mage.sets.seventhedition.RecklessEmbermag
 
     public RecklessEmbermage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java b/Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java
index 49348b49c6..2d1f144fa9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java
@@ -37,7 +37,7 @@ public class RedwoodTreefolk extends mage.sets.weatherlight.RedwoodTreefolk {
 
     public RedwoodTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java b/Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java
index d379e979f4..a54c4254d5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java b/Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java
index 54b3d9a9d5..8774eef3de 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java
@@ -37,7 +37,7 @@ public class Relearn extends mage.sets.weatherlight.Relearn {
 
     public Relearn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java
index 7e6f104142..2633a440f2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java b/Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java
index de5d033f08..e2b6c5d8f2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java
@@ -37,7 +37,7 @@ public class Remedy extends mage.sets.visions.Remedy {
 
     public Remedy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java
index cbef76798b..1f24418ae5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java b/Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java
index 9ea2507c28..3a1570b2dc 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java
@@ -37,7 +37,7 @@ public class Reprisal extends mage.sets.seventhedition.Reprisal {
 
     public Reprisal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java b/Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java
index 9dfbe67369..ad9a377528 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java
@@ -37,7 +37,7 @@ public class ResistanceFighter extends mage.sets.visions.ResistanceFighter {
 
     public ResistanceFighter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java b/Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java
index cf004d7561..ca42358426 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java b/Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java
index 8a3a1a2884..738c27ade7 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java
@@ -37,7 +37,7 @@ public class RiverBoa extends mage.sets.zendikar.RiverBoa {
 
     public RiverBoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java
index 606f50bef2..24099ce5d8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java b/Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java
index adf4f24ed9..2e8f278d88 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java
@@ -37,7 +37,7 @@ public class Rowen extends mage.sets.seventhedition.Rowen {
 
     public Rowen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java b/Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java
index 2945a58806..1be903f13d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java
@@ -37,7 +37,7 @@ public class RuinsOfTrokair extends mage.sets.fallenempires.RuinsOfTrokair {
 
     public RuinsOfTrokair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 327;
+        this.cardNumber = "327";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java b/Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java
index b21f37b153..de6e1cb1d8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java
@@ -37,7 +37,7 @@ public class SabretoothTiger extends mage.sets.fifthedition.SabretoothTiger {
 
     public SabretoothTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java b/Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java
index b042afa3e0..ed987b85ba 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java
@@ -37,7 +37,7 @@ public class SageOwl extends mage.sets.magic2010.SageOwl {
 
     public SageOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java
index 30966d45ed..888049205d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java b/Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java
index 5ef9332e63..cecff7184c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java
@@ -37,7 +37,7 @@ public class ScaledWurm extends mage.sets.ninthedition.ScaledWurm {
 
     public ScaledWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java
index a3438893ac..558609ab10 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java b/Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java
index 395fe49d2c..5d8b6fcf0d 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java
@@ -37,7 +37,7 @@ public class SeaMonster extends mage.sets.tempest.SeaMonster {
 
     public SeaMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java b/Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java
index c731dc1241..38706441b5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java
@@ -37,7 +37,7 @@ public class SegovianLeviathan extends mage.sets.fifthedition.SegovianLeviathan
 
     public SegovianLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java b/Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java
index 11d5aa1a35..02a9ddcc9b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java
@@ -38,7 +38,7 @@ public class SengirAutocrat extends mage.sets.homelands.SengirAutocrat {
 
     public SengirAutocrat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java b/Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java
index e54794a55e..20652eb92e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java
@@ -37,7 +37,7 @@ public class Serenity extends mage.sets.weatherlight.Serenity {
 
     public Serenity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java b/Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java
index 73141dbcc8..e8bb16f4fe 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java
@@ -37,7 +37,7 @@ public class SerrasBlessing extends mage.sets.ninthedition.SerrasBlessing {
 
     public SerrasBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java
index 84263b942b..31868b29b3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java b/Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java
index 90d9e57d0b..b5df6f45d3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java
index 411f10786f..3c13d3131c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java
@@ -38,7 +38,7 @@ public class Shatterstorm extends mage.sets.fifthedition.Shatterstorm {
 
     public Shatterstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Shock.java b/Mage.Sets/src/mage/sets/classicsixthedition/Shock.java
index c24710915f..98fd44f00a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Shock.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java
index b60f3d14dc..aba2c76402 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java
@@ -37,7 +37,7 @@ public class SibilantSpirit extends mage.sets.iceage.SibilantSpirit {
 
     public SibilantSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java b/Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java
index 4d92067779..e0ff543e53 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java
@@ -37,7 +37,7 @@ public class SkullCatapult extends mage.sets.iceage.SkullCatapult {
 
     public SkullCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java
index 8fbd8032e1..7e796a77a3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java
@@ -37,7 +37,7 @@ public class SkyDiamond extends mage.sets.seventhedition.SkyDiamond {
 
     public SkyDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java b/Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java
index bb0edb7479..2a7dcd79a3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java
@@ -37,7 +37,7 @@ public class SnakeBasket extends mage.sets.visions.SnakeBasket {
 
     public SnakeBasket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java b/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java
index 09ccbe39bf..cae8bbf94b 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java
@@ -38,7 +38,7 @@ public class SoldeviSage extends mage.sets.alliances.SoldeviSage1 {
 
     public SoldeviSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java b/Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java
index ae1d33e566..cff0c95aaf 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java
index d4e8698ea3..a9a1679a91 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java
index 57a7e725f3..2f92d25ee1 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java
index eb87d17eb4..1ec2eb1955 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java
@@ -37,7 +37,7 @@ public class SpittingDrake extends mage.sets.visions.SpittingDrake {
 
     public SpittingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java
index 8255165f33..4e9ac06ce6 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java b/Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java
index f7ccf24096..1932953400 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java
@@ -37,7 +37,7 @@ public class StalkingTiger extends mage.sets.tenthedition.StalkingTiger {
 
     public StalkingTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java b/Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java
index 2f46572e95..4a4735eb19 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java
@@ -37,7 +37,7 @@ public class StandingTroops extends mage.sets.eighthedition.StandingTroops {
 
     public StandingTroops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java b/Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java
index 73afb9723c..8017f2d7f2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java
@@ -37,7 +37,7 @@ public class StaunchDefenders extends mage.sets.tempest.StaunchDefenders {
 
     public StaunchDefenders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java b/Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java
index f8bef0c69b..ba5dd74ea4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java b/Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java
index dc5a965738..eb5dc16b6e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java
@@ -37,7 +37,7 @@ public class StormCauldron extends mage.sets.seventhedition.StormCauldron {
 
     public StormCauldron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java b/Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java
index 965cf08a9d..19a7c8b688 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java
@@ -37,7 +37,7 @@ public class StormCrow extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java b/Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java
index b0bf70910f..724979ba42 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java
@@ -37,7 +37,7 @@ public class StrandsOfNight extends mage.sets.seventhedition.StrandsOfNight {
 
     public StrandsOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java
index 749cc7a29e..1134d83e9f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java b/Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java
index 88cfa299d2..ff2b6ac4ea 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java
@@ -37,7 +37,7 @@ public class StromgaldCabal extends mage.sets.iceage.StromgaldCabal {
 
     public StromgaldCabal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java
index 6ce69fcf41..4afa847a8e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java
@@ -38,7 +38,7 @@ public class Stupor extends mage.sets.timeshifted.Stupor {
 
     public Stupor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java b/Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java
index bf75cca888..a69b4dea4e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java
@@ -37,7 +37,7 @@ public class SulfurousSprings extends mage.sets.tenthedition.SulfurousSprings {
 
     public SulfurousSprings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 328;
+        this.cardNumber = "328";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java b/Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java
index bd4fbee406..ac11205f49 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java
@@ -37,7 +37,7 @@ public class SummerBloom extends mage.sets.ninthedition.SummerBloom {
 
     public SummerBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java b/Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java
index 8aaa243569..5880d3e3f4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java
@@ -37,7 +37,7 @@ public class Sunweb extends mage.sets.seventhedition.Sunweb {
 
     public Sunweb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java b/Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java
index d76270ab48..d647e65260 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java
@@ -37,7 +37,7 @@ public class SvyeluniteTemple extends mage.sets.fallenempires.SvyeluniteTemple {
 
     public SvyeluniteTemple(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 329;
+        this.cardNumber = "329";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java b/Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java
index 79aa727c4b..46e40100e4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java
@@ -37,7 +37,7 @@ public class SyphonSoul extends mage.sets.planechase.SyphonSoul {
 
     public SyphonSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java b/Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java
index b79ee6ef65..0ba1de4d52 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java
@@ -37,7 +37,7 @@ public class TalruumMinotaur extends mage.sets.mirage.TalruumMinotaur {
 
     public TalruumMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java b/Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java
index 633134ca30..b69e7c5c9a 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java
@@ -37,7 +37,7 @@ public class Tariff extends mage.sets.weatherlight.Tariff {
 
     public Tariff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java b/Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java
index afd095896e..0fbfe043c8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java
@@ -37,7 +37,7 @@ public class TeferisPuzzleBox extends mage.sets.ninthedition.TeferisPuzzleBox {
 
     public TeferisPuzzleBox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Terror.java b/Mage.Sets/src/mage/sets/classicsixthedition/Terror.java
index 18c97d0bde..545d344939 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Terror.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java b/Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java
index 6a6ed50a58..3378169fed 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java
index a877d203b5..1247d087b7 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java
index 4d86eced39..21a229fd2f 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java b/Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java
index b01c216837..79ee081e11 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java
@@ -37,7 +37,7 @@ public class TidalSurge extends mage.sets.stronghold.TidalSurge {
 
     public TidalSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java b/Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java
index 922e48bc9a..3d272d2628 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java
@@ -37,7 +37,7 @@ public class TrainedArmodon extends mage.sets.tempest.TrainedArmodon {
 
     public TrainedArmodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java b/Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java
index 6da015fb62..eef0ead950 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java
@@ -37,7 +37,7 @@ public class TranquilGrove extends mage.sets.weatherlight.TranquilGrove {
 
     public TranquilGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java b/Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java
index a0f7dc3450..2abc42a718 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java
index 553f1c220b..36350696d9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java
@@ -37,7 +37,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor {
 
     public Tremor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java b/Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java
index 96c0951b03..ec4e8d4461 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java
@@ -37,7 +37,7 @@ public class TundraWolves extends mage.sets.tenthedition.TundraWolves {
 
     public TundraWolves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java
index deef1a805e..c5c767046c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java
@@ -37,7 +37,7 @@ public class UktabiOrangutan extends mage.sets.visions.UktabiOrangutan {
 
     public UktabiOrangutan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java
index bf76a02ce6..d572d26b25 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java
@@ -37,7 +37,7 @@ public class UktabiWildcats extends mage.sets.seventhedition.UktabiWildcats {
 
     public UktabiWildcats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java b/Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java
index 6fef54b174..2c30e5cdd0 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java
@@ -37,7 +37,7 @@ public class UndergroundRiver extends mage.sets.tenthedition.UndergroundRiver {
 
     public UndergroundRiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 330;
+        this.cardNumber = "330";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java b/Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java
index e3efa2be5c..ac5ed0b3e2 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java
@@ -37,7 +37,7 @@ public class UnseenWalker extends mage.sets.mirage.UnseenWalker {
 
     public UnseenWalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java b/Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java
index 558ef2c14e..57114b778c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java b/Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java
index cd54dd2ab2..3e4f39ee16 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java b/Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java
index dba5d26209..f8c6a7b3a6 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java
@@ -37,7 +37,7 @@ public class UnyaroGriffin extends mage.sets.mirage.UnyaroGriffin {
 
     public UnyaroGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java
index 96acb1b328..551105df73 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java
@@ -37,7 +37,7 @@ public class VampiricTutor extends mage.sets.visions.VampiricTutor {
 
     public VampiricTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java b/Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java
index 48ea2d55eb..fc7ea7c11c 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java
index 1d51460103..cbab9e8480 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java b/Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java
index 45542dd1af..c222a836d8 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java
@@ -37,7 +37,7 @@ public class Vertigo extends mage.sets.iceage.Vertigo {
 
     public Vertigo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java b/Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java
index 8b900052da..8f65895e22 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java
@@ -37,7 +37,7 @@ public class ViashinoWarrior extends mage.sets.mirage.ViashinoWarrior {
 
     public ViashinoWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java b/Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java
index 27376345e7..1c52d242db 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java
@@ -37,7 +37,7 @@ public class Vitalize extends mage.sets.weatherlight.Vitalize {
 
     public Vitalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java b/Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java
index 6e796e9332..142cf0a3e5 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java
@@ -37,7 +37,7 @@ public class VodalianSoldiers extends mage.sets.fifthedition.VodalianSoldiers {
 
     public VodalianSoldiers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java
index 280331b7e1..91b479b716 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java
@@ -38,7 +38,7 @@ public class VolcanicDragon extends mage.sets.magic2012.VolcanicDragon {
 
     public VolcanicDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java
index 8fb0485fe8..78b01491e4 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java
@@ -37,7 +37,7 @@ public class VolcanicGeyser extends mage.sets.magic2013.VolcanicGeyser {
 
     public VolcanicGeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java b/Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java
index e60f198861..59dba56905 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java
@@ -37,7 +37,7 @@ public class WaitingInTheWeeds extends mage.sets.mirage.WaitingInTheWeeds {
 
     public WaitingInTheWeeds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java
index d686953082..9f954496eb 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java
index 639710ec88..defc402a53 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java
index 16a469d5bf..033d6a4fb7 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java b/Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java
index 9c3fb157b9..5cb72b0f15 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java
@@ -37,7 +37,7 @@ public class WandOfDenial extends mage.sets.visions.WandOfDenial {
 
     public WandOfDenial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java b/Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java
index ee78f8c60e..84edcaec69 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java
@@ -37,7 +37,7 @@ public class Warmth extends mage.sets.tempest.Warmth {
 
     public Warmth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java b/Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java
index ffd47e7845..723bc9e211 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java
@@ -37,7 +37,7 @@ public class WarriorsHonor extends mage.sets.tenthedition.WarriorsHonor {
 
     public WarriorsHonor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java b/Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java
index 566ee294fe..4bef02743e 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java
@@ -38,7 +38,7 @@ public class Warthog extends mage.sets.visions.Warthog {
 
     public Warthog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "6ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java b/Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java
index d828c42284..fa8f420e25 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java b/Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java
index 145661ce35..515f61e779 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java
index e1ac27684a..87863d8b52 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java
@@ -37,7 +37,7 @@ public class WindSpirit extends mage.sets.iceage.WindSpirit {
 
     public WindSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java b/Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java
index c29c445dd3..3af794f616 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java
index eb9d5e09c8..6af49c3672 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java
@@ -37,7 +37,7 @@ public class WorldlyTutor extends mage.sets.mirage.WorldlyTutor {
 
     public WorldlyTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java
index 22a4f99f2f..701dec82ef 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java b/Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java
index 9d1e1f1b35..b68d741401 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java
@@ -37,7 +37,7 @@ public class WyluliWolf extends mage.sets.fifthedition.WyluliWolf {
 
     public WyluliWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java b/Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java
index 9265276fd7..8ace5f78b3 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java b/Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java
index 526041d1df..db7dd5dcbf 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java
@@ -37,7 +37,7 @@ public class ZursWeirding extends mage.sets.iceage.ZursWeirding {
 
     public ZursWeirding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "6ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/AllosaurusRider.java b/Mage.Sets/src/mage/sets/coldsnap/AllosaurusRider.java
index 460d99e841..4835d5c60b 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/AllosaurusRider.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/AllosaurusRider.java
@@ -37,7 +37,7 @@ public class AllosaurusRider extends mage.sets.elvesvsgoblins.AllosaurusRider {
 
     public AllosaurusRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/BroodingSaurian.java b/Mage.Sets/src/mage/sets/coldsnap/BroodingSaurian.java
index 3aaf407d67..a23990a15b 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/BroodingSaurian.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/BroodingSaurian.java
@@ -37,7 +37,7 @@ public class BroodingSaurian extends mage.sets.commander2013.BroodingSaurian {
 
     public BroodingSaurian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/Cryoclasm.java b/Mage.Sets/src/mage/sets/coldsnap/Cryoclasm.java
index 4c403cedb6..01c1df8278 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/Cryoclasm.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/Cryoclasm.java
@@ -37,7 +37,7 @@ public class Cryoclasm extends mage.sets.tenthedition.Cryoclasm {
 
     public Cryoclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/Deathmark.java b/Mage.Sets/src/mage/sets/coldsnap/Deathmark.java
index aba9d8dca4..ccb26c2e0c 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/Deathmark.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/Deathmark.java
@@ -37,7 +37,7 @@ public class Deathmark extends mage.sets.tenthedition.Deathmark {
 
     public Deathmark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/DeepfireElemental.java b/Mage.Sets/src/mage/sets/coldsnap/DeepfireElemental.java
index 5360e76856..42d0bb53eb 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/DeepfireElemental.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/DeepfireElemental.java
@@ -37,7 +37,7 @@ public class DeepfireElemental extends mage.sets.commander2013.DeepfireElemental
 
     public DeepfireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/FieldMarshal.java b/Mage.Sets/src/mage/sets/coldsnap/FieldMarshal.java
index 57718f8696..b42c781ee5 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/FieldMarshal.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/FieldMarshal.java
@@ -37,7 +37,7 @@ public class FieldMarshal extends mage.sets.tenthedition.FieldMarshal {
 
     public FieldMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/Flashfreeze.java b/Mage.Sets/src/mage/sets/coldsnap/Flashfreeze.java
index 0976b5cd4d..27f9c0bc15 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/Flashfreeze.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/Flashfreeze.java
@@ -37,7 +37,7 @@ public class Flashfreeze extends mage.sets.tenthedition.Flashfreeze {
 
     public Flashfreeze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/GreaterStoneSpirit.java b/Mage.Sets/src/mage/sets/coldsnap/GreaterStoneSpirit.java
index 44c03edc0f..d2ab9e0d65 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/GreaterStoneSpirit.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/GreaterStoneSpirit.java
@@ -37,7 +37,7 @@ public class GreaterStoneSpirit extends mage.sets.venservskoth.GreaterStoneSpiri
 
     public GreaterStoneSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/KarplusanStrider.java b/Mage.Sets/src/mage/sets/coldsnap/KarplusanStrider.java
index a6d3415a12..b2fac96dc8 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/KarplusanStrider.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/KarplusanStrider.java
@@ -37,7 +37,7 @@ public class KarplusanStrider extends mage.sets.modernmasters2015.KarplusanStrid
 
     public KarplusanStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/KrovikanMist.java b/Mage.Sets/src/mage/sets/coldsnap/KrovikanMist.java
index a8e4b914b5..133868b73d 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/KrovikanMist.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/KrovikanMist.java
@@ -37,7 +37,7 @@ public class KrovikanMist extends mage.sets.jacevsvraska.KrovikanMist {
 
     public KrovikanMist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/OhranViper.java b/Mage.Sets/src/mage/sets/coldsnap/OhranViper.java
index 3c91d9de65..cefda23879 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/OhranViper.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/OhranViper.java
@@ -37,7 +37,7 @@ public class OhranViper extends mage.sets.jacevsvraska.OhranViper {
 
     public OhranViper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/PerilousResearch.java b/Mage.Sets/src/mage/sets/coldsnap/PerilousResearch.java
index 14b4959124..43a6e35397 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/PerilousResearch.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/PerilousResearch.java
@@ -37,7 +37,7 @@ public class PerilousResearch extends mage.sets.commander.PerilousResearch {
 
     public PerilousResearch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/sets/coldsnap/SekKuarDeathkeeper.java
index b0bf0e8459..1424e2a58a 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/SekKuarDeathkeeper.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/SekKuarDeathkeeper.java
@@ -37,7 +37,7 @@ public class SekKuarDeathkeeper extends mage.sets.commander2013.SekKuarDeathkeep
 
     public SekKuarDeathkeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredForest.java b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredForest.java
index c1e9634e74..77765d340f 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredForest.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredForest.java
@@ -38,7 +38,7 @@ public class SnowCoveredForest extends mage.sets.iceage.SnowCoveredForest {
 
     public SnowCoveredForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "CSP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredIsland.java b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredIsland.java
index 38657327c5..7c795a4db1 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredIsland.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredIsland.java
@@ -38,7 +38,7 @@ public class SnowCoveredIsland extends mage.sets.iceage.SnowCoveredIsland {
 
     public SnowCoveredIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "CSP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredMountain.java b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredMountain.java
index 9c3fb226de..1c31308585 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredMountain.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredMountain.java
@@ -38,7 +38,7 @@ public class SnowCoveredMountain extends mage.sets.iceage.SnowCoveredMountain {
 
     public SnowCoveredMountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "CSP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredPlains.java b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredPlains.java
index 10d85f0ca5..abe7ca6eb7 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredPlains.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredPlains.java
@@ -38,7 +38,7 @@ public class SnowCoveredPlains extends mage.sets.iceage.SnowCoveredPlains {
 
     public SnowCoveredPlains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "CSP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredSwamp.java b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredSwamp.java
index ab5ddf07dd..4f6a4d3533 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredSwamp.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/SnowCoveredSwamp.java
@@ -38,7 +38,7 @@ public class SnowCoveredSwamp extends mage.sets.iceage.SnowCoveredSwamp {
 
     public SnowCoveredSwamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "CSP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/coldsnap/VanishIntoMemory.java b/Mage.Sets/src/mage/sets/coldsnap/VanishIntoMemory.java
index 27d33a6f65..8daa2b6d87 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/VanishIntoMemory.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/VanishIntoMemory.java
@@ -37,7 +37,7 @@ public class VanishIntoMemory extends mage.sets.venservskoth.VanishIntoMemory {
 
     public VanishIntoMemory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "CSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AcidicSlime.java b/Mage.Sets/src/mage/sets/commander/AcidicSlime.java
index c8cceae075..12a93a7d55 100644
--- a/Mage.Sets/src/mage/sets/commander/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/commander/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Afterlife.java b/Mage.Sets/src/mage/sets/commander/Afterlife.java
index b83fcfb388..df8f578736 100644
--- a/Mage.Sets/src/mage/sets/commander/Afterlife.java
+++ b/Mage.Sets/src/mage/sets/commander/Afterlife.java
@@ -37,7 +37,7 @@ public class Afterlife extends mage.sets.mirage.Afterlife {
 
     public Afterlife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AkoumRefuge.java b/Mage.Sets/src/mage/sets/commander/AkoumRefuge.java
index 5c9897e0cd..f20d7f0aa6 100644
--- a/Mage.Sets/src/mage/sets/commander/AkoumRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander/AkoumRefuge.java
@@ -37,7 +37,7 @@ public class AkoumRefuge extends mage.sets.zendikar.AkoumRefuge {
 
     public AkoumRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AkromasVengeance.java b/Mage.Sets/src/mage/sets/commander/AkromasVengeance.java
index 2f9b9c8b71..fb71ecf486 100644
--- a/Mage.Sets/src/mage/sets/commander/AkromasVengeance.java
+++ b/Mage.Sets/src/mage/sets/commander/AkromasVengeance.java
@@ -37,7 +37,7 @@ public class AkromasVengeance extends mage.sets.planechase.AkromasVengeance {
 
     public AkromasVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AngelOfDespair.java b/Mage.Sets/src/mage/sets/commander/AngelOfDespair.java
index c23498e05b..abb2f0b593 100644
--- a/Mage.Sets/src/mage/sets/commander/AngelOfDespair.java
+++ b/Mage.Sets/src/mage/sets/commander/AngelOfDespair.java
@@ -37,7 +37,7 @@ public class AngelOfDespair extends mage.sets.guildpact.AngelOfDespair {
 
     public AngelOfDespair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AngelicArbiter.java b/Mage.Sets/src/mage/sets/commander/AngelicArbiter.java
index 5122ef738d..25722b9bbf 100644
--- a/Mage.Sets/src/mage/sets/commander/AngelicArbiter.java
+++ b/Mage.Sets/src/mage/sets/commander/AngelicArbiter.java
@@ -37,7 +37,7 @@ public class AngelicArbiter extends mage.sets.magic2011.AngelicArbiter {
 
     public AngelicArbiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Anger.java b/Mage.Sets/src/mage/sets/commander/Anger.java
index 1b86035f99..846ea2688a 100644
--- a/Mage.Sets/src/mage/sets/commander/Anger.java
+++ b/Mage.Sets/src/mage/sets/commander/Anger.java
@@ -37,7 +37,7 @@ public class Anger extends mage.sets.judgment.Anger {
 
     public Anger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AquastrandSpider.java b/Mage.Sets/src/mage/sets/commander/AquastrandSpider.java
index 540b354e4c..2bdff976ab 100644
--- a/Mage.Sets/src/mage/sets/commander/AquastrandSpider.java
+++ b/Mage.Sets/src/mage/sets/commander/AquastrandSpider.java
@@ -37,7 +37,7 @@ public class AquastrandSpider extends mage.sets.dissension.AquastrandSpider {
 
     public AquastrandSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ArbiterOfKnollridge.java b/Mage.Sets/src/mage/sets/commander/ArbiterOfKnollridge.java
index dc87a0af6a..9a879317f7 100644
--- a/Mage.Sets/src/mage/sets/commander/ArbiterOfKnollridge.java
+++ b/Mage.Sets/src/mage/sets/commander/ArbiterOfKnollridge.java
@@ -37,7 +37,7 @@ public class ArbiterOfKnollridge extends mage.sets.lorwyn.ArbiterOfKnollridge {
 
     public ArbiterOfKnollridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ArmillarySphere.java b/Mage.Sets/src/mage/sets/commander/ArmillarySphere.java
index 96000218c8..f69ad8f707 100644
--- a/Mage.Sets/src/mage/sets/commander/ArmillarySphere.java
+++ b/Mage.Sets/src/mage/sets/commander/ArmillarySphere.java
@@ -37,7 +37,7 @@ public class ArmillarySphere extends mage.sets.conflux.ArmillarySphere {
 
     public ArmillarySphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/commander/ArtisanOfKozilek.java
index 5e8dd81260..3589948cc8 100644
--- a/Mage.Sets/src/mage/sets/commander/ArtisanOfKozilek.java
+++ b/Mage.Sets/src/mage/sets/commander/ArtisanOfKozilek.java
@@ -37,7 +37,7 @@ public class ArtisanOfKozilek extends mage.sets.riseoftheeldrazi.ArtisanOfKozile
 
     public ArtisanOfKozilek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Attrition.java b/Mage.Sets/src/mage/sets/commander/Attrition.java
index 20c7f0b181..90e5b2d677 100644
--- a/Mage.Sets/src/mage/sets/commander/Attrition.java
+++ b/Mage.Sets/src/mage/sets/commander/Attrition.java
@@ -37,7 +37,7 @@ public class Attrition extends mage.sets.urzasdestiny.Attrition {
 
     public Attrition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AvatarOfFury.java b/Mage.Sets/src/mage/sets/commander/AvatarOfFury.java
index a219a44715..612351a1d9 100644
--- a/Mage.Sets/src/mage/sets/commander/AvatarOfFury.java
+++ b/Mage.Sets/src/mage/sets/commander/AvatarOfFury.java
@@ -37,7 +37,7 @@ public class AvatarOfFury extends mage.sets.prophecy.AvatarOfFury {
 
     public AvatarOfFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AvatarOfWoe.java b/Mage.Sets/src/mage/sets/commander/AvatarOfWoe.java
index 08f2121ece..411e014bfc 100644
--- a/Mage.Sets/src/mage/sets/commander/AvatarOfWoe.java
+++ b/Mage.Sets/src/mage/sets/commander/AvatarOfWoe.java
@@ -37,7 +37,7 @@ public class AvatarOfWoe extends mage.sets.archenemy.AvatarOfWoe {
 
     public AvatarOfWoe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AwakeningZone.java b/Mage.Sets/src/mage/sets/commander/AwakeningZone.java
index e198b1fc3a..6214f7ef10 100644
--- a/Mage.Sets/src/mage/sets/commander/AwakeningZone.java
+++ b/Mage.Sets/src/mage/sets/commander/AwakeningZone.java
@@ -37,7 +37,7 @@ public class AwakeningZone extends mage.sets.riseoftheeldrazi.AwakeningZone {
 
     public AwakeningZone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AzoriusChancery.java b/Mage.Sets/src/mage/sets/commander/AzoriusChancery.java
index 981d5b203c..e9444715ae 100644
--- a/Mage.Sets/src/mage/sets/commander/AzoriusChancery.java
+++ b/Mage.Sets/src/mage/sets/commander/AzoriusChancery.java
@@ -37,7 +37,7 @@ public class AzoriusChancery extends mage.sets.dissension.AzoriusChancery {
 
     public AzoriusChancery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/AzoriusGuildmage.java b/Mage.Sets/src/mage/sets/commander/AzoriusGuildmage.java
index a09c428148..111a8765fd 100644
--- a/Mage.Sets/src/mage/sets/commander/AzoriusGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander/AzoriusGuildmage.java
@@ -37,7 +37,7 @@ public class AzoriusGuildmage extends mage.sets.dissension.AzoriusGuildmage {
 
     public AzoriusGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BalothWoodcrasher.java b/Mage.Sets/src/mage/sets/commander/BalothWoodcrasher.java
index 401c583ba3..e61091b468 100644
--- a/Mage.Sets/src/mage/sets/commander/BalothWoodcrasher.java
+++ b/Mage.Sets/src/mage/sets/commander/BalothWoodcrasher.java
@@ -37,7 +37,7 @@ public class BalothWoodcrasher extends mage.sets.zendikar.BalothWoodcrasher {
 
     public BalothWoodcrasher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BarrenMoor.java b/Mage.Sets/src/mage/sets/commander/BarrenMoor.java
index 9bee2286b6..b7c7fd3b3e 100644
--- a/Mage.Sets/src/mage/sets/commander/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/commander/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BestialMenace.java b/Mage.Sets/src/mage/sets/commander/BestialMenace.java
index adca8d0fb1..e508224077 100644
--- a/Mage.Sets/src/mage/sets/commander/BestialMenace.java
+++ b/Mage.Sets/src/mage/sets/commander/BestialMenace.java
@@ -37,7 +37,7 @@ public class BestialMenace extends mage.sets.worldwake.BestialMenace {
 
     public BestialMenace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BojukaBog.java b/Mage.Sets/src/mage/sets/commander/BojukaBog.java
index de1ba88e79..c2c751161b 100644
--- a/Mage.Sets/src/mage/sets/commander/BojukaBog.java
+++ b/Mage.Sets/src/mage/sets/commander/BojukaBog.java
@@ -37,7 +37,7 @@ public class BojukaBog extends mage.sets.worldwake.BojukaBog {
 
     public BojukaBog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BorosGarrison.java b/Mage.Sets/src/mage/sets/commander/BorosGarrison.java
index e3fd606cb1..680511e416 100644
--- a/Mage.Sets/src/mage/sets/commander/BorosGarrison.java
+++ b/Mage.Sets/src/mage/sets/commander/BorosGarrison.java
@@ -37,7 +37,7 @@ public class BorosGarrison extends mage.sets.planechase.BorosGarrison {
 
     public BorosGarrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BorosGuildmage.java b/Mage.Sets/src/mage/sets/commander/BorosGuildmage.java
index 800ec2d051..dd5bee4662 100644
--- a/Mage.Sets/src/mage/sets/commander/BorosGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander/BorosGuildmage.java
@@ -37,7 +37,7 @@ public class BorosGuildmage extends mage.sets.ravnica.BorosGuildmage {
 
     public BorosGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/BorosSignet.java b/Mage.Sets/src/mage/sets/commander/BorosSignet.java
index 26e979b879..3d49f1d113 100644
--- a/Mage.Sets/src/mage/sets/commander/BorosSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/BorosSignet.java
@@ -37,7 +37,7 @@ public class BorosSignet extends mage.sets.ravnica.BorosSignet {
 
     public BorosSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Brainstorm.java b/Mage.Sets/src/mage/sets/commander/Brainstorm.java
index 760bdc7bab..1740d712e9 100644
--- a/Mage.Sets/src/mage/sets/commander/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/commander/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Brawn.java b/Mage.Sets/src/mage/sets/commander/Brawn.java
index 683a45ac9c..587e999539 100644
--- a/Mage.Sets/src/mage/sets/commander/Brawn.java
+++ b/Mage.Sets/src/mage/sets/commander/Brawn.java
@@ -37,7 +37,7 @@ public class Brawn extends mage.sets.judgment.Brawn {
 
     public Brawn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/commander/ButcherOfMalakir.java
index 49cd19a274..25423a6c8c 100644
--- a/Mage.Sets/src/mage/sets/commander/ButcherOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/commander/ButcherOfMalakir.java
@@ -37,7 +37,7 @@ public class ButcherOfMalakir extends mage.sets.worldwake.ButcherOfMalakir {
 
     public ButcherOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ChainReaction.java b/Mage.Sets/src/mage/sets/commander/ChainReaction.java
index 779ee7775f..286eba0f51 100644
--- a/Mage.Sets/src/mage/sets/commander/ChainReaction.java
+++ b/Mage.Sets/src/mage/sets/commander/ChainReaction.java
@@ -37,7 +37,7 @@ public class ChainReaction extends mage.sets.worldwake.ChainReaction {
 
     public ChainReaction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ChaosWarp.java b/Mage.Sets/src/mage/sets/commander/ChaosWarp.java
index 872b9ffe44..1c7e3b3151 100644
--- a/Mage.Sets/src/mage/sets/commander/ChaosWarp.java
+++ b/Mage.Sets/src/mage/sets/commander/ChaosWarp.java
@@ -37,7 +37,7 @@ public class ChaosWarp extends mage.sets.vintagemasters.ChaosWarp {
 
     public ChaosWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ChartoothCougar.java b/Mage.Sets/src/mage/sets/commander/ChartoothCougar.java
index 50521c31c8..d378d86ef3 100644
--- a/Mage.Sets/src/mage/sets/commander/ChartoothCougar.java
+++ b/Mage.Sets/src/mage/sets/commander/ChartoothCougar.java
@@ -37,7 +37,7 @@ public class ChartoothCougar extends mage.sets.scourge.ChartoothCougar {
 
     public ChartoothCougar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/CleansingBeam.java b/Mage.Sets/src/mage/sets/commander/CleansingBeam.java
index 8d61c6a217..7a261a7fa5 100644
--- a/Mage.Sets/src/mage/sets/commander/CleansingBeam.java
+++ b/Mage.Sets/src/mage/sets/commander/CleansingBeam.java
@@ -37,7 +37,7 @@ public class CleansingBeam extends mage.sets.ravnica.CleansingBeam {
 
     public CleansingBeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/CobraTrap.java b/Mage.Sets/src/mage/sets/commander/CobraTrap.java
index 1f02a3d376..2c9b19e395 100644
--- a/Mage.Sets/src/mage/sets/commander/CobraTrap.java
+++ b/Mage.Sets/src/mage/sets/commander/CobraTrap.java
@@ -37,7 +37,7 @@ public class CobraTrap extends mage.sets.zendikar.CobraTrap {
 
     public CobraTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ColossalMight.java b/Mage.Sets/src/mage/sets/commander/ColossalMight.java
index 0783cfecb6..20d2dd9d30 100644
--- a/Mage.Sets/src/mage/sets/commander/ColossalMight.java
+++ b/Mage.Sets/src/mage/sets/commander/ColossalMight.java
@@ -37,7 +37,7 @@ public class ColossalMight extends mage.sets.alarareborn.ColossalMight {
 
     public ColossalMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/CometStorm.java b/Mage.Sets/src/mage/sets/commander/CometStorm.java
index 5298237c4d..78ee8bee06 100644
--- a/Mage.Sets/src/mage/sets/commander/CometStorm.java
+++ b/Mage.Sets/src/mage/sets/commander/CometStorm.java
@@ -37,7 +37,7 @@ public class CometStorm extends mage.sets.worldwake.CometStorm {
 
     public CometStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/CommandTower.java b/Mage.Sets/src/mage/sets/commander/CommandTower.java
index a35d964316..5b325342a4 100644
--- a/Mage.Sets/src/mage/sets/commander/CommandTower.java
+++ b/Mage.Sets/src/mage/sets/commander/CommandTower.java
@@ -37,7 +37,7 @@ public class CommandTower extends mage.sets.commander2013.CommandTower {
 
     public CommandTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Congregate.java b/Mage.Sets/src/mage/sets/commander/Congregate.java
index 414e50b9f7..a69c2bb4d1 100644
--- a/Mage.Sets/src/mage/sets/commander/Congregate.java
+++ b/Mage.Sets/src/mage/sets/commander/Congregate.java
@@ -37,7 +37,7 @@ public class Congregate extends mage.sets.urzassaga.Congregate {
 
     public Congregate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ConundrumSphinx.java b/Mage.Sets/src/mage/sets/commander/ConundrumSphinx.java
index dd94e2ee90..c398296d5b 100644
--- a/Mage.Sets/src/mage/sets/commander/ConundrumSphinx.java
+++ b/Mage.Sets/src/mage/sets/commander/ConundrumSphinx.java
@@ -37,7 +37,7 @@ public class ConundrumSphinx extends mage.sets.magic2011.ConundrumSphinx {
 
     public ConundrumSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/CrescendoOfWar.java b/Mage.Sets/src/mage/sets/commander/CrescendoOfWar.java
index a2799d9dfc..0e4cacef71 100644
--- a/Mage.Sets/src/mage/sets/commander/CrescendoOfWar.java
+++ b/Mage.Sets/src/mage/sets/commander/CrescendoOfWar.java
@@ -37,7 +37,7 @@ public class CrescendoOfWar extends mage.sets.vintagemasters.CrescendoOfWar {
 
     public CrescendoOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Cultivate.java b/Mage.Sets/src/mage/sets/commander/Cultivate.java
index 0ed13ab2af..a2af6d5078 100644
--- a/Mage.Sets/src/mage/sets/commander/Cultivate.java
+++ b/Mage.Sets/src/mage/sets/commander/Cultivate.java
@@ -37,7 +37,7 @@ public class Cultivate extends mage.sets.magic2011.Cultivate {
 
     public Cultivate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DarkHatchling.java b/Mage.Sets/src/mage/sets/commander/DarkHatchling.java
index b21482d3dd..9a925b920f 100644
--- a/Mage.Sets/src/mage/sets/commander/DarkHatchling.java
+++ b/Mage.Sets/src/mage/sets/commander/DarkHatchling.java
@@ -37,7 +37,7 @@ public class DarkHatchling extends mage.sets.urzassaga.DarkHatchling {
 
     public DarkHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DarksteelIngot.java b/Mage.Sets/src/mage/sets/commander/DarksteelIngot.java
index 6330533422..aedb5ccdf1 100644
--- a/Mage.Sets/src/mage/sets/commander/DarksteelIngot.java
+++ b/Mage.Sets/src/mage/sets/commander/DarksteelIngot.java
@@ -37,7 +37,7 @@ public class DarksteelIngot extends mage.sets.darksteel.DarksteelIngot {
 
     public DarksteelIngot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/commander/DeadlyRecluse.java
index 795713484d..b6f4472a52 100644
--- a/Mage.Sets/src/mage/sets/commander/DeadlyRecluse.java
+++ b/Mage.Sets/src/mage/sets/commander/DeadlyRecluse.java
@@ -37,7 +37,7 @@ public class DeadlyRecluse extends mage.sets.magic2010.DeadlyRecluse {
 
     public DeadlyRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DeadwoodTreefolk.java b/Mage.Sets/src/mage/sets/commander/DeadwoodTreefolk.java
index 7f78dd9365..49bfa93598 100644
--- a/Mage.Sets/src/mage/sets/commander/DeadwoodTreefolk.java
+++ b/Mage.Sets/src/mage/sets/commander/DeadwoodTreefolk.java
@@ -37,7 +37,7 @@ public class DeadwoodTreefolk extends mage.sets.commander2013.DeadwoodTreefolk {
 
     public DeadwoodTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DeathMutation.java b/Mage.Sets/src/mage/sets/commander/DeathMutation.java
index a309b20c8f..d326bac09d 100644
--- a/Mage.Sets/src/mage/sets/commander/DeathMutation.java
+++ b/Mage.Sets/src/mage/sets/commander/DeathMutation.java
@@ -37,7 +37,7 @@ public class DeathMutation extends mage.sets.apocalypse.DeathMutation {
 
     public DeathMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DiabolicTutor.java b/Mage.Sets/src/mage/sets/commander/DiabolicTutor.java
index baa57872de..12e57707cb 100644
--- a/Mage.Sets/src/mage/sets/commander/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/commander/DiabolicTutor.java
@@ -37,7 +37,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DimirAqueduct.java b/Mage.Sets/src/mage/sets/commander/DimirAqueduct.java
index 7829315122..46ccf8b689 100644
--- a/Mage.Sets/src/mage/sets/commander/DimirAqueduct.java
+++ b/Mage.Sets/src/mage/sets/commander/DimirAqueduct.java
@@ -37,7 +37,7 @@ public class DimirAqueduct extends mage.sets.ravnica.DimirAqueduct {
 
     public DimirAqueduct(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DimirSignet.java b/Mage.Sets/src/mage/sets/commander/DimirSignet.java
index 6831ffa912..9aebd0c427 100644
--- a/Mage.Sets/src/mage/sets/commander/DimirSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/DimirSignet.java
@@ -37,7 +37,7 @@ public class DimirSignet extends mage.sets.ravnica.DimirSignet {
 
     public DimirSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DisasterRadius.java b/Mage.Sets/src/mage/sets/commander/DisasterRadius.java
index 8f1ac8126f..d7abe708d7 100644
--- a/Mage.Sets/src/mage/sets/commander/DisasterRadius.java
+++ b/Mage.Sets/src/mage/sets/commander/DisasterRadius.java
@@ -37,7 +37,7 @@ public class DisasterRadius extends mage.sets.riseoftheeldrazi.DisasterRadius {
 
     public DisasterRadius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DominusOfFealty.java b/Mage.Sets/src/mage/sets/commander/DominusOfFealty.java
index bf4881012d..1cfe278675 100644
--- a/Mage.Sets/src/mage/sets/commander/DominusOfFealty.java
+++ b/Mage.Sets/src/mage/sets/commander/DominusOfFealty.java
@@ -37,7 +37,7 @@ public class DominusOfFealty extends mage.sets.eventide.DominusOfFealty {
 
     public DominusOfFealty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DoomBlade.java b/Mage.Sets/src/mage/sets/commander/DoomBlade.java
index 6a482cbe74..327bb824aa 100644
--- a/Mage.Sets/src/mage/sets/commander/DoomBlade.java
+++ b/Mage.Sets/src/mage/sets/commander/DoomBlade.java
@@ -37,7 +37,7 @@ public class DoomBlade extends mage.sets.magic2010.DoomBlade {
 
     public DoomBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DragonWhelp.java b/Mage.Sets/src/mage/sets/commander/DragonWhelp.java
index 2eabd49377..0d15b47cff 100644
--- a/Mage.Sets/src/mage/sets/commander/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/commander/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DreambornMuse.java b/Mage.Sets/src/mage/sets/commander/DreambornMuse.java
index 0848e8852b..f6eb71a556 100644
--- a/Mage.Sets/src/mage/sets/commander/DreambornMuse.java
+++ b/Mage.Sets/src/mage/sets/commander/DreambornMuse.java
@@ -37,7 +37,7 @@ public class DreambornMuse extends mage.sets.legions.DreambornMuse {
 
     public DreambornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/DreamstoneHedron.java b/Mage.Sets/src/mage/sets/commander/DreamstoneHedron.java
index c80a62af5d..cf01e203ce 100644
--- a/Mage.Sets/src/mage/sets/commander/DreamstoneHedron.java
+++ b/Mage.Sets/src/mage/sets/commander/DreamstoneHedron.java
@@ -37,7 +37,7 @@ public class DreamstoneHedron extends mage.sets.riseoftheeldrazi.DreamstoneHedro
 
     public DreamstoneHedron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Earthquake.java b/Mage.Sets/src/mage/sets/commander/Earthquake.java
index e2aad7ba85..42c2ee9425 100644
--- a/Mage.Sets/src/mage/sets/commander/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/commander/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Electrolyze.java b/Mage.Sets/src/mage/sets/commander/Electrolyze.java
index 843396acb3..99edb0019a 100644
--- a/Mage.Sets/src/mage/sets/commander/Electrolyze.java
+++ b/Mage.Sets/src/mage/sets/commander/Electrolyze.java
@@ -37,7 +37,7 @@ public class Electrolyze extends mage.sets.guildpact.Electrolyze {
 
     public Electrolyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ElvishAberration.java b/Mage.Sets/src/mage/sets/commander/ElvishAberration.java
index 6bdee2a9b6..e028931953 100644
--- a/Mage.Sets/src/mage/sets/commander/ElvishAberration.java
+++ b/Mage.Sets/src/mage/sets/commander/ElvishAberration.java
@@ -37,7 +37,7 @@ public class ElvishAberration extends mage.sets.scourge.ElvishAberration {
 
     public ElvishAberration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/EternalWitness.java b/Mage.Sets/src/mage/sets/commander/EternalWitness.java
index c730f3b879..a400d680dd 100644
--- a/Mage.Sets/src/mage/sets/commander/EternalWitness.java
+++ b/Mage.Sets/src/mage/sets/commander/EternalWitness.java
@@ -37,7 +37,7 @@ public class EternalWitness extends mage.sets.fifthdawn.EternalWitness {
 
     public EternalWitness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/EvincarsJustice.java b/Mage.Sets/src/mage/sets/commander/EvincarsJustice.java
index 820693b253..d8d560c365 100644
--- a/Mage.Sets/src/mage/sets/commander/EvincarsJustice.java
+++ b/Mage.Sets/src/mage/sets/commander/EvincarsJustice.java
@@ -37,7 +37,7 @@ public class EvincarsJustice extends mage.sets.tempest.EvincarsJustice {
 
     public EvincarsJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/EvolvingWilds.java b/Mage.Sets/src/mage/sets/commander/EvolvingWilds.java
index c8561c9b7c..7989f961b4 100644
--- a/Mage.Sets/src/mage/sets/commander/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/commander/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/commander/ExplosiveVegetation.java
index b5d333c374..07ddd35523 100644
--- a/Mage.Sets/src/mage/sets/commander/ExplosiveVegetation.java
+++ b/Mage.Sets/src/mage/sets/commander/ExplosiveVegetation.java
@@ -37,7 +37,7 @@ public class ExplosiveVegetation extends mage.sets.planechase.ExplosiveVegetatio
 
     public ExplosiveVegetation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ExtractorDemon.java b/Mage.Sets/src/mage/sets/commander/ExtractorDemon.java
index d24d1551d8..291cbec7f5 100644
--- a/Mage.Sets/src/mage/sets/commander/ExtractorDemon.java
+++ b/Mage.Sets/src/mage/sets/commander/ExtractorDemon.java
@@ -37,7 +37,7 @@ public class ExtractorDemon extends mage.sets.conflux.ExtractorDemon {
 
     public ExtractorDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FactOrFiction.java b/Mage.Sets/src/mage/sets/commander/FactOrFiction.java
index cd5bde560d..6ad38286fe 100644
--- a/Mage.Sets/src/mage/sets/commander/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/commander/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FallenAngel.java b/Mage.Sets/src/mage/sets/commander/FallenAngel.java
index f62f4f8782..be17b5fa46 100644
--- a/Mage.Sets/src/mage/sets/commander/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/commander/FallenAngel.java
@@ -37,7 +37,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FalseProphet.java b/Mage.Sets/src/mage/sets/commander/FalseProphet.java
index b714ecc20b..cf13802092 100644
--- a/Mage.Sets/src/mage/sets/commander/FalseProphet.java
+++ b/Mage.Sets/src/mage/sets/commander/FalseProphet.java
@@ -38,7 +38,7 @@ public class FalseProphet extends mage.sets.urzasdestiny.FalseProphet {
 
     public FalseProphet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FellwarStone.java b/Mage.Sets/src/mage/sets/commander/FellwarStone.java
index a755802ae4..830333b4d2 100644
--- a/Mage.Sets/src/mage/sets/commander/FellwarStone.java
+++ b/Mage.Sets/src/mage/sets/commander/FellwarStone.java
@@ -37,7 +37,7 @@ public class FellwarStone extends mage.sets.ninthedition.FellwarStone {
 
     public FellwarStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FireIce.java b/Mage.Sets/src/mage/sets/commander/FireIce.java
index 5a268e7969..8fdfc82fe3 100644
--- a/Mage.Sets/src/mage/sets/commander/FireIce.java
+++ b/Mage.Sets/src/mage/sets/commander/FireIce.java
@@ -37,7 +37,7 @@ public class FireIce extends mage.sets.apocalypse.FireIce {
 
     public FireIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Firespout.java b/Mage.Sets/src/mage/sets/commander/Firespout.java
index 988c9bc2fe..21af6c8450 100644
--- a/Mage.Sets/src/mage/sets/commander/Firespout.java
+++ b/Mage.Sets/src/mage/sets/commander/Firespout.java
@@ -37,7 +37,7 @@ public class Firespout extends mage.sets.shadowmoor.Firespout {
 
     public Firespout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FistsOfIronwood.java b/Mage.Sets/src/mage/sets/commander/FistsOfIronwood.java
index c686d71da6..19fd59a051 100644
--- a/Mage.Sets/src/mage/sets/commander/FistsOfIronwood.java
+++ b/Mage.Sets/src/mage/sets/commander/FistsOfIronwood.java
@@ -37,7 +37,7 @@ public class FistsOfIronwood extends mage.sets.ravnica.FistsOfIronwood {
 
     public FistsOfIronwood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FlametongueKavu.java b/Mage.Sets/src/mage/sets/commander/FlametongueKavu.java
index 237e1e7dde..0fcc737bd5 100644
--- a/Mage.Sets/src/mage/sets/commander/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/commander/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/commander/FleshbagMarauder.java
index 5754e27475..abea3de878 100644
--- a/Mage.Sets/src/mage/sets/commander/FleshbagMarauder.java
+++ b/Mage.Sets/src/mage/sets/commander/FleshbagMarauder.java
@@ -37,7 +37,7 @@ public class FleshbagMarauder extends mage.sets.shardsofalara.FleshbagMarauder {
 
     public FleshbagMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FogBank.java b/Mage.Sets/src/mage/sets/commander/FogBank.java
index cb8d346b01..2a9e74a0f8 100644
--- a/Mage.Sets/src/mage/sets/commander/FogBank.java
+++ b/Mage.Sets/src/mage/sets/commander/FogBank.java
@@ -37,7 +37,7 @@ public class FogBank extends mage.sets.urzassaga.FogBank {
 
     public FogBank(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ForgottenCave.java b/Mage.Sets/src/mage/sets/commander/ForgottenCave.java
index 9ef7956459..ba9b6d656c 100644
--- a/Mage.Sets/src/mage/sets/commander/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/commander/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/commander/FurnaceWhelp.java
index a21c494e6c..7fbf15a3aa 100644
--- a/Mage.Sets/src/mage/sets/commander/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/commander/FurnaceWhelp.java
@@ -37,7 +37,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
 
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/commander/GarrukWildspeaker.java
index af2c1303f9..72512487a2 100644
--- a/Mage.Sets/src/mage/sets/commander/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/commander/GarrukWildspeaker.java
@@ -37,7 +37,7 @@ public class GarrukWildspeaker extends mage.sets.magic2010.GarrukWildspeaker {
 
     public GarrukWildspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GhostlyPrison.java b/Mage.Sets/src/mage/sets/commander/GhostlyPrison.java
index a348119c76..b65b7e6913 100644
--- a/Mage.Sets/src/mage/sets/commander/GhostlyPrison.java
+++ b/Mage.Sets/src/mage/sets/commander/GhostlyPrison.java
@@ -37,7 +37,7 @@ public class GhostlyPrison extends mage.sets.championsofkamigawa.GhostlyPrison {
 
     public GhostlyPrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GoblinCadets.java b/Mage.Sets/src/mage/sets/commander/GoblinCadets.java
index 86ac0bcfe6..08fa3467ee 100644
--- a/Mage.Sets/src/mage/sets/commander/GoblinCadets.java
+++ b/Mage.Sets/src/mage/sets/commander/GoblinCadets.java
@@ -37,7 +37,7 @@ public class GoblinCadets extends mage.sets.urzassaga.GoblinCadets {
 
     public GoblinCadets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GolgariGuildmage.java b/Mage.Sets/src/mage/sets/commander/GolgariGuildmage.java
index d855b212c5..93ca4cc355 100644
--- a/Mage.Sets/src/mage/sets/commander/GolgariGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander/GolgariGuildmage.java
@@ -37,7 +37,7 @@ public class GolgariGuildmage extends mage.sets.ravnica.GolgariGuildmage {
 
     public GolgariGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/commander/GolgariRotFarm.java
index 4b0913407c..2005cb51d4 100644
--- a/Mage.Sets/src/mage/sets/commander/GolgariRotFarm.java
+++ b/Mage.Sets/src/mage/sets/commander/GolgariRotFarm.java
@@ -37,7 +37,7 @@ public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
 
     public GolgariRotFarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GolgariSignet.java b/Mage.Sets/src/mage/sets/commander/GolgariSignet.java
index 2c8ca05bd7..94ee8c1cbf 100644
--- a/Mage.Sets/src/mage/sets/commander/GolgariSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/GolgariSignet.java
@@ -37,7 +37,7 @@ public class GolgariSignet extends mage.sets.ravnica.GolgariSignet {
 
     public GolgariSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Gomazoa.java b/Mage.Sets/src/mage/sets/commander/Gomazoa.java
index 2e5788db9f..7eecba3985 100644
--- a/Mage.Sets/src/mage/sets/commander/Gomazoa.java
+++ b/Mage.Sets/src/mage/sets/commander/Gomazoa.java
@@ -37,7 +37,7 @@ public class Gomazoa extends mage.sets.zendikar.Gomazoa {
 
     public Gomazoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GravePact.java b/Mage.Sets/src/mage/sets/commander/GravePact.java
index 1c79d82b06..12ab6ec9c9 100644
--- a/Mage.Sets/src/mage/sets/commander/GravePact.java
+++ b/Mage.Sets/src/mage/sets/commander/GravePact.java
@@ -37,7 +37,7 @@ public class GravePact extends mage.sets.ninthedition.GravePact {
 
     public GravePact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Gravedigger.java b/Mage.Sets/src/mage/sets/commander/Gravedigger.java
index 48696288b0..a781da56d6 100644
--- a/Mage.Sets/src/mage/sets/commander/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/commander/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GruulSignet.java b/Mage.Sets/src/mage/sets/commander/GruulSignet.java
index 7f33b26035..34f8b9c610 100644
--- a/Mage.Sets/src/mage/sets/commander/GruulSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/GruulSignet.java
@@ -37,7 +37,7 @@ public class GruulSignet extends mage.sets.guildpact.GruulSignet {
 
     public GruulSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GruulTurf.java b/Mage.Sets/src/mage/sets/commander/GruulTurf.java
index 521c823a17..8199975f4d 100644
--- a/Mage.Sets/src/mage/sets/commander/GruulTurf.java
+++ b/Mage.Sets/src/mage/sets/commander/GruulTurf.java
@@ -37,7 +37,7 @@ public class GruulTurf extends mage.sets.planechase.GruulTurf {
 
     public GruulTurf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/GuardGomazoa.java b/Mage.Sets/src/mage/sets/commander/GuardGomazoa.java
index ae8d30d997..a35b538441 100644
--- a/Mage.Sets/src/mage/sets/commander/GuardGomazoa.java
+++ b/Mage.Sets/src/mage/sets/commander/GuardGomazoa.java
@@ -37,7 +37,7 @@ public class GuardGomazoa extends mage.sets.riseoftheeldrazi.GuardGomazoa {
 
     public GuardGomazoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Harmonize.java b/Mage.Sets/src/mage/sets/commander/Harmonize.java
index d2e7078280..b1de004aef 100644
--- a/Mage.Sets/src/mage/sets/commander/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/commander/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Hex.java b/Mage.Sets/src/mage/sets/commander/Hex.java
index 7859b398ab..7d6155d862 100644
--- a/Mage.Sets/src/mage/sets/commander/Hex.java
+++ b/Mage.Sets/src/mage/sets/commander/Hex.java
@@ -37,7 +37,7 @@ public class Hex extends mage.sets.ravnica.Hex {
 
     public Hex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/HomewardPath.java b/Mage.Sets/src/mage/sets/commander/HomewardPath.java
index 558ba6cce9..d3b99820b3 100644
--- a/Mage.Sets/src/mage/sets/commander/HomewardPath.java
+++ b/Mage.Sets/src/mage/sets/commander/HomewardPath.java
@@ -37,7 +37,7 @@ public class HomewardPath extends mage.sets.commander2013.HomewardPath {
 
     public HomewardPath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/HourOfReckoning.java b/Mage.Sets/src/mage/sets/commander/HourOfReckoning.java
index f650131e1b..55031aa391 100644
--- a/Mage.Sets/src/mage/sets/commander/HourOfReckoning.java
+++ b/Mage.Sets/src/mage/sets/commander/HourOfReckoning.java
@@ -37,7 +37,7 @@ public class HourOfReckoning extends mage.sets.ravnica.HourOfReckoning {
 
     public HourOfReckoning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/HowlingMine.java b/Mage.Sets/src/mage/sets/commander/HowlingMine.java
index 01b4194d73..d320dfbc8a 100644
--- a/Mage.Sets/src/mage/sets/commander/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/commander/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/HullBreach.java b/Mage.Sets/src/mage/sets/commander/HullBreach.java
index efac1bac16..481434e1c1 100644
--- a/Mage.Sets/src/mage/sets/commander/HullBreach.java
+++ b/Mage.Sets/src/mage/sets/commander/HullBreach.java
@@ -37,7 +37,7 @@ public class HullBreach extends mage.sets.commander2013.HullBreach {
 
     public HullBreach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/HuntingPack.java b/Mage.Sets/src/mage/sets/commander/HuntingPack.java
index f79085477e..43eb0e76dd 100644
--- a/Mage.Sets/src/mage/sets/commander/HuntingPack.java
+++ b/Mage.Sets/src/mage/sets/commander/HuntingPack.java
@@ -37,7 +37,7 @@ public class HuntingPack extends mage.sets.scourge.HuntingPack {
 
     public HuntingPack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Insurrection.java b/Mage.Sets/src/mage/sets/commander/Insurrection.java
index e97cc04410..848f890b53 100644
--- a/Mage.Sets/src/mage/sets/commander/Insurrection.java
+++ b/Mage.Sets/src/mage/sets/commander/Insurrection.java
@@ -37,7 +37,7 @@ public class Insurrection extends mage.sets.onslaught.Insurrection {
 
     public Insurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java b/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java
index 372c4b77da..1dfd7dd40e 100644
--- a/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java
+++ b/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java
@@ -37,7 +37,7 @@ public class IntetTheDreamer extends mage.sets.planarchaos.IntetTheDreamer {
 
     public IntetTheDreamer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/commander/IzzetBoilerworks.java
index 6b107c1ece..a19c14c379 100644
--- a/Mage.Sets/src/mage/sets/commander/IzzetBoilerworks.java
+++ b/Mage.Sets/src/mage/sets/commander/IzzetBoilerworks.java
@@ -37,7 +37,7 @@ public class IzzetBoilerworks extends mage.sets.guildpact.IzzetBoilerworks {
 
     public IzzetBoilerworks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/IzzetChronarch.java b/Mage.Sets/src/mage/sets/commander/IzzetChronarch.java
index b90f29a71e..8526013747 100644
--- a/Mage.Sets/src/mage/sets/commander/IzzetChronarch.java
+++ b/Mage.Sets/src/mage/sets/commander/IzzetChronarch.java
@@ -37,7 +37,7 @@ public class IzzetChronarch extends mage.sets.guildpact.IzzetChronarch {
 
     public IzzetChronarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/IzzetSignet.java b/Mage.Sets/src/mage/sets/commander/IzzetSignet.java
index f30117dde2..d7c558e790 100644
--- a/Mage.Sets/src/mage/sets/commander/IzzetSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/IzzetSignet.java
@@ -37,7 +37,7 @@ public class IzzetSignet extends mage.sets.guildpact.IzzetSignet {
 
     public IzzetSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/JotunGrunt.java b/Mage.Sets/src/mage/sets/commander/JotunGrunt.java
index 02571b4724..2178f446df 100644
--- a/Mage.Sets/src/mage/sets/commander/JotunGrunt.java
+++ b/Mage.Sets/src/mage/sets/commander/JotunGrunt.java
@@ -37,7 +37,7 @@ public class JotunGrunt extends mage.sets.coldsnap.JotunGrunt {
 
     public JotunGrunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/JourneyToNowhere.java b/Mage.Sets/src/mage/sets/commander/JourneyToNowhere.java
index 15b34bfd09..a9c6b09af6 100644
--- a/Mage.Sets/src/mage/sets/commander/JourneyToNowhere.java
+++ b/Mage.Sets/src/mage/sets/commander/JourneyToNowhere.java
@@ -37,7 +37,7 @@ public class JourneyToNowhere extends mage.sets.zendikar.JourneyToNowhere {
 
     public JourneyToNowhere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/JwarIsleRefuge.java b/Mage.Sets/src/mage/sets/commander/JwarIsleRefuge.java
index b1785ec015..1a30c6f239 100644
--- a/Mage.Sets/src/mage/sets/commander/JwarIsleRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander/JwarIsleRefuge.java
@@ -37,7 +37,7 @@ public class JwarIsleRefuge extends mage.sets.zendikar.JwarIsleRefuge {
 
     public JwarIsleRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/KazanduRefuge.java b/Mage.Sets/src/mage/sets/commander/KazanduRefuge.java
index 199ebbaf92..a5317beacf 100644
--- a/Mage.Sets/src/mage/sets/commander/KazanduRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander/KazanduRefuge.java
@@ -37,7 +37,7 @@ public class KazanduRefuge extends mage.sets.zendikar.KazanduRefuge {
 
     public KazanduRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/KrosanTusker.java b/Mage.Sets/src/mage/sets/commander/KrosanTusker.java
index a3484fb66d..4283d7373f 100644
--- a/Mage.Sets/src/mage/sets/commander/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/commander/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Lhurgoyf.java b/Mage.Sets/src/mage/sets/commander/Lhurgoyf.java
index 697f7dbb0a..2b7e772600 100644
--- a/Mage.Sets/src/mage/sets/commander/Lhurgoyf.java
+++ b/Mage.Sets/src/mage/sets/commander/Lhurgoyf.java
@@ -37,7 +37,7 @@ public class Lhurgoyf extends mage.sets.iceage.Lhurgoyf {
 
     public Lhurgoyf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/LightkeeperOfEmeria.java b/Mage.Sets/src/mage/sets/commander/LightkeeperOfEmeria.java
index a7891b48d0..2b9fff35da 100644
--- a/Mage.Sets/src/mage/sets/commander/LightkeeperOfEmeria.java
+++ b/Mage.Sets/src/mage/sets/commander/LightkeeperOfEmeria.java
@@ -37,7 +37,7 @@ public class LightkeeperOfEmeria extends mage.sets.worldwake.LightkeeperOfEmeria
 
     public LightkeeperOfEmeria(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/LightningGreaves.java b/Mage.Sets/src/mage/sets/commander/LightningGreaves.java
index 888578fa36..9d6325ea77 100644
--- a/Mage.Sets/src/mage/sets/commander/LightningGreaves.java
+++ b/Mage.Sets/src/mage/sets/commander/LightningGreaves.java
@@ -37,7 +37,7 @@ public class LightningGreaves extends mage.sets.mirrodin.LightningGreaves {
 
     public LightningGreaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/LivingDeath.java b/Mage.Sets/src/mage/sets/commander/LivingDeath.java
index 1b853bddd0..442c38d4cc 100644
--- a/Mage.Sets/src/mage/sets/commander/LivingDeath.java
+++ b/Mage.Sets/src/mage/sets/commander/LivingDeath.java
@@ -37,7 +37,7 @@ public class LivingDeath extends mage.sets.tempest.LivingDeath {
 
     public LivingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/LonelySandbar.java b/Mage.Sets/src/mage/sets/commander/LonelySandbar.java
index 2b002d63d2..05bcaf90d2 100644
--- a/Mage.Sets/src/mage/sets/commander/LonelySandbar.java
+++ b/Mage.Sets/src/mage/sets/commander/LonelySandbar.java
@@ -37,7 +37,7 @@ public class LonelySandbar extends mage.sets.onslaught.LonelySandbar {
 
     public LonelySandbar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Malfegor.java b/Mage.Sets/src/mage/sets/commander/Malfegor.java
index c2bb281ca0..70bd6b57da 100644
--- a/Mage.Sets/src/mage/sets/commander/Malfegor.java
+++ b/Mage.Sets/src/mage/sets/commander/Malfegor.java
@@ -37,7 +37,7 @@ public class Malfegor extends mage.sets.conflux.Malfegor {
 
     public Malfegor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/MemoryErosion.java b/Mage.Sets/src/mage/sets/commander/MemoryErosion.java
index 0a4f103132..1202f69c82 100644
--- a/Mage.Sets/src/mage/sets/commander/MemoryErosion.java
+++ b/Mage.Sets/src/mage/sets/commander/MemoryErosion.java
@@ -37,7 +37,7 @@ public class MemoryErosion extends mage.sets.shardsofalara.MemoryErosion {
 
     public MemoryErosion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/MoltenSlagheap.java b/Mage.Sets/src/mage/sets/commander/MoltenSlagheap.java
index 36123d8a45..87d483abc1 100644
--- a/Mage.Sets/src/mage/sets/commander/MoltenSlagheap.java
+++ b/Mage.Sets/src/mage/sets/commander/MoltenSlagheap.java
@@ -37,7 +37,7 @@ public class MoltenSlagheap extends mage.sets.commander2013.MoltenSlagheap {
 
     public MoltenSlagheap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/MonkRealist.java b/Mage.Sets/src/mage/sets/commander/MonkRealist.java
index 25d5c90680..4b40cf975b 100644
--- a/Mage.Sets/src/mage/sets/commander/MonkRealist.java
+++ b/Mage.Sets/src/mage/sets/commander/MonkRealist.java
@@ -37,7 +37,7 @@ public class MonkRealist extends mage.sets.urzassaga.MonkRealist {
 
     public MonkRealist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Mortify.java b/Mage.Sets/src/mage/sets/commander/Mortify.java
index 5d764df519..d34c6d36c3 100644
--- a/Mage.Sets/src/mage/sets/commander/Mortify.java
+++ b/Mage.Sets/src/mage/sets/commander/Mortify.java
@@ -37,7 +37,7 @@ public class Mortify extends mage.sets.guildpact.Mortify {
 
     public Mortify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Mortivore.java b/Mage.Sets/src/mage/sets/commander/Mortivore.java
index b2c6f9ccb2..093b76100b 100644
--- a/Mage.Sets/src/mage/sets/commander/Mortivore.java
+++ b/Mage.Sets/src/mage/sets/commander/Mortivore.java
@@ -37,7 +37,7 @@ public class Mortivore extends mage.sets.tenthedition.Mortivore {
 
     public Mortivore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/MotherOfRunes.java b/Mage.Sets/src/mage/sets/commander/MotherOfRunes.java
index 9ede377e7e..efb994152c 100644
--- a/Mage.Sets/src/mage/sets/commander/MotherOfRunes.java
+++ b/Mage.Sets/src/mage/sets/commander/MotherOfRunes.java
@@ -37,7 +37,7 @@ public class MotherOfRunes extends mage.sets.urzaslegacy.MotherOfRunes {
 
     public MotherOfRunes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/MurmursFromBeyond.java b/Mage.Sets/src/mage/sets/commander/MurmursFromBeyond.java
index a5c16c339f..d18267a4b1 100644
--- a/Mage.Sets/src/mage/sets/commander/MurmursFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/commander/MurmursFromBeyond.java
@@ -37,7 +37,7 @@ public class MurmursFromBeyond extends mage.sets.saviorsofkamigawa.MurmursFromBe
 
     public MurmursFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/NantukoHusk.java b/Mage.Sets/src/mage/sets/commander/NantukoHusk.java
index f2189edf3e..58157a1876 100644
--- a/Mage.Sets/src/mage/sets/commander/NantukoHusk.java
+++ b/Mage.Sets/src/mage/sets/commander/NantukoHusk.java
@@ -37,7 +37,7 @@ public class NantukoHusk extends mage.sets.tenthedition.NantukoHusk {
 
     public NantukoHusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Necrogenesis.java b/Mage.Sets/src/mage/sets/commander/Necrogenesis.java
index 3bf892f133..324c1da570 100644
--- a/Mage.Sets/src/mage/sets/commander/Necrogenesis.java
+++ b/Mage.Sets/src/mage/sets/commander/Necrogenesis.java
@@ -37,7 +37,7 @@ public class Necrogenesis extends mage.sets.shardsofalara.Necrogenesis {
 
     public Necrogenesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/NemesisTrap.java b/Mage.Sets/src/mage/sets/commander/NemesisTrap.java
index 596acd2d26..52d62c5c21 100644
--- a/Mage.Sets/src/mage/sets/commander/NemesisTrap.java
+++ b/Mage.Sets/src/mage/sets/commander/NemesisTrap.java
@@ -37,7 +37,7 @@ public class NemesisTrap extends mage.sets.worldwake.NemesisTrap {
 
     public NemesisTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/NezumiGraverobber.java b/Mage.Sets/src/mage/sets/commander/NezumiGraverobber.java
index cef13ff300..294a2f4fd8 100644
--- a/Mage.Sets/src/mage/sets/commander/NezumiGraverobber.java
+++ b/Mage.Sets/src/mage/sets/commander/NezumiGraverobber.java
@@ -37,7 +37,7 @@ public class NezumiGraverobber extends mage.sets.championsofkamigawa.NezumiGrave
 
     public NezumiGraverobber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Nucklavee.java b/Mage.Sets/src/mage/sets/commander/Nucklavee.java
index 2040719248..7f09b1503c 100644
--- a/Mage.Sets/src/mage/sets/commander/Nucklavee.java
+++ b/Mage.Sets/src/mage/sets/commander/Nucklavee.java
@@ -37,7 +37,7 @@ public class Nucklavee extends mage.sets.eventide.Nucklavee {
 
     public Nucklavee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Oblation.java b/Mage.Sets/src/mage/sets/commander/Oblation.java
index 725571267a..276202d327 100644
--- a/Mage.Sets/src/mage/sets/commander/Oblation.java
+++ b/Mage.Sets/src/mage/sets/commander/Oblation.java
@@ -37,7 +37,7 @@ public class Oblation extends mage.sets.onslaught.Oblation {
 
     public Oblation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OblivionRing.java b/Mage.Sets/src/mage/sets/commander/OblivionRing.java
index a4d999dc33..f2f94397be 100644
--- a/Mage.Sets/src/mage/sets/commander/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/commander/OblivionRing.java
@@ -37,7 +37,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OblivionStone.java b/Mage.Sets/src/mage/sets/commander/OblivionStone.java
index 14d400bb97..d749a2c2c4 100644
--- a/Mage.Sets/src/mage/sets/commander/OblivionStone.java
+++ b/Mage.Sets/src/mage/sets/commander/OblivionStone.java
@@ -37,7 +37,7 @@ public class OblivionStone extends mage.sets.mirrodin.OblivionStone {
 
     public OblivionStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OniOfWildPlaces.java b/Mage.Sets/src/mage/sets/commander/OniOfWildPlaces.java
index 139dfa6ddf..0634803d9f 100644
--- a/Mage.Sets/src/mage/sets/commander/OniOfWildPlaces.java
+++ b/Mage.Sets/src/mage/sets/commander/OniOfWildPlaces.java
@@ -37,7 +37,7 @@ public class OniOfWildPlaces extends mage.sets.saviorsofkamigawa.OniOfWildPlaces
 
     public OniOfWildPlaces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OrimsThunder.java b/Mage.Sets/src/mage/sets/commander/OrimsThunder.java
index 73efec689c..150be0d21a 100644
--- a/Mage.Sets/src/mage/sets/commander/OrimsThunder.java
+++ b/Mage.Sets/src/mage/sets/commander/OrimsThunder.java
@@ -37,7 +37,7 @@ public class OrimsThunder extends mage.sets.apocalypse.OrimsThunder {
 
     public OrimsThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OrzhovBasilica.java b/Mage.Sets/src/mage/sets/commander/OrzhovBasilica.java
index bb705a7812..af73281935 100644
--- a/Mage.Sets/src/mage/sets/commander/OrzhovBasilica.java
+++ b/Mage.Sets/src/mage/sets/commander/OrzhovBasilica.java
@@ -37,7 +37,7 @@ public class OrzhovBasilica extends mage.sets.guildpact.OrzhovBasilica {
 
     public OrzhovBasilica(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OrzhovGuildmage.java b/Mage.Sets/src/mage/sets/commander/OrzhovGuildmage.java
index 5fb2b94a24..d6460a0cac 100644
--- a/Mage.Sets/src/mage/sets/commander/OrzhovGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander/OrzhovGuildmage.java
@@ -37,7 +37,7 @@ public class OrzhovGuildmage extends mage.sets.guildpact.OrzhovGuildmage {
 
     public OrzhovGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/OrzhovSignet.java b/Mage.Sets/src/mage/sets/commander/OrzhovSignet.java
index b4a02b035b..d00ce31ed0 100644
--- a/Mage.Sets/src/mage/sets/commander/OrzhovSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/OrzhovSignet.java
@@ -37,7 +37,7 @@ public class OrzhovSignet extends mage.sets.guildpact.OrzhovSignet {
 
     public OrzhovSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/PathToExile.java b/Mage.Sets/src/mage/sets/commander/PathToExile.java
index 140c223a8a..ff0e6d3d66 100644
--- a/Mage.Sets/src/mage/sets/commander/PathToExile.java
+++ b/Mage.Sets/src/mage/sets/commander/PathToExile.java
@@ -37,7 +37,7 @@ public class PathToExile extends mage.sets.conflux.PathToExile {
 
     public PathToExile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/PatronOfTheNezumi.java b/Mage.Sets/src/mage/sets/commander/PatronOfTheNezumi.java
index a21d2dda52..2017a258ec 100644
--- a/Mage.Sets/src/mage/sets/commander/PatronOfTheNezumi.java
+++ b/Mage.Sets/src/mage/sets/commander/PatronOfTheNezumi.java
@@ -37,7 +37,7 @@ public class PatronOfTheNezumi extends mage.sets.betrayersofkamigawa.PatronOfThe
 
     public PatronOfTheNezumi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/PenumbraSpider.java b/Mage.Sets/src/mage/sets/commander/PenumbraSpider.java
index 722f80d10f..a9a0a52f2b 100644
--- a/Mage.Sets/src/mage/sets/commander/PenumbraSpider.java
+++ b/Mage.Sets/src/mage/sets/commander/PenumbraSpider.java
@@ -37,7 +37,7 @@ public class PenumbraSpider extends mage.sets.planechase2012.PenumbraSpider {
 
     public PenumbraSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Plumeveil.java b/Mage.Sets/src/mage/sets/commander/Plumeveil.java
index 0532f21bbc..6310c91ae9 100644
--- a/Mage.Sets/src/mage/sets/commander/Plumeveil.java
+++ b/Mage.Sets/src/mage/sets/commander/Plumeveil.java
@@ -37,7 +37,7 @@ public class Plumeveil extends mage.sets.shadowmoor.Plumeveil {
 
     public Plumeveil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/PrisonTerm.java b/Mage.Sets/src/mage/sets/commander/PrisonTerm.java
index a374a7bbda..4d43660ee5 100644
--- a/Mage.Sets/src/mage/sets/commander/PrisonTerm.java
+++ b/Mage.Sets/src/mage/sets/commander/PrisonTerm.java
@@ -37,7 +37,7 @@ public class PrisonTerm extends mage.sets.shadowmoor.PrisonTerm {
 
     public PrisonTerm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Propaganda.java b/Mage.Sets/src/mage/sets/commander/Propaganda.java
index cbb39b044b..1acc24b610 100644
--- a/Mage.Sets/src/mage/sets/commander/Propaganda.java
+++ b/Mage.Sets/src/mage/sets/commander/Propaganda.java
@@ -37,7 +37,7 @@ public class Propaganda extends mage.sets.tempest.Propaganda {
 
     public Propaganda(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/PropheticPrism.java b/Mage.Sets/src/mage/sets/commander/PropheticPrism.java
index 63555148a8..d2c888b4ef 100644
--- a/Mage.Sets/src/mage/sets/commander/PropheticPrism.java
+++ b/Mage.Sets/src/mage/sets/commander/PropheticPrism.java
@@ -37,7 +37,7 @@ public class PropheticPrism extends mage.sets.riseoftheeldrazi.PropheticPrism {
 
     public PropheticPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/PunishingFire.java b/Mage.Sets/src/mage/sets/commander/PunishingFire.java
index 9ac3630f29..917c5c3438 100644
--- a/Mage.Sets/src/mage/sets/commander/PunishingFire.java
+++ b/Mage.Sets/src/mage/sets/commander/PunishingFire.java
@@ -37,7 +37,7 @@ public class PunishingFire extends mage.sets.zendikar.PunishingFire {
 
     public PunishingFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Pyrohemia.java b/Mage.Sets/src/mage/sets/commander/Pyrohemia.java
index 7512a9fe6f..a8589921de 100644
--- a/Mage.Sets/src/mage/sets/commander/Pyrohemia.java
+++ b/Mage.Sets/src/mage/sets/commander/Pyrohemia.java
@@ -37,7 +37,7 @@ public class Pyrohemia extends mage.sets.planarchaos.Pyrohemia {
 
     public Pyrohemia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/commander/RakdosCarnarium.java
index 5a926c0b24..dcf719d8ea 100644
--- a/Mage.Sets/src/mage/sets/commander/RakdosCarnarium.java
+++ b/Mage.Sets/src/mage/sets/commander/RakdosCarnarium.java
@@ -37,7 +37,7 @@ public class RakdosCarnarium extends mage.sets.dissension.RakdosCarnarium {
 
     public RakdosCarnarium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RakdosSignet.java b/Mage.Sets/src/mage/sets/commander/RakdosSignet.java
index 4addd4d5e0..16a6e42569 100644
--- a/Mage.Sets/src/mage/sets/commander/RakdosSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/RakdosSignet.java
@@ -37,7 +37,7 @@ public class RakdosSignet extends mage.sets.dissension.RakdosSignet {
 
     public RakdosSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RapaciousOne.java b/Mage.Sets/src/mage/sets/commander/RapaciousOne.java
index 6296189825..c91775c99e 100644
--- a/Mage.Sets/src/mage/sets/commander/RapaciousOne.java
+++ b/Mage.Sets/src/mage/sets/commander/RapaciousOne.java
@@ -37,7 +37,7 @@ public class RapaciousOne extends mage.sets.riseoftheeldrazi.RapaciousOne {
 
     public RapaciousOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RayOfCommand.java b/Mage.Sets/src/mage/sets/commander/RayOfCommand.java
index 0d1fe3a488..bbcf0d0b0d 100644
--- a/Mage.Sets/src/mage/sets/commander/RayOfCommand.java
+++ b/Mage.Sets/src/mage/sets/commander/RayOfCommand.java
@@ -37,7 +37,7 @@ public class RayOfCommand extends mage.sets.iceage.RayOfCommand {
 
     public RayOfCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RazorjawOni.java b/Mage.Sets/src/mage/sets/commander/RazorjawOni.java
index 8570864126..784c96d2c3 100644
--- a/Mage.Sets/src/mage/sets/commander/RazorjawOni.java
+++ b/Mage.Sets/src/mage/sets/commander/RazorjawOni.java
@@ -37,7 +37,7 @@ public class RazorjawOni extends mage.sets.saviorsofkamigawa.RazorjawOni {
 
     public RazorjawOni(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ReinsOfPower.java b/Mage.Sets/src/mage/sets/commander/ReinsOfPower.java
index 2050731870..8fb6696950 100644
--- a/Mage.Sets/src/mage/sets/commander/ReinsOfPower.java
+++ b/Mage.Sets/src/mage/sets/commander/ReinsOfPower.java
@@ -37,7 +37,7 @@ public class ReinsOfPower extends mage.sets.stronghold.ReinsOfPower {
 
     public ReinsOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ReiverDemon.java b/Mage.Sets/src/mage/sets/commander/ReiverDemon.java
index f3cd442f6d..f5fd09835f 100644
--- a/Mage.Sets/src/mage/sets/commander/ReiverDemon.java
+++ b/Mage.Sets/src/mage/sets/commander/ReiverDemon.java
@@ -37,7 +37,7 @@ public class ReiverDemon extends mage.sets.divinevsdemonic.ReiverDemon {
 
     public ReiverDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RelicCrush.java b/Mage.Sets/src/mage/sets/commander/RelicCrush.java
index f422063c83..7cea13fe1b 100644
--- a/Mage.Sets/src/mage/sets/commander/RelicCrush.java
+++ b/Mage.Sets/src/mage/sets/commander/RelicCrush.java
@@ -37,7 +37,7 @@ public class RelicCrush extends mage.sets.zendikar.RelicCrush {
 
     public RelicCrush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Repulse.java b/Mage.Sets/src/mage/sets/commander/Repulse.java
index 75bc507950..ea80b3b222 100644
--- a/Mage.Sets/src/mage/sets/commander/Repulse.java
+++ b/Mage.Sets/src/mage/sets/commander/Repulse.java
@@ -37,7 +37,7 @@ public class Repulse extends mage.sets.invasion.Repulse {
 
     public Repulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/commander/RiseFromTheGrave.java
index 349e996fe0..98210599ef 100644
--- a/Mage.Sets/src/mage/sets/commander/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/commander/RiseFromTheGrave.java
@@ -37,7 +37,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Ruination.java b/Mage.Sets/src/mage/sets/commander/Ruination.java
index 54f1b7ce2e..fe9d6f7c93 100644
--- a/Mage.Sets/src/mage/sets/commander/Ruination.java
+++ b/Mage.Sets/src/mage/sets/commander/Ruination.java
@@ -37,7 +37,7 @@ public class Ruination extends mage.sets.stronghold.Ruination {
 
     public Ruination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/RuptureSpire.java b/Mage.Sets/src/mage/sets/commander/RuptureSpire.java
index 8a9492c3be..fe22c4c6e1 100644
--- a/Mage.Sets/src/mage/sets/commander/RuptureSpire.java
+++ b/Mage.Sets/src/mage/sets/commander/RuptureSpire.java
@@ -37,7 +37,7 @@ public class RuptureSpire extends mage.sets.conflux.RuptureSpire {
 
     public RuptureSpire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/commander/SakuraTribeElder.java
index d1cebfd8e8..44b4a348f3 100644
--- a/Mage.Sets/src/mage/sets/commander/SakuraTribeElder.java
+++ b/Mage.Sets/src/mage/sets/commander/SakuraTribeElder.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder extends mage.sets.championsofkamigawa.SakuraTribeE
 
     public SakuraTribeElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SavageTwister.java b/Mage.Sets/src/mage/sets/commander/SavageTwister.java
index bae4f16218..ad4809ba80 100644
--- a/Mage.Sets/src/mage/sets/commander/SavageTwister.java
+++ b/Mage.Sets/src/mage/sets/commander/SavageTwister.java
@@ -37,7 +37,7 @@ public class SavageTwister extends mage.sets.commander2013.SavageTwister {
 
     public SavageTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SecludedSteppe.java b/Mage.Sets/src/mage/sets/commander/SecludedSteppe.java
index 86b98afb31..424cd05408 100644
--- a/Mage.Sets/src/mage/sets/commander/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/commander/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SelesnyaEvangel.java b/Mage.Sets/src/mage/sets/commander/SelesnyaEvangel.java
index ecbc506b0d..cb4d3419fa 100644
--- a/Mage.Sets/src/mage/sets/commander/SelesnyaEvangel.java
+++ b/Mage.Sets/src/mage/sets/commander/SelesnyaEvangel.java
@@ -37,7 +37,7 @@ public class SelesnyaEvangel extends mage.sets.ravnica.SelesnyaEvangel {
 
     public SelesnyaEvangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SelesnyaGuildmage.java b/Mage.Sets/src/mage/sets/commander/SelesnyaGuildmage.java
index d067be8c38..4d735bc598 100644
--- a/Mage.Sets/src/mage/sets/commander/SelesnyaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander/SelesnyaGuildmage.java
@@ -37,7 +37,7 @@ public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
 
     public SelesnyaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/commander/SelesnyaSanctuary.java
index f03196da73..a6158f78ce 100644
--- a/Mage.Sets/src/mage/sets/commander/SelesnyaSanctuary.java
+++ b/Mage.Sets/src/mage/sets/commander/SelesnyaSanctuary.java
@@ -37,7 +37,7 @@ public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
 
     public SelesnyaSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SelesnyaSignet.java b/Mage.Sets/src/mage/sets/commander/SelesnyaSignet.java
index f9c03fc43f..1395a95ced 100644
--- a/Mage.Sets/src/mage/sets/commander/SelesnyaSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/SelesnyaSignet.java
@@ -37,7 +37,7 @@ public class SelesnyaSignet extends mage.sets.ravnica.SelesnyaSignet {
 
     public SelesnyaSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SerraAngel.java b/Mage.Sets/src/mage/sets/commander/SerraAngel.java
index 7f95fba6b6..4c43b157ff 100644
--- a/Mage.Sets/src/mage/sets/commander/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/commander/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "CMD";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander/ShatteredAngel.java b/Mage.Sets/src/mage/sets/commander/ShatteredAngel.java
index f8c788ef08..8eb5d62bac 100644
--- a/Mage.Sets/src/mage/sets/commander/ShatteredAngel.java
+++ b/Mage.Sets/src/mage/sets/commander/ShatteredAngel.java
@@ -37,7 +37,7 @@ public class ShatteredAngel extends mage.sets.newphyrexia.ShatteredAngel {
 
     public ShatteredAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SigilCaptain.java b/Mage.Sets/src/mage/sets/commander/SigilCaptain.java
index 32a1aa13e1..226fee165d 100644
--- a/Mage.Sets/src/mage/sets/commander/SigilCaptain.java
+++ b/Mage.Sets/src/mage/sets/commander/SigilCaptain.java
@@ -37,7 +37,7 @@ public class SigilCaptain extends mage.sets.alarareborn.SigilCaptain {
 
     public SigilCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SignInBlood.java b/Mage.Sets/src/mage/sets/commander/SignInBlood.java
index edc3da9701..d13af2e2f1 100644
--- a/Mage.Sets/src/mage/sets/commander/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/commander/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SimicGrowthChamber.java b/Mage.Sets/src/mage/sets/commander/SimicGrowthChamber.java
index 6b0c1fb1df..338452a25b 100644
--- a/Mage.Sets/src/mage/sets/commander/SimicGrowthChamber.java
+++ b/Mage.Sets/src/mage/sets/commander/SimicGrowthChamber.java
@@ -37,7 +37,7 @@ public class SimicGrowthChamber extends mage.sets.dissension.SimicGrowthChamber
 
     public SimicGrowthChamber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SimicSignet.java b/Mage.Sets/src/mage/sets/commander/SimicSignet.java
index 9e46ce42e2..921ce82d11 100644
--- a/Mage.Sets/src/mage/sets/commander/SimicSignet.java
+++ b/Mage.Sets/src/mage/sets/commander/SimicSignet.java
@@ -37,7 +37,7 @@ public class SimicSignet extends mage.sets.dissension.SimicSignet {
 
     public SimicSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SimicSkySwallower.java b/Mage.Sets/src/mage/sets/commander/SimicSkySwallower.java
index f42e75f248..46392872ec 100644
--- a/Mage.Sets/src/mage/sets/commander/SimicSkySwallower.java
+++ b/Mage.Sets/src/mage/sets/commander/SimicSkySwallower.java
@@ -37,7 +37,7 @@ public class SimicSkySwallower extends mage.sets.dissension.SimicSkySwallower {
 
     public SimicSkySwallower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Skullclamp.java b/Mage.Sets/src/mage/sets/commander/Skullclamp.java
index 446536504e..af90b9a6c4 100644
--- a/Mage.Sets/src/mage/sets/commander/Skullclamp.java
+++ b/Mage.Sets/src/mage/sets/commander/Skullclamp.java
@@ -37,7 +37,7 @@ public class Skullclamp extends mage.sets.darksteel.Skullclamp {
 
     public Skullclamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Skyscribing.java b/Mage.Sets/src/mage/sets/commander/Skyscribing.java
index e10b5924fa..e674a8e1a1 100644
--- a/Mage.Sets/src/mage/sets/commander/Skyscribing.java
+++ b/Mage.Sets/src/mage/sets/commander/Skyscribing.java
@@ -37,7 +37,7 @@ public class Skyscribing extends mage.sets.commander2013.Skyscribing {
 
     public Skyscribing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SlipstreamEel.java b/Mage.Sets/src/mage/sets/commander/SlipstreamEel.java
index acd4a3c155..80fe8b8406 100644
--- a/Mage.Sets/src/mage/sets/commander/SlipstreamEel.java
+++ b/Mage.Sets/src/mage/sets/commander/SlipstreamEel.java
@@ -37,7 +37,7 @@ public class SlipstreamEel extends mage.sets.onslaught.SlipstreamEel {
 
     public SlipstreamEel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SolRing.java b/Mage.Sets/src/mage/sets/commander/SolRing.java
index cc3bf0e6fc..1ad800698d 100644
--- a/Mage.Sets/src/mage/sets/commander/SolRing.java
+++ b/Mage.Sets/src/mage/sets/commander/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/commander/SolemnSimulacrum.java
index 85d7c8ea71..4239fb4298 100644
--- a/Mage.Sets/src/mage/sets/commander/SolemnSimulacrum.java
+++ b/Mage.Sets/src/mage/sets/commander/SolemnSimulacrum.java
@@ -37,7 +37,7 @@ public class SolemnSimulacrum extends mage.sets.magic2012.SolemnSimulacrum {
 
     public SolemnSimulacrum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java b/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java
index cb8caae1c7..df7ff10ec0 100644
--- a/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java
+++ b/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java
@@ -38,7 +38,7 @@ public class SpikeFeeder extends mage.sets.timeshifted.SpikeFeeder {
 
     public SpikeFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "CMD";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander/StormHerd.java b/Mage.Sets/src/mage/sets/commander/StormHerd.java
index ba28212f94..f7ce2568cd 100644
--- a/Mage.Sets/src/mage/sets/commander/StormHerd.java
+++ b/Mage.Sets/src/mage/sets/commander/StormHerd.java
@@ -37,7 +37,7 @@ public class StormHerd extends mage.sets.guildpact.StormHerd {
 
     public StormHerd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SulfurousBlast.java b/Mage.Sets/src/mage/sets/commander/SulfurousBlast.java
index 8b40eebcc8..5bd73a2574 100644
--- a/Mage.Sets/src/mage/sets/commander/SulfurousBlast.java
+++ b/Mage.Sets/src/mage/sets/commander/SulfurousBlast.java
@@ -37,7 +37,7 @@ public class SulfurousBlast extends mage.sets.timespiral.SulfurousBlast {
 
     public SulfurousBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SymbioticWurm.java b/Mage.Sets/src/mage/sets/commander/SymbioticWurm.java
index ef14acedf2..2ee852a00e 100644
--- a/Mage.Sets/src/mage/sets/commander/SymbioticWurm.java
+++ b/Mage.Sets/src/mage/sets/commander/SymbioticWurm.java
@@ -37,7 +37,7 @@ public class SymbioticWurm extends mage.sets.onslaught.SymbioticWurm {
 
     public SymbioticWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/SyphonMind.java b/Mage.Sets/src/mage/sets/commander/SyphonMind.java
index 77a5901aa4..0b5c452431 100644
--- a/Mage.Sets/src/mage/sets/commander/SyphonMind.java
+++ b/Mage.Sets/src/mage/sets/commander/SyphonMind.java
@@ -37,7 +37,7 @@ public class SyphonMind extends mage.sets.onslaught.SyphonMind {
 
     public SyphonMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/TempleOfTheFalseGod.java b/Mage.Sets/src/mage/sets/commander/TempleOfTheFalseGod.java
index b4e853ef3e..d33a664e94 100644
--- a/Mage.Sets/src/mage/sets/commander/TempleOfTheFalseGod.java
+++ b/Mage.Sets/src/mage/sets/commander/TempleOfTheFalseGod.java
@@ -37,7 +37,7 @@ public class TempleOfTheFalseGod extends mage.sets.commander2013.TempleOfTheFals
 
     public TempleOfTheFalseGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Terminate.java b/Mage.Sets/src/mage/sets/commander/Terminate.java
index 11caf941c9..a503f399a6 100644
--- a/Mage.Sets/src/mage/sets/commander/Terminate.java
+++ b/Mage.Sets/src/mage/sets/commander/Terminate.java
@@ -37,7 +37,7 @@ public class Terminate extends mage.sets.alarareborn.Terminate {
 
     public Terminate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/commander/TerramorphicExpanse.java
index 408b35a173..edbb84db0f 100644
--- a/Mage.Sets/src/mage/sets/commander/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/commander/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/TranquilThicket.java b/Mage.Sets/src/mage/sets/commander/TranquilThicket.java
index 9486cc4170..93528dfa18 100644
--- a/Mage.Sets/src/mage/sets/commander/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/commander/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Triskelavus.java b/Mage.Sets/src/mage/sets/commander/Triskelavus.java
index 4c7a7f021c..3937dc3f6f 100644
--- a/Mage.Sets/src/mage/sets/commander/Triskelavus.java
+++ b/Mage.Sets/src/mage/sets/commander/Triskelavus.java
@@ -37,7 +37,7 @@ public class Triskelavus extends mage.sets.timespiral.Triskelavus {
 
     public Triskelavus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/TrollAscetic.java b/Mage.Sets/src/mage/sets/commander/TrollAscetic.java
index db36350730..3787e1b7b5 100644
--- a/Mage.Sets/src/mage/sets/commander/TrollAscetic.java
+++ b/Mage.Sets/src/mage/sets/commander/TrollAscetic.java
@@ -37,7 +37,7 @@ public class TrollAscetic extends mage.sets.mirrodin.TrollAscetic {
 
     public TrollAscetic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Unnerve.java b/Mage.Sets/src/mage/sets/commander/Unnerve.java
index f06939f9d4..e8b755e50d 100644
--- a/Mage.Sets/src/mage/sets/commander/Unnerve.java
+++ b/Mage.Sets/src/mage/sets/commander/Unnerve.java
@@ -37,7 +37,7 @@ public class Unnerve extends mage.sets.urzassaga.Unnerve {
 
     public Unnerve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ValleyRannet.java b/Mage.Sets/src/mage/sets/commander/ValleyRannet.java
index 0c1c8eceba..f3400bf8f3 100644
--- a/Mage.Sets/src/mage/sets/commander/ValleyRannet.java
+++ b/Mage.Sets/src/mage/sets/commander/ValleyRannet.java
@@ -37,7 +37,7 @@ public class ValleyRannet extends mage.sets.alarareborn.ValleyRannet {
 
     public ValleyRannet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VampireNighthawk.java b/Mage.Sets/src/mage/sets/commander/VampireNighthawk.java
index cd7f7823a2..307516b4cf 100644
--- a/Mage.Sets/src/mage/sets/commander/VampireNighthawk.java
+++ b/Mage.Sets/src/mage/sets/commander/VampireNighthawk.java
@@ -37,7 +37,7 @@ public class VampireNighthawk extends mage.sets.zendikar.VampireNighthawk {
 
     public VampireNighthawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VedalkenPlotter.java b/Mage.Sets/src/mage/sets/commander/VedalkenPlotter.java
index 2a38229d15..c54a213b34 100644
--- a/Mage.Sets/src/mage/sets/commander/VedalkenPlotter.java
+++ b/Mage.Sets/src/mage/sets/commander/VedalkenPlotter.java
@@ -37,7 +37,7 @@ public class VedalkenPlotter extends mage.sets.guildpact.VedalkenPlotter {
 
     public VedalkenPlotter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VengefulRebirth.java b/Mage.Sets/src/mage/sets/commander/VengefulRebirth.java
index 82fc58fc9f..818543fed4 100644
--- a/Mage.Sets/src/mage/sets/commander/VengefulRebirth.java
+++ b/Mage.Sets/src/mage/sets/commander/VengefulRebirth.java
@@ -37,7 +37,7 @@ public class VengefulRebirth extends mage.sets.alarareborn.VengefulRebirth {
 
     public VengefulRebirth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VisionSkeins.java b/Mage.Sets/src/mage/sets/commander/VisionSkeins.java
index 0695e971f5..3e71410153 100644
--- a/Mage.Sets/src/mage/sets/commander/VisionSkeins.java
+++ b/Mage.Sets/src/mage/sets/commander/VisionSkeins.java
@@ -37,7 +37,7 @@ public class VisionSkeins extends mage.sets.commander2013.VisionSkeins {
 
     public VisionSkeins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VividCrag.java b/Mage.Sets/src/mage/sets/commander/VividCrag.java
index 86ba2211ae..76eca7e0f2 100644
--- a/Mage.Sets/src/mage/sets/commander/VividCrag.java
+++ b/Mage.Sets/src/mage/sets/commander/VividCrag.java
@@ -37,7 +37,7 @@ public class VividCrag extends mage.sets.lorwyn.VividCrag {
 
     public VividCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VividCreek.java b/Mage.Sets/src/mage/sets/commander/VividCreek.java
index 2840df9d2c..cf3c1ab23e 100644
--- a/Mage.Sets/src/mage/sets/commander/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/commander/VividCreek.java
@@ -37,7 +37,7 @@ public class VividCreek extends mage.sets.lorwyn.VividCreek {
 
     public VividCreek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VividGrove.java b/Mage.Sets/src/mage/sets/commander/VividGrove.java
index 09a29debf5..27f2c76020 100644
--- a/Mage.Sets/src/mage/sets/commander/VividGrove.java
+++ b/Mage.Sets/src/mage/sets/commander/VividGrove.java
@@ -37,7 +37,7 @@ public class VividGrove extends mage.sets.lorwyn.VividGrove {
 
     public VividGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VividMarsh.java b/Mage.Sets/src/mage/sets/commander/VividMarsh.java
index 11ae8282ae..0c6481d3c5 100644
--- a/Mage.Sets/src/mage/sets/commander/VividMarsh.java
+++ b/Mage.Sets/src/mage/sets/commander/VividMarsh.java
@@ -37,7 +37,7 @@ public class VividMarsh extends mage.sets.lorwyn.VividMarsh {
 
     public VividMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VividMeadow.java b/Mage.Sets/src/mage/sets/commander/VividMeadow.java
index 21830ce314..c4b9722b14 100644
--- a/Mage.Sets/src/mage/sets/commander/VividMeadow.java
+++ b/Mage.Sets/src/mage/sets/commander/VividMeadow.java
@@ -37,7 +37,7 @@ public class VividMeadow extends mage.sets.lorwyn.VividMeadow {
 
     public VividMeadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/VoiceOfAll.java b/Mage.Sets/src/mage/sets/commander/VoiceOfAll.java
index 05f8298152..ac92858be4 100644
--- a/Mage.Sets/src/mage/sets/commander/VoiceOfAll.java
+++ b/Mage.Sets/src/mage/sets/commander/VoiceOfAll.java
@@ -38,7 +38,7 @@ public class VoiceOfAll extends mage.sets.planeshift.VoiceOfAll {
 
     public VoiceOfAll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "CMD";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/commander/WallOfDenial.java b/Mage.Sets/src/mage/sets/commander/WallOfDenial.java
index f37fa4cedd..6da5c79b59 100644
--- a/Mage.Sets/src/mage/sets/commander/WallOfDenial.java
+++ b/Mage.Sets/src/mage/sets/commander/WallOfDenial.java
@@ -37,7 +37,7 @@ public class WallOfDenial extends mage.sets.alarareborn.WallOfDenial {
 
     public WallOfDenial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/WallOfOmens.java b/Mage.Sets/src/mage/sets/commander/WallOfOmens.java
index 8456515fc6..bcf75f356c 100644
--- a/Mage.Sets/src/mage/sets/commander/WallOfOmens.java
+++ b/Mage.Sets/src/mage/sets/commander/WallOfOmens.java
@@ -37,7 +37,7 @@ public class WallOfOmens extends mage.sets.riseoftheeldrazi.WallOfOmens {
 
     public WallOfOmens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/WindbornMuse.java b/Mage.Sets/src/mage/sets/commander/WindbornMuse.java
index 6a89258223..45a6748161 100644
--- a/Mage.Sets/src/mage/sets/commander/WindbornMuse.java
+++ b/Mage.Sets/src/mage/sets/commander/WindbornMuse.java
@@ -37,7 +37,7 @@ public class WindbornMuse extends mage.sets.tenthedition.WindbornMuse {
 
     public WindbornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Windfall.java b/Mage.Sets/src/mage/sets/commander/Windfall.java
index 38d17ebd83..927ccf01f4 100644
--- a/Mage.Sets/src/mage/sets/commander/Windfall.java
+++ b/Mage.Sets/src/mage/sets/commander/Windfall.java
@@ -37,7 +37,7 @@ public class Windfall extends mage.sets.urzassaga.Windfall {
 
     public Windfall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/Wonder.java b/Mage.Sets/src/mage/sets/commander/Wonder.java
index a35025285a..cde817bfd7 100644
--- a/Mage.Sets/src/mage/sets/commander/Wonder.java
+++ b/Mage.Sets/src/mage/sets/commander/Wonder.java
@@ -37,7 +37,7 @@ public class Wonder extends mage.sets.judgment.Wonder {
 
     public Wonder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/sets/commander/WrexialTheRisenDeep.java
index 621facad8e..54a6f628ff 100644
--- a/Mage.Sets/src/mage/sets/commander/WrexialTheRisenDeep.java
+++ b/Mage.Sets/src/mage/sets/commander/WrexialTheRisenDeep.java
@@ -37,7 +37,7 @@ public class WrexialTheRisenDeep extends mage.sets.worldwake.WrexialTheRisenDeep
 
     public WrexialTheRisenDeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander/ZoeticCavern.java b/Mage.Sets/src/mage/sets/commander/ZoeticCavern.java
index ad4711d5d1..9cbfddf6c2 100644
--- a/Mage.Sets/src/mage/sets/commander/ZoeticCavern.java
+++ b/Mage.Sets/src/mage/sets/commander/ZoeticCavern.java
@@ -37,7 +37,7 @@ public class ZoeticCavern extends mage.sets.commander2014.ZoeticCavern {
 
     public ZoeticCavern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "CMD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AcidicSlime.java b/Mage.Sets/src/mage/sets/commander2013/AcidicSlime.java
index c0dc29451e..b848cc8fba 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AerieMystics.java b/Mage.Sets/src/mage/sets/commander2013/AerieMystics.java
index d40c578a6b..269eacb4ad 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AerieMystics.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AerieMystics.java
@@ -37,7 +37,7 @@ public class AerieMystics extends mage.sets.conflux.AerieMystics {
 
     public AerieMystics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AjanisPridemate.java b/Mage.Sets/src/mage/sets/commander2013/AjanisPridemate.java
index 68aa871eaa..0cac7751ad 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AjanisPridemate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AjanisPridemate.java
@@ -37,7 +37,7 @@ public class AjanisPridemate extends mage.sets.magic2011.AjanisPridemate {
 
     public AjanisPridemate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AkoumRefuge.java b/Mage.Sets/src/mage/sets/commander2013/AkoumRefuge.java
index a2ca07134e..32e6cca087 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AkoumRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AkoumRefuge.java
@@ -37,7 +37,7 @@ public class AkoumRefuge extends mage.sets.zendikar.AkoumRefuge {
 
     public AkoumRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Annihilate.java b/Mage.Sets/src/mage/sets/commander2013/Annihilate.java
index b20b3ae7a0..edfb4b3c35 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Annihilate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Annihilate.java
@@ -37,7 +37,7 @@ public class Annihilate extends mage.sets.invasion.Annihilate {
 
     public Annihilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ArcaneMelee.java b/Mage.Sets/src/mage/sets/commander2013/ArcaneMelee.java
index 6ebf530917..0ffc109f64 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ArcaneMelee.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ArcaneMelee.java
@@ -37,7 +37,7 @@ public class ArcaneMelee extends mage.sets.avacynrestored.ArcaneMelee {
 
     public ArcaneMelee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ArcaneSanctum.java b/Mage.Sets/src/mage/sets/commander2013/ArcaneSanctum.java
index 42e95cf5bd..1ff315d99b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ArcaneSanctum.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ArcaneSanctum.java
@@ -37,7 +37,7 @@ public class ArcaneSanctum extends mage.sets.shardsofalara.ArcaneSanctum {
 
     public ArcaneSanctum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Archangel.java b/Mage.Sets/src/mage/sets/commander2013/Archangel.java
index f7b34b5487..b5e6b5a164 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Archangel.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Archangel.java
@@ -37,7 +37,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel {
 
     public Archangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ArmillarySphere.java b/Mage.Sets/src/mage/sets/commander2013/ArmillarySphere.java
index 17d58288b2..9e8d088d9a 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ArmillarySphere.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ArmillarySphere.java
@@ -37,7 +37,7 @@ public class ArmillarySphere extends mage.sets.conflux.ArmillarySphere {
 
     public ArmillarySphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ArmyOfTheDamned.java b/Mage.Sets/src/mage/sets/commander2013/ArmyOfTheDamned.java
index 5dde3327cb..b8aada69c0 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ArmyOfTheDamned.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ArmyOfTheDamned.java
@@ -37,7 +37,7 @@ public class ArmyOfTheDamned extends mage.sets.innistrad.ArmyOfTheDamned {
 
     public ArmyOfTheDamned(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AugurOfBolas.java b/Mage.Sets/src/mage/sets/commander2013/AugurOfBolas.java
index 8f0272ec45..070c5b6c29 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AugurOfBolas.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AugurOfBolas.java
@@ -37,7 +37,7 @@ public class AugurOfBolas extends mage.sets.magic2013.AugurOfBolas {
 
     public AugurOfBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AuguryAdept.java b/Mage.Sets/src/mage/sets/commander2013/AuguryAdept.java
index 9e704d40d9..cf6f5caa23 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AuguryAdept.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AuguryAdept.java
@@ -37,7 +37,7 @@ public class AuguryAdept extends mage.sets.shadowmoor.AuguryAdept {
 
     public AuguryAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AvengerOfZendikar.java b/Mage.Sets/src/mage/sets/commander2013/AvengerOfZendikar.java
index 5593e4f367..13936ae26f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AvengerOfZendikar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AvengerOfZendikar.java
@@ -37,7 +37,7 @@ public class AvengerOfZendikar extends mage.sets.worldwake.AvengerOfZendikar {
 
     public AvengerOfZendikar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/sets/commander2013/AzamiLadyOfScrolls.java
index 825ae8cc88..9fcc13af73 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AzamiLadyOfScrolls.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AzamiLadyOfScrolls.java
@@ -37,7 +37,7 @@ public class AzamiLadyOfScrolls extends mage.sets.championsofkamigawa.AzamiLadyO
 
     public AzamiLadyOfScrolls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AzoriusChancery.java b/Mage.Sets/src/mage/sets/commander2013/AzoriusChancery.java
index 3f6ca95398..5697baf732 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AzoriusChancery.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AzoriusChancery.java
@@ -37,7 +37,7 @@ public class AzoriusChancery extends mage.sets.dissension.AzoriusChancery {
 
     public AzoriusChancery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AzoriusGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/AzoriusGuildgate.java
index e5ccf14592..d30a1377be 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AzoriusGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AzoriusGuildgate.java
@@ -37,7 +37,7 @@ public class AzoriusGuildgate extends mage.sets.returntoravnica.AzoriusGuildgate
 
     public AzoriusGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/AzoriusKeyrune.java b/Mage.Sets/src/mage/sets/commander2013/AzoriusKeyrune.java
index 1e325d6888..bf91580ac5 100644
--- a/Mage.Sets/src/mage/sets/commander2013/AzoriusKeyrune.java
+++ b/Mage.Sets/src/mage/sets/commander2013/AzoriusKeyrune.java
@@ -37,7 +37,7 @@ public class AzoriusKeyrune extends mage.sets.returntoravnica.AzoriusKeyrune {
 
     public AzoriusKeyrune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BalefulStrix.java b/Mage.Sets/src/mage/sets/commander2013/BalefulStrix.java
index 1ff8988291..b7c420c1bb 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BalefulStrix.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BalefulStrix.java
@@ -37,7 +37,7 @@ public class BalefulStrix extends mage.sets.planechase2012.BalefulStrix {
 
     public BalefulStrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BalothWoodcrasher.java b/Mage.Sets/src/mage/sets/commander2013/BalothWoodcrasher.java
index 2e5a25a230..853db947ba 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BalothWoodcrasher.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BalothWoodcrasher.java
@@ -37,7 +37,7 @@ public class BalothWoodcrasher extends mage.sets.zendikar.BalothWoodcrasher {
 
     public BalothWoodcrasher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BantPanorama.java b/Mage.Sets/src/mage/sets/commander2013/BantPanorama.java
index 394293bdec..811b01a0ec 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BantPanorama.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BantPanorama.java
@@ -37,7 +37,7 @@ public class BantPanorama extends mage.sets.shardsofalara.BantPanorama {
 
     public BantPanorama(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BarrenMoor.java b/Mage.Sets/src/mage/sets/commander2013/BarrenMoor.java
index 161bd793a3..ceb4f2e247 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BasaltMonolith.java b/Mage.Sets/src/mage/sets/commander2013/BasaltMonolith.java
index 0d9017be0b..db89372058 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BasaltMonolith.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BasaltMonolith.java
@@ -37,7 +37,7 @@ public class BasaltMonolith extends mage.sets.limitedalpha.BasaltMonolith {
 
     public BasaltMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BehemothSledge.java b/Mage.Sets/src/mage/sets/commander2013/BehemothSledge.java
index 19f6ed2808..3260949cc6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BehemothSledge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BehemothSledge.java
@@ -37,7 +37,7 @@ public class BehemothSledge extends mage.sets.alarareborn.BehemothSledge {
 
     public BehemothSledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BloodRites.java b/Mage.Sets/src/mage/sets/commander2013/BloodRites.java
index f8953e2254..aecd56c5d3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BloodRites.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BloodRites.java
@@ -37,7 +37,7 @@ public class BloodRites extends mage.sets.championsofkamigawa.BloodRites {
 
     public BloodRites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BlueSunsZenith.java b/Mage.Sets/src/mage/sets/commander2013/BlueSunsZenith.java
index 53d3519c84..263943d3cb 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BlueSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BlueSunsZenith.java
@@ -37,7 +37,7 @@ public class BlueSunsZenith extends mage.sets.mirrodinbesieged.BlueSunsZenith {
 
     public BlueSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BojukaBog.java b/Mage.Sets/src/mage/sets/commander2013/BojukaBog.java
index 9781886a7f..c3ddf32930 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BojukaBog.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BojukaBog.java
@@ -37,7 +37,7 @@ public class BojukaBog extends mage.sets.worldwake.BojukaBog {
 
     public BojukaBog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BorosCharm.java b/Mage.Sets/src/mage/sets/commander2013/BorosCharm.java
index b4a8c8e723..64c5f205c1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BorosCharm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BorosCharm.java
@@ -37,7 +37,7 @@ public class BorosCharm extends mage.sets.gatecrash.BorosCharm {
 
     public BorosCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BorosGarrison.java b/Mage.Sets/src/mage/sets/commander2013/BorosGarrison.java
index e9bec0c504..4a6444f55d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BorosGarrison.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BorosGarrison.java
@@ -37,7 +37,7 @@ public class BorosGarrison extends mage.sets.planechase.BorosGarrison {
 
     public BorosGarrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/BorosGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/BorosGuildgate.java
index 052b4b9fc8..ff2a6aae63 100644
--- a/Mage.Sets/src/mage/sets/commander2013/BorosGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/BorosGuildgate.java
@@ -37,7 +37,7 @@ public class BorosGuildgate extends mage.sets.gatecrash.BorosGuildgate {
 
     public BorosGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CapriciousEfreet.java b/Mage.Sets/src/mage/sets/commander2013/CapriciousEfreet.java
index 9aa67334d8..5cf3e49c40 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CapriciousEfreet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CapriciousEfreet.java
@@ -37,7 +37,7 @@ public class CapriciousEfreet extends mage.sets.magic2010.CapriciousEfreet {
 
     public CapriciousEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CarnageAltar.java b/Mage.Sets/src/mage/sets/commander2013/CarnageAltar.java
index 896d4787d6..69c51fed12 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CarnageAltar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CarnageAltar.java
@@ -37,7 +37,7 @@ public class CarnageAltar extends mage.sets.zendikar.CarnageAltar {
 
     public CarnageAltar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CharmbreakerDevils.java b/Mage.Sets/src/mage/sets/commander2013/CharmbreakerDevils.java
index 190060c552..46efe328dc 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CharmbreakerDevils.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CharmbreakerDevils.java
@@ -37,7 +37,7 @@ public class CharmbreakerDevils extends mage.sets.innistrad.CharmbreakerDevils {
 
     public CharmbreakerDevils(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CharnelhoardWurm.java b/Mage.Sets/src/mage/sets/commander2013/CharnelhoardWurm.java
index 77f8dfd491..1dbd8f764b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CharnelhoardWurm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CharnelhoardWurm.java
@@ -37,7 +37,7 @@ public class CharnelhoardWurm extends mage.sets.conflux.CharnelhoardWurm {
 
     public CharnelhoardWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ConjurersCloset.java b/Mage.Sets/src/mage/sets/commander2013/ConjurersCloset.java
index f27f539d4a..a406ebe8d6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ConjurersCloset.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ConjurersCloset.java
@@ -37,7 +37,7 @@ public class ConjurersCloset extends mage.sets.avacynrestored.ConjurersCloset {
 
     public ConjurersCloset(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ContestedCliffs.java b/Mage.Sets/src/mage/sets/commander2013/ContestedCliffs.java
index 312108f8cf..7954d2663d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ContestedCliffs.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ContestedCliffs.java
@@ -37,7 +37,7 @@ public class ContestedCliffs extends mage.sets.onslaught.ContestedCliffs {
 
     public ContestedCliffs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ControlMagic.java b/Mage.Sets/src/mage/sets/commander2013/ControlMagic.java
index 00f839fdad..ba99d8605f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ControlMagic.java
@@ -37,7 +37,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CradleOfVitality.java b/Mage.Sets/src/mage/sets/commander2013/CradleOfVitality.java
index 1e04107a0b..211a42a3b1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CradleOfVitality.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CradleOfVitality.java
@@ -37,7 +37,7 @@ public class CradleOfVitality extends mage.sets.shardsofalara.CradleOfVitality {
 
     public CradleOfVitality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CraterHellion.java b/Mage.Sets/src/mage/sets/commander2013/CraterHellion.java
index 0840e268bb..9d83742c3c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CraterHellion.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CraterHellion.java
@@ -37,7 +37,7 @@ public class CraterHellion extends mage.sets.urzassaga.CraterHellion {
 
     public CraterHellion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CruelUltimatum.java b/Mage.Sets/src/mage/sets/commander2013/CruelUltimatum.java
index 1dbdc9e0d2..a0c8d1e71b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CruelUltimatum.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CruelUltimatum.java
@@ -37,7 +37,7 @@ public class CruelUltimatum extends mage.sets.shardsofalara.CruelUltimatum {
 
     public CruelUltimatum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/CrumblingNecropolis.java b/Mage.Sets/src/mage/sets/commander2013/CrumblingNecropolis.java
index d355dd07a0..74991164e5 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CrumblingNecropolis.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CrumblingNecropolis.java
@@ -37,7 +37,7 @@ public class CrumblingNecropolis extends mage.sets.shardsofalara.CrumblingNecrop
 
     public CrumblingNecropolis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Cultivate.java b/Mage.Sets/src/mage/sets/commander2013/Cultivate.java
index a5d54d60a5..96bc8e3fd7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Cultivate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Cultivate.java
@@ -37,7 +37,7 @@ public class Cultivate extends mage.sets.magic2011.Cultivate {
 
     public Cultivate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DarksteelIngot.java b/Mage.Sets/src/mage/sets/commander2013/DarksteelIngot.java
index eb65367ba8..c96835e9c9 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DarksteelIngot.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DarksteelIngot.java
@@ -38,7 +38,7 @@ public class DarksteelIngot extends mage.sets.darksteel.DarksteelIngot {
 
     public DarksteelIngot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "C13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2013/DeathGrasp.java b/Mage.Sets/src/mage/sets/commander2013/DeathGrasp.java
index f27f04084f..6f6c8f05d1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DeathGrasp.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DeathGrasp.java
@@ -37,7 +37,7 @@ public class DeathGrasp extends mage.sets.apocalypse.DeathGrasp {
 
     public DeathGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DeathbringerThoctar.java b/Mage.Sets/src/mage/sets/commander2013/DeathbringerThoctar.java
index 20bc869f14..966fe63e34 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DeathbringerThoctar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DeathbringerThoctar.java
@@ -37,7 +37,7 @@ public class DeathbringerThoctar extends mage.sets.alarareborn.DeathbringerThoct
 
     public DeathbringerThoctar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DeceiverExarch.java b/Mage.Sets/src/mage/sets/commander2013/DeceiverExarch.java
index 55817bacb5..0bc52188c4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DeceiverExarch.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DeceiverExarch.java
@@ -37,7 +37,7 @@ public class DeceiverExarch extends mage.sets.newphyrexia.DeceiverExarch {
 
     public DeceiverExarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DeepAnalysis.java b/Mage.Sets/src/mage/sets/commander2013/DeepAnalysis.java
index 557a7d38dd..d57be90b3d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DeepAnalysis.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DeepAnalysis.java
@@ -37,7 +37,7 @@ public class DeepAnalysis extends mage.sets.torment.DeepAnalysis {
 
     public DeepAnalysis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DimirGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/DimirGuildgate.java
index 4fa2481421..81f8289e2f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DimirGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DimirGuildgate.java
@@ -37,7 +37,7 @@ public class DimirGuildgate extends mage.sets.gatecrash.DimirGuildgate {
 
     public DimirGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DirgeOfDread.java b/Mage.Sets/src/mage/sets/commander2013/DirgeOfDread.java
index 7725fb0eaf..ea59d1f2ba 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DirgeOfDread.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DirgeOfDread.java
@@ -37,7 +37,7 @@ public class DirgeOfDread extends mage.sets.onslaught.DirgeOfDread {
 
     public DirgeOfDread(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DiscipleOfGriselbrand.java b/Mage.Sets/src/mage/sets/commander2013/DiscipleOfGriselbrand.java
index 78c67acf86..59061da39f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DiscipleOfGriselbrand.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DiscipleOfGriselbrand.java
@@ -37,7 +37,7 @@ public class DiscipleOfGriselbrand extends mage.sets.innistrad.DiscipleOfGriselb
 
     public DiscipleOfGriselbrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Dismiss.java b/Mage.Sets/src/mage/sets/commander2013/Dismiss.java
index 8436d728a6..ae9b6a1d17 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Dismiss.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Dismiss.java
@@ -37,7 +37,7 @@ public class Dismiss extends mage.sets.tempest.Dismiss {
 
     public Dismiss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DivinityOfPride.java b/Mage.Sets/src/mage/sets/commander2013/DivinityOfPride.java
index cc8fb08e99..d3ce32d6e3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DivinityOfPride.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DivinityOfPride.java
@@ -37,7 +37,7 @@ public class DivinityOfPride extends mage.sets.eventide.DivinityOfPride {
 
     public DivinityOfPride(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DriftingMeadow.java b/Mage.Sets/src/mage/sets/commander2013/DriftingMeadow.java
index b315323746..1981ce2f3b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DriftingMeadow.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DriftingMeadow.java
@@ -37,7 +37,7 @@ public class DriftingMeadow extends mage.sets.urzassaga.DriftingMeadow {
 
     public DriftingMeadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DruidicSatchel.java b/Mage.Sets/src/mage/sets/commander2013/DruidicSatchel.java
index dee553b821..d6fbd81af7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DruidicSatchel.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DruidicSatchel.java
@@ -37,7 +37,7 @@ public class DruidicSatchel extends mage.sets.magic2012.DruidicSatchel {
 
     public DruidicSatchel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Drumhunter.java b/Mage.Sets/src/mage/sets/commander2013/Drumhunter.java
index cccb597f46..772e162b90 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Drumhunter.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Drumhunter.java
@@ -37,7 +37,7 @@ public class Drumhunter extends mage.sets.shardsofalara.Drumhunter {
 
     public Drumhunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/DungeonGeists.java b/Mage.Sets/src/mage/sets/commander2013/DungeonGeists.java
index 18f4ba9a68..a3839c786d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DungeonGeists.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DungeonGeists.java
@@ -37,7 +37,7 @@ public class DungeonGeists extends mage.sets.darkascension.DungeonGeists {
 
     public DungeonGeists(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/EchoMage.java b/Mage.Sets/src/mage/sets/commander2013/EchoMage.java
index abfa013110..91a2446517 100644
--- a/Mage.Sets/src/mage/sets/commander2013/EchoMage.java
+++ b/Mage.Sets/src/mage/sets/commander2013/EchoMage.java
@@ -37,7 +37,7 @@ public class EchoMage extends mage.sets.riseoftheeldrazi.EchoMage {
 
     public EchoMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/commander2013/ElvishSkysweeper.java
index 5c6aea4cd3..cb458b6eac 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ElvishSkysweeper.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ElvishSkysweeper.java
@@ -37,7 +37,7 @@ public class ElvishSkysweeper extends mage.sets.ravnica.ElvishSkysweeper {
 
     public ElvishSkysweeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/EsperPanorama.java b/Mage.Sets/src/mage/sets/commander2013/EsperPanorama.java
index 0840208990..fb6b8911a7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/EsperPanorama.java
+++ b/Mage.Sets/src/mage/sets/commander2013/EsperPanorama.java
@@ -37,7 +37,7 @@ public class EsperPanorama extends mage.sets.shardsofalara.EsperPanorama {
 
     public EsperPanorama(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/EternalDragon.java b/Mage.Sets/src/mage/sets/commander2013/EternalDragon.java
index e13e10e4e4..0a367a7939 100644
--- a/Mage.Sets/src/mage/sets/commander2013/EternalDragon.java
+++ b/Mage.Sets/src/mage/sets/commander2013/EternalDragon.java
@@ -37,7 +37,7 @@ public class EternalDragon extends mage.sets.scourge.EternalDragon {
 
     public EternalDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/EvolvingWilds.java b/Mage.Sets/src/mage/sets/commander2013/EvolvingWilds.java
index 0d26c8c668..a89d84b84f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/commander2013/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FaerieConclave.java b/Mage.Sets/src/mage/sets/commander2013/FaerieConclave.java
index 99fd1ad11c..77cf3c0dd5 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FaerieConclave.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FaerieConclave.java
@@ -37,7 +37,7 @@ public class FaerieConclave extends mage.sets.tenthedition.FaerieConclave {
 
     public FaerieConclave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FarhavenElf.java b/Mage.Sets/src/mage/sets/commander2013/FarhavenElf.java
index ca0429944e..b3c7dfb3f7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FarhavenElf.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FarhavenElf.java
@@ -37,7 +37,7 @@ public class FarhavenElf extends mage.sets.shadowmoor.FarhavenElf {
 
     public FarhavenElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Fecundity.java b/Mage.Sets/src/mage/sets/commander2013/Fecundity.java
index 7b09641f17..ce8f3dbfb8 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Fecundity.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Fecundity.java
@@ -37,7 +37,7 @@ public class Fecundity extends mage.sets.urzassaga.Fecundity {
 
     public Fecundity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FiendHunter.java b/Mage.Sets/src/mage/sets/commander2013/FiendHunter.java
index 0b69188978..9e5aa50bea 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FiendHunter.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FiendHunter.java
@@ -37,7 +37,7 @@ public class FiendHunter extends mage.sets.innistrad.FiendHunter {
 
     public FiendHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FieryJustice.java b/Mage.Sets/src/mage/sets/commander2013/FieryJustice.java
index 7af924413e..ac56eaf36d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FieryJustice.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FieryJustice.java
@@ -37,7 +37,7 @@ public class FieryJustice extends mage.sets.iceage.FieryJustice {
 
     public FieryJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FiligreeAngel.java b/Mage.Sets/src/mage/sets/commander2013/FiligreeAngel.java
index 300cd9994f..98ccba805e 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FiligreeAngel.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FiligreeAngel.java
@@ -37,7 +37,7 @@ public class FiligreeAngel extends mage.sets.alarareborn.FiligreeAngel {
 
     public FiligreeAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Fireball.java b/Mage.Sets/src/mage/sets/commander2013/Fireball.java
index 013cf1d27e..b3e0d7f77b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Fireball.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/commander2013/FiresOfYavimaya.java
index 185770dfff..1ae0a267c4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FissureVent.java b/Mage.Sets/src/mage/sets/commander2013/FissureVent.java
index ae01f791a8..28d1ff11b7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FissureVent.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FissureVent.java
@@ -37,7 +37,7 @@ public class FissureVent extends mage.sets.riseoftheeldrazi.FissureVent {
 
     public FissureVent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Flickerwisp.java b/Mage.Sets/src/mage/sets/commander2013/Flickerwisp.java
index 7fb45d8feb..d1394529e2 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Flickerwisp.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Flickerwisp.java
@@ -37,7 +37,7 @@ public class Flickerwisp extends mage.sets.eventide.Flickerwisp {
 
     public Flickerwisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FogBank.java b/Mage.Sets/src/mage/sets/commander2013/FogBank.java
index 36ecec38a3..42485a9698 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FogBank.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FogBank.java
@@ -37,7 +37,7 @@ public class FogBank extends mage.sets.urzassaga.FogBank {
 
     public FogBank(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ForgottenCave.java b/Mage.Sets/src/mage/sets/commander2013/ForgottenCave.java
index acbc2db437..243b20a2ea 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/FurnaceCelebration.java b/Mage.Sets/src/mage/sets/commander2013/FurnaceCelebration.java
index e13d63b203..4ab3595f28 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FurnaceCelebration.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FurnaceCelebration.java
@@ -37,7 +37,7 @@ public class FurnaceCelebration extends mage.sets.scarsofmirrodin.FurnaceCelebra
 
     public FurnaceCelebration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GoblinBombardment.java b/Mage.Sets/src/mage/sets/commander2013/GoblinBombardment.java
index dc79cd5ca9..06867e172c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GoblinBombardment.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GoblinBombardment.java
@@ -37,7 +37,7 @@ public class GoblinBombardment extends mage.sets.tempest.GoblinBombardment {
 
     public GoblinBombardment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GoblinSharpshooter.java b/Mage.Sets/src/mage/sets/commander2013/GoblinSharpshooter.java
index cfc78795e5..66c4950b28 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GoblinSharpshooter.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GoblinSharpshooter.java
@@ -37,7 +37,7 @@ public class GoblinSharpshooter extends mage.sets.onslaught.GoblinSharpshooter {
 
     public GoblinSharpshooter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GolgariGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/GolgariGuildgate.java
index 6842fecec6..bfc2a04c5c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GolgariGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GolgariGuildgate.java
@@ -37,7 +37,7 @@ public class GolgariGuildgate extends mage.sets.returntoravnica.GolgariGuildgate
 
     public GolgariGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GolgariGuildmage.java b/Mage.Sets/src/mage/sets/commander2013/GolgariGuildmage.java
index 0efa873325..329741d18d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GolgariGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GolgariGuildmage.java
@@ -37,7 +37,7 @@ public class GolgariGuildmage extends mage.sets.ravnica.GolgariGuildmage {
 
     public GolgariGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/commander2013/GolgariRotFarm.java
index 116c707de1..ff8b5d3c94 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GolgariRotFarm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GolgariRotFarm.java
@@ -37,7 +37,7 @@ public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
 
     public GolgariRotFarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GrazingGladehart.java b/Mage.Sets/src/mage/sets/commander2013/GrazingGladehart.java
index 8e140b4c5d..6116147200 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GrazingGladehart.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GrazingGladehart.java
@@ -37,7 +37,7 @@ public class GrazingGladehart extends mage.sets.zendikar.GrazingGladehart {
 
     public GrazingGladehart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GrimBackwoods.java b/Mage.Sets/src/mage/sets/commander2013/GrimBackwoods.java
index 142d8d6753..2542864728 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GrimBackwoods.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GrimBackwoods.java
@@ -37,7 +37,7 @@ public class GrimBackwoods extends mage.sets.darkascension.GrimBackwoods {
 
     public GrimBackwoods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GrixisCharm.java b/Mage.Sets/src/mage/sets/commander2013/GrixisCharm.java
index a63e080f45..32d1c3e0da 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GrixisCharm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GrixisCharm.java
@@ -37,7 +37,7 @@ public class GrixisCharm extends mage.sets.shardsofalara.GrixisCharm {
 
     public GrixisCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GrixisPanorama.java b/Mage.Sets/src/mage/sets/commander2013/GrixisPanorama.java
index 7429fd2b6a..fcacaecc47 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GrixisPanorama.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GrixisPanorama.java
@@ -37,7 +37,7 @@ public class GrixisPanorama extends mage.sets.shardsofalara.GrixisPanorama {
 
     public GrixisPanorama(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GruulGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/GruulGuildgate.java
index d2c7b79a61..9c11609774 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GruulGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GruulGuildgate.java
@@ -37,7 +37,7 @@ public class GruulGuildgate extends mage.sets.gatecrash.GruulGuildgate {
 
     public GruulGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/GuardGomazoa.java b/Mage.Sets/src/mage/sets/commander2013/GuardGomazoa.java
index f8ed96b035..9eadf73648 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GuardGomazoa.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GuardGomazoa.java
@@ -37,7 +37,7 @@ public class GuardGomazoa extends mage.sets.riseoftheeldrazi.GuardGomazoa {
 
     public GuardGomazoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Guttersnipe.java b/Mage.Sets/src/mage/sets/commander2013/Guttersnipe.java
index af3346cbf6..38ed16cdbf 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Guttersnipe.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Guttersnipe.java
@@ -37,7 +37,7 @@ public class Guttersnipe extends mage.sets.returntoravnica.Guttersnipe {
 
     public Guttersnipe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/HadaSpyPatrol.java b/Mage.Sets/src/mage/sets/commander2013/HadaSpyPatrol.java
index 00f946097b..d3ae8ba6cb 100644
--- a/Mage.Sets/src/mage/sets/commander2013/HadaSpyPatrol.java
+++ b/Mage.Sets/src/mage/sets/commander2013/HadaSpyPatrol.java
@@ -37,7 +37,7 @@ public class HadaSpyPatrol extends mage.sets.riseoftheeldrazi.HadaSpyPatrol {
 
     public HadaSpyPatrol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Harmonize.java b/Mage.Sets/src/mage/sets/commander2013/Harmonize.java
index 0f95a912d4..9adf6e83c4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/HuntedTroll.java b/Mage.Sets/src/mage/sets/commander2013/HuntedTroll.java
index 4464664e99..33557d4152 100644
--- a/Mage.Sets/src/mage/sets/commander2013/HuntedTroll.java
+++ b/Mage.Sets/src/mage/sets/commander2013/HuntedTroll.java
@@ -37,7 +37,7 @@ public class HuntedTroll extends mage.sets.ravnica.HuntedTroll {
 
     public HuntedTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/InfernoTitan.java b/Mage.Sets/src/mage/sets/commander2013/InfernoTitan.java
index 5e115b584d..aead9edb93 100644
--- a/Mage.Sets/src/mage/sets/commander2013/InfernoTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2013/InfernoTitan.java
@@ -37,7 +37,7 @@ public class InfernoTitan extends mage.sets.magic2011.InfernoTitan {
 
     public InfernoTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Infest.java b/Mage.Sets/src/mage/sets/commander2013/Infest.java
index c1fc503a52..ead8c00b7f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Infest.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Infest.java
@@ -37,7 +37,7 @@ public class Infest extends mage.sets.shardsofalara.Infest {
 
     public Infest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/commander2013/IzzetBoilerworks.java
index 680c69f13b..399958df1d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/IzzetBoilerworks.java
+++ b/Mage.Sets/src/mage/sets/commander2013/IzzetBoilerworks.java
@@ -37,7 +37,7 @@ public class IzzetBoilerworks extends mage.sets.guildpact.IzzetBoilerworks {
 
     public IzzetBoilerworks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/IzzetGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/IzzetGuildgate.java
index 704a382dde..c1be8c48e9 100644
--- a/Mage.Sets/src/mage/sets/commander2013/IzzetGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/IzzetGuildgate.java
@@ -37,7 +37,7 @@ public class IzzetGuildgate extends mage.sets.returntoravnica.IzzetGuildgate {
 
     public IzzetGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JacesArchivist.java b/Mage.Sets/src/mage/sets/commander2013/JacesArchivist.java
index b06c5479e1..0abd03e756 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JacesArchivist.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JacesArchivist.java
@@ -37,7 +37,7 @@ public class JacesArchivist extends mage.sets.magic2012.JacesArchivist {
 
     public JacesArchivist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JadeMage.java b/Mage.Sets/src/mage/sets/commander2013/JadeMage.java
index ec02eefba1..0c8e3fd2e6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JadeMage.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JadeMage.java
@@ -37,7 +37,7 @@ public class JadeMage extends mage.sets.magic2012.JadeMage {
 
     public JadeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JarOfEyeballs.java b/Mage.Sets/src/mage/sets/commander2013/JarOfEyeballs.java
index 86ea084ba4..b826322dde 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JarOfEyeballs.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JarOfEyeballs.java
@@ -37,7 +37,7 @@ public class JarOfEyeballs extends mage.sets.darkascension.JarOfEyeballs {
 
     public JarOfEyeballs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JundCharm.java b/Mage.Sets/src/mage/sets/commander2013/JundCharm.java
index 710da427fc..3d731a5050 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JundCharm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JundCharm.java
@@ -37,7 +37,7 @@ public class JundCharm extends mage.sets.shardsofalara.JundCharm {
 
     public JundCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JundPanorama.java b/Mage.Sets/src/mage/sets/commander2013/JundPanorama.java
index 5641a8d7a3..2e5d51ebde 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JundPanorama.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JundPanorama.java
@@ -37,7 +37,7 @@ public class JundPanorama extends mage.sets.shardsofalara.JundPanorama {
 
     public JundPanorama(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JungleShrine.java b/Mage.Sets/src/mage/sets/commander2013/JungleShrine.java
index d205fdaa5c..799b1230b1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JungleShrine.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JungleShrine.java
@@ -37,7 +37,7 @@ public class JungleShrine extends mage.sets.shardsofalara.JungleShrine {
 
     public JungleShrine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JwarIsleRefuge.java b/Mage.Sets/src/mage/sets/commander2013/JwarIsleRefuge.java
index efc40d1e1f..5bf72982f4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JwarIsleRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JwarIsleRefuge.java
@@ -37,7 +37,7 @@ public class JwarIsleRefuge extends mage.sets.zendikar.JwarIsleRefuge {
 
     public JwarIsleRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KarmicGuide.java b/Mage.Sets/src/mage/sets/commander2013/KarmicGuide.java
index d7a81b31ca..a95b335368 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KarmicGuide.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KarmicGuide.java
@@ -37,7 +37,7 @@ public class KarmicGuide extends mage.sets.urzaslegacy.KarmicGuide {
 
     public KarmicGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KazanduRefuge.java b/Mage.Sets/src/mage/sets/commander2013/KazanduRefuge.java
index 01fd1225fd..3120cd453e 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KazanduRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KazanduRefuge.java
@@ -37,7 +37,7 @@ public class KazanduRefuge extends mage.sets.zendikar.KazanduRefuge {
 
     public KazanduRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KazanduTuskcaller.java b/Mage.Sets/src/mage/sets/commander2013/KazanduTuskcaller.java
index 671943f820..157f79f08c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KazanduTuskcaller.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KazanduTuskcaller.java
@@ -37,7 +37,7 @@ public class KazanduTuskcaller extends mage.sets.riseoftheeldrazi.KazanduTuskcal
 
     public KazanduTuskcaller(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KhalniGarden.java b/Mage.Sets/src/mage/sets/commander2013/KhalniGarden.java
index b2c40ec3e7..627bf51700 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KhalniGarden.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KhalniGarden.java
@@ -37,7 +37,7 @@ public class KhalniGarden extends mage.sets.worldwake.KhalniGarden {
 
     public KhalniGarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KrosanGrip.java b/Mage.Sets/src/mage/sets/commander2013/KrosanGrip.java
index 79cf668745..56636c05c3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KrosanGrip.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KrosanGrip.java
@@ -37,7 +37,7 @@ public class KrosanGrip extends mage.sets.timespiral.KrosanGrip {
 
     public KrosanGrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KrosanTusker.java b/Mage.Sets/src/mage/sets/commander2013/KrosanTusker.java
index 177a3f4664..301d5dc75d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/KrosanWarchief.java b/Mage.Sets/src/mage/sets/commander2013/KrosanWarchief.java
index d4fdddb7c0..d9534aa532 100644
--- a/Mage.Sets/src/mage/sets/commander2013/KrosanWarchief.java
+++ b/Mage.Sets/src/mage/sets/commander2013/KrosanWarchief.java
@@ -37,7 +37,7 @@ public class KrosanWarchief extends mage.sets.scourge.KrosanWarchief {
 
     public KrosanWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/LlanowarReborn.java b/Mage.Sets/src/mage/sets/commander2013/LlanowarReborn.java
index 4eedd446bd..4838d41be6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/LlanowarReborn.java
+++ b/Mage.Sets/src/mage/sets/commander2013/LlanowarReborn.java
@@ -37,7 +37,7 @@ public class LlanowarReborn extends mage.sets.heroesvsmonsters.LlanowarReborn {
 
     public LlanowarReborn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/LonelySandbar.java b/Mage.Sets/src/mage/sets/commander2013/LonelySandbar.java
index 3bdfb4114c..2bc01d31af 100644
--- a/Mage.Sets/src/mage/sets/commander2013/LonelySandbar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/LonelySandbar.java
@@ -37,7 +37,7 @@ public class LonelySandbar extends mage.sets.onslaught.LonelySandbar {
 
     public LonelySandbar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MarrowBats.java b/Mage.Sets/src/mage/sets/commander2013/MarrowBats.java
index 92ec83d801..739c999ef4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MarrowBats.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MarrowBats.java
@@ -37,7 +37,7 @@ public class MarrowBats extends mage.sets.avacynrestored.MarrowBats {
 
     public MarrowBats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MassMutiny.java b/Mage.Sets/src/mage/sets/commander2013/MassMutiny.java
index 421e329bbe..42f05f423a 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MassMutiny.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MassMutiny.java
@@ -37,7 +37,7 @@ public class MassMutiny extends mage.sets.planechase2012.MassMutiny {
 
     public MassMutiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MayaelTheAnima.java b/Mage.Sets/src/mage/sets/commander2013/MayaelTheAnima.java
index a72294c520..6f649053d1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MayaelTheAnima.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MayaelTheAnima.java
@@ -37,7 +37,7 @@ public class MayaelTheAnima extends mage.sets.shardsofalara.MayaelTheAnima {
 
     public MayaelTheAnima(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MirrorEntity.java b/Mage.Sets/src/mage/sets/commander2013/MirrorEntity.java
index 4b5501bd5b..7a1c4289ed 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MirrorEntity.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MirrorEntity.java
@@ -37,7 +37,7 @@ public class MirrorEntity extends mage.sets.lorwyn.MirrorEntity {
 
     public MirrorEntity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MistmeadowWitch.java b/Mage.Sets/src/mage/sets/commander2013/MistmeadowWitch.java
index 0bdc2c2485..21148df626 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MistmeadowWitch.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MistmeadowWitch.java
@@ -37,7 +37,7 @@ public class MistmeadowWitch extends mage.sets.shadowmoor.MistmeadowWitch {
 
     public MistmeadowWitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MnemonicWall.java b/Mage.Sets/src/mage/sets/commander2013/MnemonicWall.java
index 6505ccc5e6..39b5f072b1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MnemonicWall.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MnemonicWall.java
@@ -37,7 +37,7 @@ public class MnemonicWall extends mage.sets.riseoftheeldrazi.MnemonicWall {
 
     public MnemonicWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MoldShambler.java b/Mage.Sets/src/mage/sets/commander2013/MoldShambler.java
index 97611a33b1..454b67d110 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MoldShambler.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MoldShambler.java
@@ -37,7 +37,7 @@ public class MoldShambler extends mage.sets.zendikar.MoldShambler {
 
     public MoldShambler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MoltenDisaster.java b/Mage.Sets/src/mage/sets/commander2013/MoltenDisaster.java
index 79104f5331..e28a493e75 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MoltenDisaster.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MoltenDisaster.java
@@ -37,7 +37,7 @@ public class MoltenDisaster extends mage.sets.modernmasters.MoltenDisaster {
 
     public MoltenDisaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MyrBattlesphere.java b/Mage.Sets/src/mage/sets/commander2013/MyrBattlesphere.java
index a82be2294f..c65855d36c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MyrBattlesphere.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MyrBattlesphere.java
@@ -37,7 +37,7 @@ public class MyrBattlesphere extends mage.sets.scarsofmirrodin.MyrBattlesphere {
 
     public MyrBattlesphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NayaCharm.java b/Mage.Sets/src/mage/sets/commander2013/NayaCharm.java
index a90ffc1716..4a148a0dd6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NayaCharm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NayaCharm.java
@@ -37,7 +37,7 @@ public class NayaCharm extends mage.sets.shardsofalara.NayaCharm {
 
     public NayaCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NayaPanorama.java b/Mage.Sets/src/mage/sets/commander2013/NayaPanorama.java
index f69fd9bdc9..719a896583 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NayaPanorama.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NayaPanorama.java
@@ -37,7 +37,7 @@ public class NayaPanorama extends mage.sets.shardsofalara.NayaPanorama {
 
     public NayaPanorama(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/commander2013/NevinyrralsDisk.java
index 138d77f257..3c87431811 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NewBenalia.java b/Mage.Sets/src/mage/sets/commander2013/NewBenalia.java
index 0e07d1428f..679f2ba492 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NewBenalia.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NewBenalia.java
@@ -37,7 +37,7 @@ public class NewBenalia extends mage.sets.futuresight.NewBenalia {
 
     public NewBenalia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NightSoil.java b/Mage.Sets/src/mage/sets/commander2013/NightSoil.java
index db3ef1b960..1beb9bcb18 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NightSoil.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NightSoil.java
@@ -37,7 +37,7 @@ public class NightSoil extends mage.sets.fallenempires.NightSoil1 {
 
     public NightSoil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NightscapeFamiliar.java b/Mage.Sets/src/mage/sets/commander2013/NightscapeFamiliar.java
index cc00f85927..cb3a6bd4c6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NightscapeFamiliar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NightscapeFamiliar.java
@@ -37,7 +37,7 @@ public class NightscapeFamiliar extends mage.sets.planeshift.NightscapeFamiliar
 
     public NightscapeFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NihilSpellbomb.java b/Mage.Sets/src/mage/sets/commander2013/NihilSpellbomb.java
index 994b31e629..8c7125d7b6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NihilSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NihilSpellbomb.java
@@ -37,7 +37,7 @@ public class NihilSpellbomb extends mage.sets.scarsofmirrodin.NihilSpellbomb {
 
     public NihilSpellbomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/NivixGuildmage.java b/Mage.Sets/src/mage/sets/commander2013/NivixGuildmage.java
index 667179e479..c334662911 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NivixGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NivixGuildmage.java
@@ -37,7 +37,7 @@ public class NivixGuildmage extends mage.sets.returntoravnica.NivixGuildmage {
 
     public NivixGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ObeliskOfEsper.java b/Mage.Sets/src/mage/sets/commander2013/ObeliskOfEsper.java
index 4ff6aabbef..e7061ae863 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ObeliskOfEsper.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ObeliskOfEsper.java
@@ -37,7 +37,7 @@ public class ObeliskOfEsper extends mage.sets.shardsofalara.ObeliskOfEsper {
 
     public ObeliskOfEsper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ObeliskOfGrixis.java b/Mage.Sets/src/mage/sets/commander2013/ObeliskOfGrixis.java
index 8197498022..bbe618c72a 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ObeliskOfGrixis.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ObeliskOfGrixis.java
@@ -37,7 +37,7 @@ public class ObeliskOfGrixis extends mage.sets.shardsofalara.ObeliskOfGrixis {
 
     public ObeliskOfGrixis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ObeliskOfJund.java b/Mage.Sets/src/mage/sets/commander2013/ObeliskOfJund.java
index 0cef8846fb..150538056f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ObeliskOfJund.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ObeliskOfJund.java
@@ -37,7 +37,7 @@ public class ObeliskOfJund extends mage.sets.shardsofalara.ObeliskOfJund {
 
     public ObeliskOfJund(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Opportunity.java b/Mage.Sets/src/mage/sets/commander2013/Opportunity.java
index 994bb8f516..0c52f52c07 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Opportunity.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Opportunity.java
@@ -37,7 +37,7 @@ public class Opportunity extends mage.sets.urzaslegacy.Opportunity {
 
     public Opportunity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/OrzhovBasilica.java b/Mage.Sets/src/mage/sets/commander2013/OrzhovBasilica.java
index 8bd078779b..dd468e7cfc 100644
--- a/Mage.Sets/src/mage/sets/commander2013/OrzhovBasilica.java
+++ b/Mage.Sets/src/mage/sets/commander2013/OrzhovBasilica.java
@@ -37,7 +37,7 @@ public class OrzhovBasilica extends mage.sets.guildpact.OrzhovBasilica {
 
     public OrzhovBasilica(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/OrzhovGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/OrzhovGuildgate.java
index 2770836d46..53627aa7aa 100644
--- a/Mage.Sets/src/mage/sets/commander2013/OrzhovGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/OrzhovGuildgate.java
@@ -37,7 +37,7 @@ public class OrzhovGuildgate extends mage.sets.gatecrash.OrzhovGuildgate {
 
     public OrzhovGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Phthisis.java b/Mage.Sets/src/mage/sets/commander2013/Phthisis.java
index 026d63af25..586d9ae090 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Phthisis.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Phthisis.java
@@ -37,7 +37,7 @@ public class Phthisis extends mage.sets.timespiral.Phthisis {
 
     public Phthisis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/PhyrexianDelver.java b/Mage.Sets/src/mage/sets/commander2013/PhyrexianDelver.java
index e99500cbb7..b3af550473 100644
--- a/Mage.Sets/src/mage/sets/commander2013/PhyrexianDelver.java
+++ b/Mage.Sets/src/mage/sets/commander2013/PhyrexianDelver.java
@@ -37,7 +37,7 @@ public class PhyrexianDelver extends mage.sets.invasion.PhyrexianDelver {
 
     public PhyrexianDelver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/commander2013/PhyrexianGargantua.java
index 5badaa0ed7..7577baca12 100644
--- a/Mage.Sets/src/mage/sets/commander2013/PhyrexianGargantua.java
+++ b/Mage.Sets/src/mage/sets/commander2013/PhyrexianGargantua.java
@@ -37,7 +37,7 @@ public class PhyrexianGargantua extends mage.sets.apocalypse.PhyrexianGargantua
 
     public PhyrexianGargantua(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/PhyrexianReclamation.java b/Mage.Sets/src/mage/sets/commander2013/PhyrexianReclamation.java
index 35c026cb4f..f16f73089c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/PhyrexianReclamation.java
+++ b/Mage.Sets/src/mage/sets/commander2013/PhyrexianReclamation.java
@@ -37,7 +37,7 @@ public class PhyrexianReclamation extends mage.sets.urzaslegacy.PhyrexianReclama
 
     public PhyrexianReclamation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/PilgrimsEye.java b/Mage.Sets/src/mage/sets/commander2013/PilgrimsEye.java
index 88cd33799f..644121d6f9 100644
--- a/Mage.Sets/src/mage/sets/commander2013/PilgrimsEye.java
+++ b/Mage.Sets/src/mage/sets/commander2013/PilgrimsEye.java
@@ -37,7 +37,7 @@ public class PilgrimsEye extends mage.sets.worldwake.PilgrimsEye {
 
     public PilgrimsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/PristineTalisman.java b/Mage.Sets/src/mage/sets/commander2013/PristineTalisman.java
index 909991d68f..768b0be8fa 100644
--- a/Mage.Sets/src/mage/sets/commander2013/PristineTalisman.java
+++ b/Mage.Sets/src/mage/sets/commander2013/PristineTalisman.java
@@ -37,7 +37,7 @@ public class PristineTalisman extends mage.sets.newphyrexia.PristineTalisman {
 
     public PristineTalisman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Propaganda.java b/Mage.Sets/src/mage/sets/commander2013/Propaganda.java
index e6c54a0435..77d24264bc 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Propaganda.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Propaganda.java
@@ -37,7 +37,7 @@ public class Propaganda extends mage.sets.tempest.Propaganda {
 
     public Propaganda(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/QuagmireDruid.java b/Mage.Sets/src/mage/sets/commander2013/QuagmireDruid.java
index a17c1e3753..45d7297c16 100644
--- a/Mage.Sets/src/mage/sets/commander2013/QuagmireDruid.java
+++ b/Mage.Sets/src/mage/sets/commander2013/QuagmireDruid.java
@@ -37,7 +37,7 @@ public class QuagmireDruid extends mage.sets.apocalypse.QuagmireDruid {
 
     public QuagmireDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RainOfThorns.java b/Mage.Sets/src/mage/sets/commander2013/RainOfThorns.java
index 99a45a1697..78c1ed273b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RainOfThorns.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RainOfThorns.java
@@ -37,7 +37,7 @@ public class RainOfThorns extends mage.sets.avacynrestored.RainOfThorns {
 
     public RainOfThorns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/commander2013/RakdosCarnarium.java
index 31d44f5ff7..9175775b43 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RakdosCarnarium.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RakdosCarnarium.java
@@ -37,7 +37,7 @@ public class RakdosCarnarium extends mage.sets.dissension.RakdosCarnarium {
 
     public RakdosCarnarium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RakdosGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/RakdosGuildgate.java
index d3a966fffe..4a121ce23d 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RakdosGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RakdosGuildgate.java
@@ -37,7 +37,7 @@ public class RakdosGuildgate extends mage.sets.returntoravnica.RakdosGuildgate {
 
     public RakdosGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RakeclawGargantuan.java b/Mage.Sets/src/mage/sets/commander2013/RakeclawGargantuan.java
index c3596508be..56b330dd39 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RakeclawGargantuan.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RakeclawGargantuan.java
@@ -37,7 +37,7 @@ public class RakeclawGargantuan extends mage.sets.shardsofalara.RakeclawGargantu
 
     public RakeclawGargantuan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RampagingBaloths.java b/Mage.Sets/src/mage/sets/commander2013/RampagingBaloths.java
index e1b935aa67..35c2a710a3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RampagingBaloths.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RampagingBaloths.java
@@ -37,7 +37,7 @@ public class RampagingBaloths extends mage.sets.zendikar.RampagingBaloths {
 
     public RampagingBaloths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RavenFamiliar.java b/Mage.Sets/src/mage/sets/commander2013/RavenFamiliar.java
index 540d90d3c4..6e94f5f64e 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RavenFamiliar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RavenFamiliar.java
@@ -37,7 +37,7 @@ public class RavenFamiliar extends mage.sets.urzaslegacy.RavenFamiliar {
 
     public RavenFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RavenousBaloth.java b/Mage.Sets/src/mage/sets/commander2013/RavenousBaloth.java
index 09a1766466..dc0c82b222 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RavenousBaloth.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RavenousBaloth.java
@@ -37,7 +37,7 @@ public class RavenousBaloth extends mage.sets.onslaught.RavenousBaloth {
 
     public RavenousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RazorHippogriff.java b/Mage.Sets/src/mage/sets/commander2013/RazorHippogriff.java
index dc01e955bc..ae3a402342 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RazorHippogriff.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RazorHippogriff.java
@@ -37,7 +37,7 @@ public class RazorHippogriff extends mage.sets.scarsofmirrodin.RazorHippogriff {
 
     public RazorHippogriff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RecklessSpite.java b/Mage.Sets/src/mage/sets/commander2013/RecklessSpite.java
index 3161ad5789..b8867e3eec 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RecklessSpite.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RecklessSpite.java
@@ -37,7 +37,7 @@ public class RecklessSpite extends mage.sets.tempest.RecklessSpite {
 
     public RecklessSpite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/RuptureSpire.java b/Mage.Sets/src/mage/sets/commander2013/RuptureSpire.java
index 41d6b51f69..781119a897 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RuptureSpire.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RuptureSpire.java
@@ -37,7 +37,7 @@ public class RuptureSpire extends mage.sets.conflux.RuptureSpire {
 
     public RuptureSpire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/commander2013/SakuraTribeElder.java
index 2fa9985ad2..fc74bfcc3f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SakuraTribeElder.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SakuraTribeElder.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder extends mage.sets.championsofkamigawa.SakuraTribeE
 
     public SakuraTribeElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SanguineBond.java b/Mage.Sets/src/mage/sets/commander2013/SanguineBond.java
index 639cd17c1b..ef8180fd00 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SanguineBond.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SanguineBond.java
@@ -37,7 +37,7 @@ public class SanguineBond extends mage.sets.magic2010.SanguineBond {
 
     public SanguineBond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SavageLands.java b/Mage.Sets/src/mage/sets/commander2013/SavageLands.java
index 57510d0afd..ee7a1a2484 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SavageLands.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SavageLands.java
@@ -37,7 +37,7 @@ public class SavageLands extends mage.sets.shardsofalara.SavageLands {
 
     public SavageLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ScarlandThrinax.java b/Mage.Sets/src/mage/sets/commander2013/ScarlandThrinax.java
index 405a8e8937..70221c5d23 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ScarlandThrinax.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ScarlandThrinax.java
@@ -37,7 +37,7 @@ public class ScarlandThrinax extends mage.sets.conflux.ScarlandThrinax {
 
     public ScarlandThrinax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SeasideCitadel.java b/Mage.Sets/src/mage/sets/commander2013/SeasideCitadel.java
index 843235fdd3..7f4cc2d188 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SeasideCitadel.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SeasideCitadel.java
@@ -37,7 +37,7 @@ public class SeasideCitadel extends mage.sets.shardsofalara.SeasideCitadel {
 
     public SeasideCitadel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SecludedSteppe.java b/Mage.Sets/src/mage/sets/commander2013/SecludedSteppe.java
index ee0cc3e038..ee7c427009 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SeersSundial.java b/Mage.Sets/src/mage/sets/commander2013/SeersSundial.java
index 19b43affb6..1394f61f04 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SeersSundial.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SeersSundial.java
@@ -37,7 +37,7 @@ public class SeersSundial extends mage.sets.worldwake.SeersSundial {
 
     public SeersSundial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SejiriRefuge.java b/Mage.Sets/src/mage/sets/commander2013/SejiriRefuge.java
index ff168919bd..f85426df91 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SejiriRefuge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SejiriRefuge.java
@@ -37,7 +37,7 @@ public class SejiriRefuge extends mage.sets.zendikar.SejiriRefuge {
 
     public SejiriRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SelesnyaCharm.java b/Mage.Sets/src/mage/sets/commander2013/SelesnyaCharm.java
index ba52e7d51c..ade8020605 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SelesnyaCharm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SelesnyaCharm.java
@@ -37,7 +37,7 @@ public class SelesnyaCharm extends mage.sets.returntoravnica.SelesnyaCharm {
 
     public SelesnyaCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildgate.java
index 09fb355030..fa58ef220a 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildgate.java
@@ -37,7 +37,7 @@ public class SelesnyaGuildgate extends mage.sets.returntoravnica.SelesnyaGuildga
 
     public SelesnyaGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildmage.java b/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildmage.java
index b0e7ebaabd..076923a162 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildmage.java
@@ -37,7 +37,7 @@ public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
 
     public SelesnyaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/commander2013/SelesnyaSanctuary.java
index 93f0abef3e..c13599332f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SelesnyaSanctuary.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SelesnyaSanctuary.java
@@ -37,7 +37,7 @@ public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
 
     public SelesnyaSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SelesnyaSignet.java b/Mage.Sets/src/mage/sets/commander2013/SelesnyaSignet.java
index d2857c8575..ac208b6c61 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SelesnyaSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SelesnyaSignet.java
@@ -37,7 +37,7 @@ public class SelesnyaSignet extends mage.sets.ravnica.SelesnyaSignet {
 
     public SelesnyaSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SerraAvatar.java b/Mage.Sets/src/mage/sets/commander2013/SerraAvatar.java
index deeb7567ef..67c448a86c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SerraAvatar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SerraAvatar.java
@@ -38,7 +38,7 @@ public class SerraAvatar extends mage.sets.urzassaga.SerraAvatar {
 
     public SerraAvatar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "C13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2013/ShardingSphinx.java b/Mage.Sets/src/mage/sets/commander2013/ShardingSphinx.java
index 5625f26152..32813124e2 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ShardingSphinx.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ShardingSphinx.java
@@ -37,7 +37,7 @@ public class ShardingSphinx extends mage.sets.shardsofalara.ShardingSphinx {
 
     public ShardingSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SharuumTheHegemon.java b/Mage.Sets/src/mage/sets/commander2013/SharuumTheHegemon.java
index 4f336ba59a..53de9f32a4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SharuumTheHegemon.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SharuumTheHegemon.java
@@ -37,7 +37,7 @@ public class SharuumTheHegemon extends mage.sets.shardsofalara.SharuumTheHegemon
 
     public SharuumTheHegemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SilklashSpider.java b/Mage.Sets/src/mage/sets/commander2013/SilklashSpider.java
index 5b00eb948e..380dee21bf 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SilklashSpider.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SilklashSpider.java
@@ -37,7 +37,7 @@ public class SilklashSpider extends mage.sets.onslaught.SilklashSpider {
 
     public SilklashSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SimicGuildgate.java b/Mage.Sets/src/mage/sets/commander2013/SimicGuildgate.java
index 9a3ea49c43..8b19317dfa 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SimicGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SimicGuildgate.java
@@ -37,7 +37,7 @@ public class SimicGuildgate extends mage.sets.gatecrash.SimicGuildgate {
 
     public SimicGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SimicSignet.java b/Mage.Sets/src/mage/sets/commander2013/SimicSignet.java
index ce59c1b50e..37357dc311 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SimicSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SimicSignet.java
@@ -37,7 +37,7 @@ public class SimicSignet extends mage.sets.dissension.SimicSignet {
 
     public SimicSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SkywardEyeProphets.java b/Mage.Sets/src/mage/sets/commander2013/SkywardEyeProphets.java
index fefba0de3b..beac43b059 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SkywardEyeProphets.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SkywardEyeProphets.java
@@ -37,7 +37,7 @@ public class SkywardEyeProphets extends mage.sets.conflux.SkywardEyeProphets {
 
     public SkywardEyeProphets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SliceAndDice.java b/Mage.Sets/src/mage/sets/commander2013/SliceAndDice.java
index a75fba03ea..7b26b8e833 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SliceAndDice.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SliceAndDice.java
@@ -37,7 +37,7 @@ public class SliceAndDice extends mage.sets.onslaught.SliceAndDice {
 
     public SliceAndDice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SliceInTwain.java b/Mage.Sets/src/mage/sets/commander2013/SliceInTwain.java
index 4491fb2858..2c0b63674f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SliceInTwain.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SliceInTwain.java
@@ -37,7 +37,7 @@ public class SliceInTwain extends mage.sets.scarsofmirrodin.SliceinTwain {
 
     public SliceInTwain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SlipperyKarst.java b/Mage.Sets/src/mage/sets/commander2013/SlipperyKarst.java
index 81ec10577a..5cc6b9b14e 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SlipperyKarst.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SlipperyKarst.java
@@ -37,7 +37,7 @@ public class SlipperyKarst extends mage.sets.urzassaga.SlipperyKarst {
 
     public SlipperyKarst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SmolderingCrater.java b/Mage.Sets/src/mage/sets/commander2013/SmolderingCrater.java
index 806ec3698c..1eec1c2436 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SmolderingCrater.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SmolderingCrater.java
@@ -37,7 +37,7 @@ public class SmolderingCrater extends mage.sets.urzassaga.SmolderingCrater {
 
     public SmolderingCrater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SolRing.java b/Mage.Sets/src/mage/sets/commander2013/SolRing.java
index 3f0f2291e4..2b19f8c4ac 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SolRing.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SoulManipulation.java b/Mage.Sets/src/mage/sets/commander2013/SoulManipulation.java
index 0e87c857b5..1d5b0204b5 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SoulManipulation.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SoulManipulation.java
@@ -37,7 +37,7 @@ public class SoulManipulation extends mage.sets.alarareborn.SoulManipulation {
 
     public SoulManipulation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SpellbreakerBehemoth.java b/Mage.Sets/src/mage/sets/commander2013/SpellbreakerBehemoth.java
index 4b978137b2..37d0c3ad72 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SpellbreakerBehemoth.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SpellbreakerBehemoth.java
@@ -37,7 +37,7 @@ public class SpellbreakerBehemoth extends mage.sets.alarareborn.SpellbreakerBehe
 
     public SpellbreakerBehemoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SphinxOfTheSteelWind.java b/Mage.Sets/src/mage/sets/commander2013/SphinxOfTheSteelWind.java
index b9e02851df..2147796afa 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SphinxOfTheSteelWind.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SphinxOfTheSteelWind.java
@@ -37,7 +37,7 @@ public class SphinxOfTheSteelWind extends mage.sets.alarareborn.SphinxOfTheSteel
 
     public SphinxOfTheSteelWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SpinalEmbrace.java b/Mage.Sets/src/mage/sets/commander2013/SpinalEmbrace.java
index f6599d4561..9809abfaa0 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SpinalEmbrace.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SpinalEmbrace.java
@@ -37,7 +37,7 @@ public class SpinalEmbrace extends mage.sets.invasion.SpinalEmbrace {
 
     public SpinalEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SpineOfIshSah.java b/Mage.Sets/src/mage/sets/commander2013/SpineOfIshSah.java
index ac8c1b6447..1ea738234f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SpineOfIshSah.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SpineOfIshSah.java
@@ -37,7 +37,7 @@ public class SpineOfIshSah extends mage.sets.mirrodinbesieged.SpineOfIshSah {
 
     public SpineOfIshSah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Spitebellows.java b/Mage.Sets/src/mage/sets/commander2013/Spitebellows.java
index 9834bc5637..93990c14cf 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Spitebellows.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Spitebellows.java
@@ -37,7 +37,7 @@ public class Spitebellows extends mage.sets.commander.Spitebellows {
 
     public Spitebellows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SpitefulVisions.java b/Mage.Sets/src/mage/sets/commander2013/SpitefulVisions.java
index ba119bf000..b7d168948f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SpitefulVisions.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SpitefulVisions.java
@@ -37,7 +37,7 @@ public class SpitefulVisions extends mage.sets.shadowmoor.SpitefulVisions {
 
     public SpitefulVisions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SproutingThrinax.java b/Mage.Sets/src/mage/sets/commander2013/SproutingThrinax.java
index d97460c5d2..618a99d311 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SproutingThrinax.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SproutingThrinax.java
@@ -37,7 +37,7 @@ public class SproutingThrinax extends mage.sets.shardsofalara.SproutingThrinax {
 
     public SproutingThrinax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SproutingVines.java b/Mage.Sets/src/mage/sets/commander2013/SproutingVines.java
index de79736b1b..de53512a3f 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SproutingVines.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SproutingVines.java
@@ -37,7 +37,7 @@ public class SproutingVines extends mage.sets.scourge.SproutingVines {
 
     public SproutingVines(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Starstorm.java b/Mage.Sets/src/mage/sets/commander2013/Starstorm.java
index 621925263e..0143d29bc9 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Starstorm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Starstorm.java
@@ -37,7 +37,7 @@ public class Starstorm extends mage.sets.onslaught.Starstorm {
 
     public Starstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/StreetSpasm.java b/Mage.Sets/src/mage/sets/commander2013/StreetSpasm.java
index f8080ea8bc..2564f13533 100644
--- a/Mage.Sets/src/mage/sets/commander2013/StreetSpasm.java
+++ b/Mage.Sets/src/mage/sets/commander2013/StreetSpasm.java
@@ -37,7 +37,7 @@ public class StreetSpasm extends mage.sets.returntoravnica.StreetSpasm {
 
     public StreetSpasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/StrongholdAssassin.java b/Mage.Sets/src/mage/sets/commander2013/StrongholdAssassin.java
index 9d5b2f6c92..076e3646f6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/StrongholdAssassin.java
+++ b/Mage.Sets/src/mage/sets/commander2013/StrongholdAssassin.java
@@ -37,7 +37,7 @@ public class StrongholdAssassin extends mage.sets.stronghold.StrongholdAssassin
 
     public StrongholdAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SuddenSpoiling.java b/Mage.Sets/src/mage/sets/commander2013/SuddenSpoiling.java
index c538cc7e3c..8841fa2aa3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SuddenSpoiling.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SuddenSpoiling.java
@@ -37,7 +37,7 @@ public class SuddenSpoiling extends mage.sets.timespiral.SuddenSpoiling {
 
     public SuddenSpoiling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SurvivalCache.java b/Mage.Sets/src/mage/sets/commander2013/SurvivalCache.java
index e01108646c..2246644598 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SurvivalCache.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SurvivalCache.java
@@ -37,7 +37,7 @@ public class SurvivalCache extends mage.sets.riseoftheeldrazi.SurvivalCache {
 
     public SurvivalCache(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SwiftfootBoots.java b/Mage.Sets/src/mage/sets/commander2013/SwiftfootBoots.java
index f512ff7bb4..b169abfcc4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SwiftfootBoots.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SwiftfootBoots.java
@@ -37,7 +37,7 @@ public class SwiftfootBoots extends mage.sets.magic2012.SwiftfootBoots {
 
     public SwiftfootBoots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TempleBell.java b/Mage.Sets/src/mage/sets/commander2013/TempleBell.java
index e39da52f10..1c61c6dbb6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TempleBell.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TempleBell.java
@@ -37,7 +37,7 @@ public class TempleBell extends mage.sets.magic2011.TempleBell {
 
     public TempleBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/commander2013/TerramorphicExpanse.java
index 4ed52ecf59..d352707aad 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 328;
+        this.cardNumber = "328";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ThopterFoundry.java b/Mage.Sets/src/mage/sets/commander2013/ThopterFoundry.java
index db382c5e86..b674ee976c 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ThopterFoundry.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ThopterFoundry.java
@@ -37,7 +37,7 @@ public class ThopterFoundry extends mage.sets.alarareborn.ThopterFoundry {
 
     public ThopterFoundry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ThornwindFaeries.java b/Mage.Sets/src/mage/sets/commander2013/ThornwindFaeries.java
index 3437704a7c..150ace105a 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ThornwindFaeries.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ThornwindFaeries.java
@@ -37,7 +37,7 @@ public class ThornwindFaeries extends mage.sets.urzaslegacy.ThornwindFaeries {
 
     public ThornwindFaeries(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Thraximundar.java b/Mage.Sets/src/mage/sets/commander2013/Thraximundar.java
index ce308203e5..9785e54069 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Thraximundar.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Thraximundar.java
@@ -37,7 +37,7 @@ public class Thraximundar extends mage.sets.alarareborn.Thraximundar {
 
     public Thraximundar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TidehollowStrix.java b/Mage.Sets/src/mage/sets/commander2013/TidehollowStrix.java
index 91eff35b1d..c9a2fc8034 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TidehollowStrix.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TidehollowStrix.java
@@ -37,7 +37,7 @@ public class TidehollowStrix extends mage.sets.shardsofalara.TidehollowStrix {
 
     public TidehollowStrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ToothAndClaw.java b/Mage.Sets/src/mage/sets/commander2013/ToothAndClaw.java
index bbff177322..6d234624d5 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ToothAndClaw.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ToothAndClaw.java
@@ -37,7 +37,7 @@ public class ToothAndClaw extends mage.sets.tempest.ToothAndClaw {
 
     public ToothAndClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TowerGargoyle.java b/Mage.Sets/src/mage/sets/commander2013/TowerGargoyle.java
index 6c9a247f87..e916908386 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TowerGargoyle.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TowerGargoyle.java
@@ -37,7 +37,7 @@ public class TowerGargoyle extends mage.sets.shardsofalara.TowerGargoyle {
 
     public TowerGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TowerOfFortunes.java b/Mage.Sets/src/mage/sets/commander2013/TowerOfFortunes.java
index c3d455bc42..86f8805b01 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TowerOfFortunes.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TowerOfFortunes.java
@@ -37,7 +37,7 @@ public class TowerOfFortunes extends mage.sets.mirrodin.TowerOfFortunes {
 
     public TowerOfFortunes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TranquilThicket.java b/Mage.Sets/src/mage/sets/commander2013/TranquilThicket.java
index 950315d5d9..5cbaea7b43 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 329;
+        this.cardNumber = "329";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/TransguildPromenade.java b/Mage.Sets/src/mage/sets/commander2013/TransguildPromenade.java
index a1590bbaec..90368e1ca6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TransguildPromenade.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TransguildPromenade.java
@@ -37,7 +37,7 @@ public class TransguildPromenade extends mage.sets.returntoravnica.TransguildPro
 
     public TransguildPromenade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 330;
+        this.cardNumber = "330";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/UrzasFactory.java b/Mage.Sets/src/mage/sets/commander2013/UrzasFactory.java
index dff34975d1..e300b77302 100644
--- a/Mage.Sets/src/mage/sets/commander2013/UrzasFactory.java
+++ b/Mage.Sets/src/mage/sets/commander2013/UrzasFactory.java
@@ -37,7 +37,7 @@ public class UrzasFactory extends mage.sets.timespiral.UrzasFactory {
 
     public UrzasFactory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 331;
+        this.cardNumber = "331";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/UyoSilentProphet.java b/Mage.Sets/src/mage/sets/commander2013/UyoSilentProphet.java
index 8dd56aee64..ae21020258 100644
--- a/Mage.Sets/src/mage/sets/commander2013/UyoSilentProphet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/UyoSilentProphet.java
@@ -37,7 +37,7 @@ public class UyoSilentProphet extends mage.sets.championsofkamigawa.UyoSilentPro
 
     public UyoSilentProphet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/ValleyRannet.java b/Mage.Sets/src/mage/sets/commander2013/ValleyRannet.java
index 114bea1f2d..cf200083a5 100644
--- a/Mage.Sets/src/mage/sets/commander2013/ValleyRannet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/ValleyRannet.java
@@ -37,7 +37,7 @@ public class ValleyRannet extends mage.sets.alarareborn.ValleyRannet {
 
     public ValleyRannet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VampireNighthawk.java b/Mage.Sets/src/mage/sets/commander2013/VampireNighthawk.java
index e977bf2682..36a3f3c3c4 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VampireNighthawk.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VampireNighthawk.java
@@ -37,7 +37,7 @@ public class VampireNighthawk extends mage.sets.zendikar.VampireNighthawk {
 
     public VampireNighthawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VileRequiem.java b/Mage.Sets/src/mage/sets/commander2013/VileRequiem.java
index 29b071882b..ce120b3d90 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VileRequiem.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VileRequiem.java
@@ -37,7 +37,7 @@ public class VileRequiem extends mage.sets.urzassaga.VileRequiem {
 
     public VileRequiem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VisceraSeer.java b/Mage.Sets/src/mage/sets/commander2013/VisceraSeer.java
index 4853399d3d..d2c3f265ef 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VisceraSeer.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VisceraSeer.java
@@ -37,7 +37,7 @@ public class VisceraSeer extends mage.sets.magic2011.VisceraSeer {
 
     public VisceraSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Viseling.java b/Mage.Sets/src/mage/sets/commander2013/Viseling.java
index 3b0f99215d..a951e24c29 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Viseling.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Viseling.java
@@ -37,7 +37,7 @@ public class Viseling extends mage.sets.nemesis.Viseling {
 
     public Viseling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/sets/commander2013/VituGhaziTheCityTree.java
index 3f6628a4c9..bd9d1d10ba 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VituGhaziTheCityTree.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VituGhaziTheCityTree.java
@@ -37,7 +37,7 @@ public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree
 
     public VituGhaziTheCityTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 332;
+        this.cardNumber = "332";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VividCrag.java b/Mage.Sets/src/mage/sets/commander2013/VividCrag.java
index 3d46e6eff4..013a8213b8 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VividCrag.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VividCrag.java
@@ -37,7 +37,7 @@ public class VividCrag extends mage.sets.lorwyn.VividCrag {
 
     public VividCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 333;
+        this.cardNumber = "333";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VividCreek.java b/Mage.Sets/src/mage/sets/commander2013/VividCreek.java
index c732b96d31..610a8880e0 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VividCreek.java
@@ -37,7 +37,7 @@ public class VividCreek extends mage.sets.lorwyn.VividCreek {
 
     public VividCreek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 334;
+        this.cardNumber = "334";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VividGrove.java b/Mage.Sets/src/mage/sets/commander2013/VividGrove.java
index 9d40207cb5..f6d707c581 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VividGrove.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VividGrove.java
@@ -37,7 +37,7 @@ public class VividGrove extends mage.sets.lorwyn.VividGrove {
 
     public VividGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 335;
+        this.cardNumber = "335";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VividMarsh.java b/Mage.Sets/src/mage/sets/commander2013/VividMarsh.java
index c523290cdb..04e3143d08 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VividMarsh.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VividMarsh.java
@@ -37,7 +37,7 @@ public class VividMarsh extends mage.sets.lorwyn.VividMarsh {
 
     public VividMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 336;
+        this.cardNumber = "336";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/VizkopaGuildmage.java b/Mage.Sets/src/mage/sets/commander2013/VizkopaGuildmage.java
index 4e9d6fbb13..698d7c5ca6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/VizkopaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander2013/VizkopaGuildmage.java
@@ -37,7 +37,7 @@ public class VizkopaGuildmage extends mage.sets.gatecrash.VizkopaGuildmage {
 
     public VizkopaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WalkerOfTheGrove.java b/Mage.Sets/src/mage/sets/commander2013/WalkerOfTheGrove.java
index b8b2a8bd2d..8dc08fb5de 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WalkerOfTheGrove.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WalkerOfTheGrove.java
@@ -37,7 +37,7 @@ public class WalkerOfTheGrove extends mage.sets.morningtide.WalkerOfTheGrove {
 
     public WalkerOfTheGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WallOfReverence.java b/Mage.Sets/src/mage/sets/commander2013/WallOfReverence.java
index 93d04bbd3f..0df80d6395 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WallOfReverence.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WallOfReverence.java
@@ -37,7 +37,7 @@ public class WallOfReverence extends mage.sets.conflux.WallOfReverence {
 
     public WallOfReverence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WarstormSurge.java b/Mage.Sets/src/mage/sets/commander2013/WarstormSurge.java
index 44749372c4..57ca71c2c3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WarstormSurge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WarstormSurge.java
@@ -37,7 +37,7 @@ public class WarstormSurge extends mage.sets.magic2012.WarstormSurge {
 
     public WarstormSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WashOut.java b/Mage.Sets/src/mage/sets/commander2013/WashOut.java
index be13c6db24..8bd79594b1 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WashOut.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WashOut.java
@@ -37,7 +37,7 @@ public class WashOut extends mage.sets.invasion.WashOut {
 
     public WashOut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WhereAncientsTread.java b/Mage.Sets/src/mage/sets/commander2013/WhereAncientsTread.java
index e229ff2e74..6b7757f4da 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WhereAncientsTread.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WhereAncientsTread.java
@@ -37,7 +37,7 @@ public class WhereAncientsTread extends mage.sets.shardsofalara.WhereAncientsTre
 
     public WhereAncientsTread(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WightOfPrecinctSix.java b/Mage.Sets/src/mage/sets/commander2013/WightOfPrecinctSix.java
index be07a9d684..809172dec8 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WightOfPrecinctSix.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WightOfPrecinctSix.java
@@ -37,7 +37,7 @@ public class WightOfPrecinctSix extends mage.sets.gatecrash.WightOfPrecinctSix {
 
     public WightOfPrecinctSix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WildRicochet.java b/Mage.Sets/src/mage/sets/commander2013/WildRicochet.java
index eb52d0b79b..acd0924164 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WildRicochet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WildRicochet.java
@@ -37,7 +37,7 @@ public class WildRicochet extends mage.sets.commander.WildRicochet {
 
     public WildRicochet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WingedCoatl.java b/Mage.Sets/src/mage/sets/commander2013/WingedCoatl.java
index 4f47be6691..062a5bd02b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WingedCoatl.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WingedCoatl.java
@@ -37,7 +37,7 @@ public class WingedCoatl extends mage.sets.alarareborn.WingedCoatl {
 
     public WingedCoatl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/Wonder.java b/Mage.Sets/src/mage/sets/commander2013/Wonder.java
index b681f2e162..fd91a9bad7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Wonder.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Wonder.java
@@ -37,7 +37,7 @@ public class Wonder extends mage.sets.judgment.Wonder {
 
     public Wonder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/WrathOfGod.java b/Mage.Sets/src/mage/sets/commander2013/WrathOfGod.java
index 63b7ca8809..a9df394285 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "C13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/AbyssalPersecutor.java b/Mage.Sets/src/mage/sets/commander2014/AbyssalPersecutor.java
index 41b475df10..3b0b2316a7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/AbyssalPersecutor.java
+++ b/Mage.Sets/src/mage/sets/commander2014/AbyssalPersecutor.java
@@ -37,7 +37,7 @@ public class AbyssalPersecutor extends mage.sets.worldwake.AbyssalPersecutor {
 
     public AbyssalPersecutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/AdarkarValkyrie.java b/Mage.Sets/src/mage/sets/commander2014/AdarkarValkyrie.java
index 5a6f3a7705..d95ddaf92a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/AdarkarValkyrie.java
+++ b/Mage.Sets/src/mage/sets/commander2014/AdarkarValkyrie.java
@@ -37,7 +37,7 @@ public class AdarkarValkyrie extends mage.sets.coldsnap.AdarkarValkyrie {
 
     public AdarkarValkyrie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Afterlife.java b/Mage.Sets/src/mage/sets/commander2014/Afterlife.java
index 670945e78b..d2e13f1190 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Afterlife.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Afterlife.java
@@ -37,7 +37,7 @@ public class Afterlife extends mage.sets.mirage.Afterlife {
 
     public Afterlife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Annihilate.java b/Mage.Sets/src/mage/sets/commander2014/Annihilate.java
index ce0209f02b..0f00c13470 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Annihilate.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Annihilate.java
@@ -37,7 +37,7 @@ public class Annihilate extends mage.sets.invasion.Annihilate {
 
     public Annihilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ArgentumArmor.java b/Mage.Sets/src/mage/sets/commander2014/ArgentumArmor.java
index d98c736be7..cad0d1545b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ArgentumArmor.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ArgentumArmor.java
@@ -37,7 +37,7 @@ public class ArgentumArmor extends mage.sets.scarsofmirrodin.ArgentumArmor {
 
     public ArgentumArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/commander2014/ArtisanOfKozilek.java
index a07c3463f3..aef85493b7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ArtisanOfKozilek.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ArtisanOfKozilek.java
@@ -37,7 +37,7 @@ public class ArtisanOfKozilek extends mage.sets.riseoftheeldrazi.ArtisanOfKozile
 
     public ArtisanOfKozilek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/AzureMage.java b/Mage.Sets/src/mage/sets/commander2014/AzureMage.java
index a36075e2fb..c340b98a85 100644
--- a/Mage.Sets/src/mage/sets/commander2014/AzureMage.java
+++ b/Mage.Sets/src/mage/sets/commander2014/AzureMage.java
@@ -37,7 +37,7 @@ public class AzureMage extends mage.sets.magic2012.AzureMage {
 
     public AzureMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BadMoon.java b/Mage.Sets/src/mage/sets/commander2014/BadMoon.java
index 173c929c27..5fdcacf706 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BarrenMoor.java b/Mage.Sets/src/mage/sets/commander2014/BarrenMoor.java
index f040ee8ebc..10f2417018 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/commander2014/BeastmasterAscension.java
index 15732a423f..81e11c541f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BeastmasterAscension.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BeastmasterAscension.java
@@ -37,7 +37,7 @@ public class BeastmasterAscension extends mage.sets.zendikar.BeastmasterAscensio
 
     public BeastmasterAscension(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BeetlebackChief.java b/Mage.Sets/src/mage/sets/commander2014/BeetlebackChief.java
index 6bbeda27a8..792960d1dd 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BeetlebackChief.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BeetlebackChief.java
@@ -37,7 +37,7 @@ public class BeetlebackChief extends mage.sets.planechase2012.BeetlebackChief {
 
     public BeetlebackChief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BlackSunsZenith.java b/Mage.Sets/src/mage/sets/commander2014/BlackSunsZenith.java
index 08d8326170..afe0281c4e 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BlackSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BlackSunsZenith.java
@@ -37,7 +37,7 @@ public class BlackSunsZenith extends mage.sets.mirrodinbesieged.BlackSunsZenith
 
     public BlackSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BlasphemousAct.java b/Mage.Sets/src/mage/sets/commander2014/BlasphemousAct.java
index 9dc7b629b6..5cbb7a4dfb 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BlasphemousAct.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BlasphemousAct.java
@@ -37,7 +37,7 @@ public class BlasphemousAct extends mage.sets.innistrad.BlasphemousAct {
 
     public BlasphemousAct(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BloodgiftDemon.java b/Mage.Sets/src/mage/sets/commander2014/BloodgiftDemon.java
index 7acac9218f..7e1afa299f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BloodgiftDemon.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BloodgiftDemon.java
@@ -37,7 +37,7 @@ public class BloodgiftDemon extends mage.sets.innistrad.BloodgiftDemon {
 
     public BloodgiftDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BogardanHellkite.java b/Mage.Sets/src/mage/sets/commander2014/BogardanHellkite.java
index b9274fa837..f092b06d91 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BogardanHellkite.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BogardanHellkite.java
@@ -37,7 +37,7 @@ public class BogardanHellkite extends mage.sets.magic2010.BogardanHellkite {
 
     public BogardanHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BojukaBog.java b/Mage.Sets/src/mage/sets/commander2014/BojukaBog.java
index b04b5100b7..a0d841f27b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BojukaBog.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BojukaBog.java
@@ -37,7 +37,7 @@ public class BojukaBog extends mage.sets.worldwake.BojukaBog {
 
     public BojukaBog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Bonehoard.java b/Mage.Sets/src/mage/sets/commander2014/Bonehoard.java
index 88c154cab0..457e05005f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Bonehoard.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Bonehoard.java
@@ -37,7 +37,7 @@ public class Bonehoard extends mage.sets.mirrodinbesieged.Bonehoard {
 
     public Bonehoard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BoshIronGolem.java b/Mage.Sets/src/mage/sets/commander2014/BoshIronGolem.java
index 6bb413e16a..0149a77d5d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BoshIronGolem.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BoshIronGolem.java
@@ -37,7 +37,7 @@ public class BoshIronGolem extends mage.sets.planechase.BoshIronGolem {
 
     public BoshIronGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BottleGnomes.java b/Mage.Sets/src/mage/sets/commander2014/BottleGnomes.java
index 22d18ffb0e..93c313e090 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BraveTheElements.java b/Mage.Sets/src/mage/sets/commander2014/BraveTheElements.java
index f222550303..14e2d8722d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BraveTheElements.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BraveTheElements.java
@@ -37,7 +37,7 @@ public class BraveTheElements extends mage.sets.zendikar.BraveTheElements {
 
     public BraveTheElements(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BuriedRuin.java b/Mage.Sets/src/mage/sets/commander2014/BuriedRuin.java
index 3816cce758..4ced3dd36a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BuriedRuin.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BuriedRuin.java
@@ -37,7 +37,7 @@ public class BuriedRuin extends mage.sets.magic2012.BuriedRuin {
 
     public BuriedRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/BurnishedHart.java b/Mage.Sets/src/mage/sets/commander2014/BurnishedHart.java
index dab56bfcfc..72aaf8717d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/BurnishedHart.java
+++ b/Mage.Sets/src/mage/sets/commander2014/BurnishedHart.java
@@ -37,7 +37,7 @@ public class BurnishedHart extends mage.sets.theros.BurnishedHart {
 
     public BurnishedHart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/commander2014/ButcherOfMalakir.java
index 1f1907af73..b8ecb8308a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ButcherOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ButcherOfMalakir.java
@@ -37,7 +37,7 @@ public class ButcherOfMalakir extends mage.sets.worldwake.ButcherOfMalakir {
 
     public ButcherOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CacklingCounterpart.java b/Mage.Sets/src/mage/sets/commander2014/CacklingCounterpart.java
index b5be21e529..47aa5e8d4b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CacklingCounterpart.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CacklingCounterpart.java
@@ -37,7 +37,7 @@ public class CacklingCounterpart extends mage.sets.innistrad.CacklingCounterpart
 
     public CacklingCounterpart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CagedSun.java b/Mage.Sets/src/mage/sets/commander2014/CagedSun.java
index c869043821..a1bc3d5eca 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CagedSun.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CagedSun.java
@@ -37,7 +37,7 @@ public class CagedSun extends mage.sets.newphyrexia.CagedSun {
 
     public CagedSun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CallToMind.java b/Mage.Sets/src/mage/sets/commander2014/CallToMind.java
index bf945b370f..771681697b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CallToMind.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CallToMind.java
@@ -37,7 +37,7 @@ public class CallToMind extends mage.sets.magic2011.CallToMind {
 
     public CallToMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CatharsCrusade.java b/Mage.Sets/src/mage/sets/commander2014/CatharsCrusade.java
index b2c768d680..448ec3c079 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CatharsCrusade.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CatharsCrusade.java
@@ -37,7 +37,7 @@ public class CatharsCrusade extends mage.sets.avacynrestored.CatharsCrusade {
 
     public CatharsCrusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Cathodion.java b/Mage.Sets/src/mage/sets/commander2014/Cathodion.java
index 4ea17a3b36..3b75987d93 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Cathodion.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Cathodion.java
@@ -37,7 +37,7 @@ public class Cathodion extends mage.sets.mirrodin.Cathodion {
 
     public Cathodion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CelestialCrusader.java b/Mage.Sets/src/mage/sets/commander2014/CelestialCrusader.java
index 9837c1b70d..ef681b1af8 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CelestialCrusader.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CelestialCrusader.java
@@ -37,7 +37,7 @@ public class CelestialCrusader extends mage.sets.elspethvstezzeret.CelestialCrus
 
     public CelestialCrusader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ChaosWarp.java b/Mage.Sets/src/mage/sets/commander2014/ChaosWarp.java
index 9d05f96eec..4d46dda055 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ChaosWarp.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ChaosWarp.java
@@ -37,7 +37,7 @@ public class ChaosWarp extends mage.sets.vintagemasters.ChaosWarp {
 
     public ChaosWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CharcoalDiamond.java b/Mage.Sets/src/mage/sets/commander2014/CharcoalDiamond.java
index f9d90b9265..8496096750 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CharcoalDiamond.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CharcoalDiamond.java
@@ -37,7 +37,7 @@ public class CharcoalDiamond extends mage.sets.seventhedition.CharcoalDiamond {
 
     public CharcoalDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CollectiveUnconscious.java b/Mage.Sets/src/mage/sets/commander2014/CollectiveUnconscious.java
index b0fb50c839..2e8cd32a16 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CollectiveUnconscious.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CollectiveUnconscious.java
@@ -37,7 +37,7 @@ public class CollectiveUnconscious extends mage.sets.mercadianmasques.Collective
 
     public CollectiveUnconscious(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CompulsiveResearch.java b/Mage.Sets/src/mage/sets/commander2014/CompulsiveResearch.java
index 8618f4731f..26049a29f1 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CompulsiveResearch.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CompulsiveResearch.java
@@ -37,7 +37,7 @@ public class CompulsiveResearch extends mage.sets.ravnica.CompulsiveResearch {
 
     public CompulsiveResearch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Concentrate.java b/Mage.Sets/src/mage/sets/commander2014/Concentrate.java
index 4c1ad783fc..53ba422add 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Concentrate.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Concentrate.java
@@ -37,7 +37,7 @@ public class Concentrate extends mage.sets.odyssey.Concentrate {
 
     public Concentrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Condemn.java b/Mage.Sets/src/mage/sets/commander2014/Condemn.java
index da148d3c28..04420ead42 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Condemn.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Condemn.java
@@ -37,7 +37,7 @@ public class Condemn extends mage.sets.tenthedition.Condemn {
 
     public Condemn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CryptGhast.java b/Mage.Sets/src/mage/sets/commander2014/CryptGhast.java
index 8bba089b7b..ec12a686d2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CryptGhast.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CryptGhast.java
@@ -37,7 +37,7 @@ public class CryptGhast extends mage.sets.gatecrash.CryptGhast {
 
     public CryptGhast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CryptOfAgadeem.java b/Mage.Sets/src/mage/sets/commander2014/CryptOfAgadeem.java
index 2297859dd1..428c8d1543 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CryptOfAgadeem.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CryptOfAgadeem.java
@@ -37,7 +37,7 @@ public class CryptOfAgadeem extends mage.sets.zendikar.CryptOfAgadeem {
 
     public CryptOfAgadeem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CrystalVein.java b/Mage.Sets/src/mage/sets/commander2014/CrystalVein.java
index 145db9c8ee..e06398f5e6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CrystalVein.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CrystalVein.java
@@ -37,7 +37,7 @@ public class CrystalVein extends mage.sets.mirage.CrystalVein {
 
     public CrystalVein(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/CyclonicRift.java b/Mage.Sets/src/mage/sets/commander2014/CyclonicRift.java
index 1948dfc587..d124595b49 100644
--- a/Mage.Sets/src/mage/sets/commander2014/CyclonicRift.java
+++ b/Mage.Sets/src/mage/sets/commander2014/CyclonicRift.java
@@ -37,7 +37,7 @@ public class CyclonicRift extends mage.sets.returntoravnica.CyclonicRift {
 
     public CyclonicRift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DarksteelCitadel.java b/Mage.Sets/src/mage/sets/commander2014/DarksteelCitadel.java
index a473f74216..f255f70a64 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DarksteelCitadel.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DarksteelCitadel.java
@@ -38,7 +38,7 @@ public class DarksteelCitadel extends mage.sets.darksteel.DarksteelCitadel {
 
     public DarksteelCitadel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "C14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2014/DecreeOfJustice.java b/Mage.Sets/src/mage/sets/commander2014/DecreeOfJustice.java
index e16d62d12b..fb17a8c12f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DecreeOfJustice.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DecreeOfJustice.java
@@ -37,7 +37,7 @@ public class DecreeOfJustice extends mage.sets.vintagemasters.DecreeOfJustice {
 
     public DecreeOfJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DeepSeaKraken.java b/Mage.Sets/src/mage/sets/commander2014/DeepSeaKraken.java
index 86f855b932..291282d3d8 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DeepSeaKraken.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DeepSeaKraken.java
@@ -37,7 +37,7 @@ public class DeepSeaKraken extends mage.sets.timespiral.DeepSeaKraken {
 
     public DeepSeaKraken(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DesertTwister.java b/Mage.Sets/src/mage/sets/commander2014/DesertTwister.java
index 69792b3707..b5613b469e 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DiscipleOfBolas.java b/Mage.Sets/src/mage/sets/commander2014/DiscipleOfBolas.java
index 93932a4a9c..0f051b973e 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DiscipleOfBolas.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DiscipleOfBolas.java
@@ -37,7 +37,7 @@ public class DiscipleOfBolas extends mage.sets.magic2013.DiscipleOfBolas {
 
     public DiscipleOfBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Dismiss.java b/Mage.Sets/src/mage/sets/commander2014/Dismiss.java
index 22b1ed72eb..9a34f50cc3 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Dismiss.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Dismiss.java
@@ -37,7 +37,7 @@ public class Dismiss extends mage.sets.tempest.Dismiss {
 
     public Dismiss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/sets/commander2014/DranaKalastriaBloodchief.java
index 71e95151ec..fbb7dda217 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DranaKalastriaBloodchief.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DranaKalastriaBloodchief.java
@@ -37,7 +37,7 @@ public class DranaKalastriaBloodchief extends mage.sets.riseoftheeldrazi.DranaKa
 
     public DranaKalastriaBloodchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DreadReturn.java b/Mage.Sets/src/mage/sets/commander2014/DreadReturn.java
index 38928c242d..19d5c44630 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DreadReturn.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DreadReturn.java
@@ -37,7 +37,7 @@ public class DreadReturn extends mage.sets.timespiral.DreadReturn {
 
     public DreadReturn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DreamstoneHedron.java b/Mage.Sets/src/mage/sets/commander2014/DreamstoneHedron.java
index 12d56256ef..c4391571cb 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DreamstoneHedron.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DreamstoneHedron.java
@@ -37,7 +37,7 @@ public class DreamstoneHedron extends mage.sets.riseoftheeldrazi.DreamstoneHedro
 
     public DreamstoneHedron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DriftingMeadow.java b/Mage.Sets/src/mage/sets/commander2014/DriftingMeadow.java
index 16e76f9419..9183d3443f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DriftingMeadow.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DriftingMeadow.java
@@ -37,7 +37,7 @@ public class DriftingMeadow extends mage.sets.urzassaga.DriftingMeadow {
 
     public DriftingMeadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/DroveOfElves.java b/Mage.Sets/src/mage/sets/commander2014/DroveOfElves.java
index caaa23f3ca..dc30b7f72b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/DroveOfElves.java
+++ b/Mage.Sets/src/mage/sets/commander2014/DroveOfElves.java
@@ -37,7 +37,7 @@ public class DroveOfElves extends mage.sets.shadowmoor.DroveOfElves {
 
     public DroveOfElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/commander2014/ElvishArchdruid.java
index 82a6de2fca..de8a12fee2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ElvishArchdruid.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ElvishArchdruid.java
@@ -37,7 +37,7 @@ public class ElvishArchdruid extends mage.sets.magic2010.ElvishArchdruid {
 
     public ElvishArchdruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ElvishMystic.java b/Mage.Sets/src/mage/sets/commander2014/ElvishMystic.java
index 9a652cfe41..42dbb4841a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ElvishMystic.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ElvishMystic.java
@@ -37,7 +37,7 @@ public class ElvishMystic extends mage.sets.magic2014.ElvishMystic {
 
     public ElvishMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/commander2014/ElvishSkysweeper.java
index a5cfce1b12..dfa94cd2d9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ElvishSkysweeper.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ElvishSkysweeper.java
@@ -37,7 +37,7 @@ public class ElvishSkysweeper extends mage.sets.ravnica.ElvishSkysweeper {
 
     public ElvishSkysweeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ElvishVisionary.java b/Mage.Sets/src/mage/sets/commander2014/ElvishVisionary.java
index d60ffb05df..5a1e63c275 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ElvishVisionary.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ElvishVisionary.java
@@ -37,7 +37,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
 
     public ElvishVisionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/EmeraldMedallion.java b/Mage.Sets/src/mage/sets/commander2014/EmeraldMedallion.java
index 100a9464b0..0ecdf45f36 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EmeraldMedallion.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EmeraldMedallion.java
@@ -37,7 +37,7 @@ public class EmeraldMedallion extends mage.sets.tempest.EmeraldMedallion {
 
     public EmeraldMedallion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/EmeriaTheSkyRuin.java b/Mage.Sets/src/mage/sets/commander2014/EmeriaTheSkyRuin.java
index f0bd159226..41126e172b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EmeriaTheSkyRuin.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EmeriaTheSkyRuin.java
@@ -37,7 +37,7 @@ public class EmeriaTheSkyRuin extends mage.sets.zendikar.EmeriaTheSkyRuin {
 
     public EmeriaTheSkyRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Epochrasite.java b/Mage.Sets/src/mage/sets/commander2014/Epochrasite.java
index a6d64b2476..b98e580078 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Epochrasite.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Epochrasite.java
@@ -38,7 +38,7 @@ public class Epochrasite extends mage.sets.modernmasters.Epochrasite {
 
     public Epochrasite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "C14";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2014/EssenceWarden.java b/Mage.Sets/src/mage/sets/commander2014/EssenceWarden.java
index 7198921f8f..20e75704f4 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EssenceWarden.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EssenceWarden.java
@@ -37,7 +37,7 @@ public class EssenceWarden extends mage.sets.planarchaos.EssenceWarden {
 
     public EssenceWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/EverflowingChalice.java b/Mage.Sets/src/mage/sets/commander2014/EverflowingChalice.java
index 1255c7ae3c..570fcac094 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EverflowingChalice.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EverflowingChalice.java
@@ -37,7 +37,7 @@ public class EverflowingChalice extends mage.sets.worldwake.EverflowingChalice {
 
     public EverflowingChalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/EvernightShade.java b/Mage.Sets/src/mage/sets/commander2014/EvernightShade.java
index 17e4a60576..1ecb465b12 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EvernightShade.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EvernightShade.java
@@ -37,7 +37,7 @@ public class EvernightShade extends mage.sets.avacynrestored.EvernightShade {
 
     public EvernightShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/EvolvingWilds.java b/Mage.Sets/src/mage/sets/commander2014/EvolvingWilds.java
index 90ff68141f..ee252ef785 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/sets/commander2014/EzuriRenegadeLeader.java
index 9f47681155..577818c004 100644
--- a/Mage.Sets/src/mage/sets/commander2014/EzuriRenegadeLeader.java
+++ b/Mage.Sets/src/mage/sets/commander2014/EzuriRenegadeLeader.java
@@ -37,7 +37,7 @@ public class EzuriRenegadeLeader extends mage.sets.scarsofmirrodin.EzuriRenegade
 
     public EzuriRenegadeLeader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FaithlessLooting.java b/Mage.Sets/src/mage/sets/commander2014/FaithlessLooting.java
index 455fe840a1..b93c943cce 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FaithlessLooting.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FaithlessLooting.java
@@ -37,7 +37,7 @@ public class FaithlessLooting extends mage.sets.darkascension.FaithlessLooting {
 
     public FaithlessLooting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FarhavenElf.java b/Mage.Sets/src/mage/sets/commander2014/FarhavenElf.java
index ab792354be..8086548f0f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FarhavenElf.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FarhavenElf.java
@@ -37,7 +37,7 @@ public class FarhavenElf extends mage.sets.shadowmoor.FarhavenElf {
 
     public FarhavenElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FathomSeer.java b/Mage.Sets/src/mage/sets/commander2014/FathomSeer.java
index 8cb0862d1b..4d899cbb31 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FathomSeer.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FathomSeer.java
@@ -37,7 +37,7 @@ public class FathomSeer extends mage.sets.jacevschandra.FathomSeer {
 
     public FathomSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FireDiamond.java b/Mage.Sets/src/mage/sets/commander2014/FireDiamond.java
index c051480fad..ae34b46404 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FireDiamond.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FireDiamond.java
@@ -37,7 +37,7 @@ public class FireDiamond extends mage.sets.seventhedition.FireDiamond {
 
     public FireDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FlametongueKavu.java b/Mage.Sets/src/mage/sets/commander2014/FlametongueKavu.java
index bd1068eecc..7880be98ae 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Flickerwisp.java b/Mage.Sets/src/mage/sets/commander2014/Flickerwisp.java
index 2e69acd3de..bff9dfecf7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Flickerwisp.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Flickerwisp.java
@@ -37,7 +37,7 @@ public class Flickerwisp extends mage.sets.eventide.Flickerwisp {
 
     public Flickerwisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FogBank.java b/Mage.Sets/src/mage/sets/commander2014/FogBank.java
index cb60eb8e66..cc530ad215 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FogBank.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FogBank.java
@@ -37,7 +37,7 @@ public class FogBank extends mage.sets.urzassaga.FogBank {
 
     public FogBank(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ForgottenCave.java b/Mage.Sets/src/mage/sets/commander2014/ForgottenCave.java
index 85c59713aa..1e5d9bcf47 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FreshMeat.java b/Mage.Sets/src/mage/sets/commander2014/FreshMeat.java
index 9d9e6380ce..99261c1352 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FreshMeat.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FreshMeat.java
@@ -37,7 +37,7 @@ public class FreshMeat extends mage.sets.newphyrexia.FreshMeat {
 
     public FreshMeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/FrostTitan.java b/Mage.Sets/src/mage/sets/commander2014/FrostTitan.java
index ec3e576a1e..43347c40ec 100644
--- a/Mage.Sets/src/mage/sets/commander2014/FrostTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2014/FrostTitan.java
@@ -37,7 +37,7 @@ public class FrostTitan extends mage.sets.magic2011.FrostTitan {
 
     public FrostTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GargoyleCastle.java b/Mage.Sets/src/mage/sets/commander2014/GargoyleCastle.java
index 2439f127d4..8093f459c4 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GargoyleCastle.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GargoyleCastle.java
@@ -37,7 +37,7 @@ public class GargoyleCastle extends mage.sets.magic2010.GargoyleCastle {
 
     public GargoyleCastle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GeistHonoredMonk.java b/Mage.Sets/src/mage/sets/commander2014/GeistHonoredMonk.java
index 0612e917ee..dcef30b546 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GeistHonoredMonk.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GeistHonoredMonk.java
@@ -37,7 +37,7 @@ public class GeistHonoredMonk extends mage.sets.innistrad.GeistHonoredMonk {
 
     public GeistHonoredMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GhostQuarter.java b/Mage.Sets/src/mage/sets/commander2014/GhostQuarter.java
index dc3e60e77c..518011f1d6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GhostQuarter.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GhostQuarter.java
@@ -37,7 +37,7 @@ public class GhostQuarter extends mage.sets.innistrad.GhostQuarter {
 
     public GhostQuarter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GoblinWelder.java b/Mage.Sets/src/mage/sets/commander2014/GoblinWelder.java
index 0fa9403d10..3adfd655e6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GoblinWelder.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GoblinWelder.java
@@ -37,7 +37,7 @@ public class GoblinWelder extends mage.sets.urzaslegacy.GoblinWelder {
 
     public GoblinWelder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GrandAbolisher.java b/Mage.Sets/src/mage/sets/commander2014/GrandAbolisher.java
index 913739d48e..173944c8bf 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GrandAbolisher.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GrandAbolisher.java
@@ -37,7 +37,7 @@ public class GrandAbolisher extends mage.sets.magic2012.GrandAbolisher {
 
     public GrandAbolisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GraveTitan.java b/Mage.Sets/src/mage/sets/commander2014/GraveTitan.java
index 3d1476ec3c..ed19ff07f6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GraveTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GraveTitan.java
@@ -37,7 +37,7 @@ public class GraveTitan extends mage.sets.magic2011.GraveTitan {
 
     public GraveTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GrayMerchantOfAsphodel.java b/Mage.Sets/src/mage/sets/commander2014/GrayMerchantOfAsphodel.java
index 1f2466da65..77c35ac9e0 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GrayMerchantOfAsphodel.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GrayMerchantOfAsphodel.java
@@ -37,7 +37,7 @@ public class GrayMerchantOfAsphodel extends mage.sets.theros.GrayMerchantOfAspho
 
     public GrayMerchantOfAsphodel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GreatFurnace.java b/Mage.Sets/src/mage/sets/commander2014/GreatFurnace.java
index 864e8faa2a..d2ed5b9533 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GreatFurnace.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GreatFurnace.java
@@ -37,7 +37,7 @@ public class GreatFurnace extends mage.sets.mirrodin.GreatFurnace {
 
     public GreatFurnace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/GrimFlowering.java b/Mage.Sets/src/mage/sets/commander2014/GrimFlowering.java
index 0262c63481..94e2ab854a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/GrimFlowering.java
+++ b/Mage.Sets/src/mage/sets/commander2014/GrimFlowering.java
@@ -37,7 +37,7 @@ public class GrimFlowering extends mage.sets.darkascension.GrimFlowering {
 
     public GrimFlowering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Harrow.java b/Mage.Sets/src/mage/sets/commander2014/Harrow.java
index 8349686678..2d680be7d7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Harrow.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Harrow.java
@@ -37,7 +37,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/HauntedFengraf.java b/Mage.Sets/src/mage/sets/commander2014/HauntedFengraf.java
index 6876ac7cfc..a8bd6d0ff5 100644
--- a/Mage.Sets/src/mage/sets/commander2014/HauntedFengraf.java
+++ b/Mage.Sets/src/mage/sets/commander2014/HauntedFengraf.java
@@ -37,7 +37,7 @@ public class HauntedFengraf extends mage.sets.darkascension.HauntedFengraf {
 
     public HauntedFengraf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/HavenwoodBattleground.java b/Mage.Sets/src/mage/sets/commander2014/HavenwoodBattleground.java
index 4422420448..faff5186f2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/HavenwoodBattleground.java
+++ b/Mage.Sets/src/mage/sets/commander2014/HavenwoodBattleground.java
@@ -37,7 +37,7 @@ public class HavenwoodBattleground extends mage.sets.fallenempires.HavenwoodBatt
 
     public HavenwoodBattleground(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/commander2014/HoardSmelterDragon.java
index d50d824a2e..5fbb033511 100644
--- a/Mage.Sets/src/mage/sets/commander2014/HoardSmelterDragon.java
+++ b/Mage.Sets/src/mage/sets/commander2014/HoardSmelterDragon.java
@@ -37,7 +37,7 @@ public class HoardSmelterDragon extends mage.sets.scarsofmirrodin.HoardSmelterDr
 
     public HoardSmelterDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/HoverguardSweepers.java b/Mage.Sets/src/mage/sets/commander2014/HoverguardSweepers.java
index 6e189c957d..1af36c6383 100644
--- a/Mage.Sets/src/mage/sets/commander2014/HoverguardSweepers.java
+++ b/Mage.Sets/src/mage/sets/commander2014/HoverguardSweepers.java
@@ -37,7 +37,7 @@ public class HoverguardSweepers extends mage.sets.fifthdawn.HoverguardSweepers {
 
     public HoverguardSweepers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/HuntingTriad.java b/Mage.Sets/src/mage/sets/commander2014/HuntingTriad.java
index cbdddb7061..d2865e672d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/HuntingTriad.java
+++ b/Mage.Sets/src/mage/sets/commander2014/HuntingTriad.java
@@ -37,7 +37,7 @@ public class HuntingTriad extends mage.sets.morningtide.HuntingTriad {
 
     public HuntingTriad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/IchorWellspring.java b/Mage.Sets/src/mage/sets/commander2014/IchorWellspring.java
index ff8c2383b7..3ab7423918 100644
--- a/Mage.Sets/src/mage/sets/commander2014/IchorWellspring.java
+++ b/Mage.Sets/src/mage/sets/commander2014/IchorWellspring.java
@@ -37,7 +37,7 @@ public class IchorWellspring extends mage.sets.mirrodinbesieged.IchorWellspring
 
     public IchorWellspring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ImmaculateMagistrate.java b/Mage.Sets/src/mage/sets/commander2014/ImmaculateMagistrate.java
index 0321e1aa77..e19950706b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ImmaculateMagistrate.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ImmaculateMagistrate.java
@@ -37,7 +37,7 @@ public class ImmaculateMagistrate extends mage.sets.lorwyn.ImmaculateMagistrate
 
     public ImmaculateMagistrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/commander2014/ImperiousPerfect.java
index 24b0f4a63c..2ca11a6b18 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ImperiousPerfect.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ImperiousPerfect.java
@@ -37,7 +37,7 @@ public class ImperiousPerfect extends mage.sets.lorwyn.ImperiousPerfect {
 
     public ImperiousPerfect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/InfiniteReflection.java b/Mage.Sets/src/mage/sets/commander2014/InfiniteReflection.java
index 1df3f9765f..96f1f9e062 100644
--- a/Mage.Sets/src/mage/sets/commander2014/InfiniteReflection.java
+++ b/Mage.Sets/src/mage/sets/commander2014/InfiniteReflection.java
@@ -37,7 +37,7 @@ public class InfiniteReflection extends mage.sets.avacynrestored.InfiniteReflect
 
     public InfiniteReflection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/IngotChewer.java b/Mage.Sets/src/mage/sets/commander2014/IngotChewer.java
index 4f771b00d8..b6d72c4b68 100644
--- a/Mage.Sets/src/mage/sets/commander2014/IngotChewer.java
+++ b/Mage.Sets/src/mage/sets/commander2014/IngotChewer.java
@@ -37,7 +37,7 @@ public class IngotChewer extends mage.sets.lorwyn.IngotChewer {
 
     public IngotChewer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/IntoTheRoil.java b/Mage.Sets/src/mage/sets/commander2014/IntoTheRoil.java
index 0d1a00d433..0ac0f8e93d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/IntoTheRoil.java
+++ b/Mage.Sets/src/mage/sets/commander2014/IntoTheRoil.java
@@ -37,7 +37,7 @@ public class IntoTheRoil extends mage.sets.zendikar.IntoTheRoil {
 
     public IntoTheRoil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/JalumTome.java b/Mage.Sets/src/mage/sets/commander2014/JalumTome.java
index 96d53c2bf2..6679039d9b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/JalumTome.java
+++ b/Mage.Sets/src/mage/sets/commander2014/JalumTome.java
@@ -37,7 +37,7 @@ public class JalumTome extends mage.sets.seventhedition.JalumTome {
 
     public JalumTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/JetMedallion.java b/Mage.Sets/src/mage/sets/commander2014/JetMedallion.java
index ab517aec12..354d11489c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/JetMedallion.java
+++ b/Mage.Sets/src/mage/sets/commander2014/JetMedallion.java
@@ -37,7 +37,7 @@ public class JetMedallion extends mage.sets.tempest.JetMedallion {
 
     public JetMedallion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/JoragaWarcaller.java b/Mage.Sets/src/mage/sets/commander2014/JoragaWarcaller.java
index 5b147b9673..ce5c8375b5 100644
--- a/Mage.Sets/src/mage/sets/commander2014/JoragaWarcaller.java
+++ b/Mage.Sets/src/mage/sets/commander2014/JoragaWarcaller.java
@@ -37,7 +37,7 @@ public class JoragaWarcaller extends mage.sets.worldwake.JoragaWarcaller {
 
     public JoragaWarcaller(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/KembaKhaRegent.java b/Mage.Sets/src/mage/sets/commander2014/KembaKhaRegent.java
index f1d5664a44..b1f296b929 100644
--- a/Mage.Sets/src/mage/sets/commander2014/KembaKhaRegent.java
+++ b/Mage.Sets/src/mage/sets/commander2014/KembaKhaRegent.java
@@ -37,7 +37,7 @@ public class KembaKhaRegent extends mage.sets.scarsofmirrodin.KembaKhaRegent {
 
     public KembaKhaRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/KorSanctifiers.java b/Mage.Sets/src/mage/sets/commander2014/KorSanctifiers.java
index aefa8c7cdf..68825e3a08 100644
--- a/Mage.Sets/src/mage/sets/commander2014/KorSanctifiers.java
+++ b/Mage.Sets/src/mage/sets/commander2014/KorSanctifiers.java
@@ -37,7 +37,7 @@ public class KorSanctifiers extends mage.sets.zendikar.KorSanctifiers {
 
     public KorSanctifiers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Lashwrithe.java b/Mage.Sets/src/mage/sets/commander2014/Lashwrithe.java
index 2c30121a73..32c2c8b434 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Lashwrithe.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Lashwrithe.java
@@ -37,7 +37,7 @@ public class Lashwrithe extends mage.sets.newphyrexia.Lashwrithe {
 
     public Lashwrithe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LilianasReaver.java b/Mage.Sets/src/mage/sets/commander2014/LilianasReaver.java
index 4beb5e447e..8c15a1ee47 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LilianasReaver.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LilianasReaver.java
@@ -37,7 +37,7 @@ public class LilianasReaver extends mage.sets.magic2014.LilianasReaver {
 
     public LilianasReaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LiquimetalCoating.java b/Mage.Sets/src/mage/sets/commander2014/LiquimetalCoating.java
index 416ed89fe2..7f3a13d729 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LiquimetalCoating.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LiquimetalCoating.java
@@ -37,7 +37,7 @@ public class LiquimetalCoating extends mage.sets.scarsofmirrodin.LiquimetalCoati
 
     public LiquimetalCoating(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LlanowarElves.java b/Mage.Sets/src/mage/sets/commander2014/LlanowarElves.java
index 6f24543239..d730fb88b1 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LonelySandbar.java b/Mage.Sets/src/mage/sets/commander2014/LonelySandbar.java
index 16da5dca0e..375fdcf8f4 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LonelySandbar.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LonelySandbar.java
@@ -37,7 +37,7 @@ public class LonelySandbar extends mage.sets.onslaught.LonelySandbar {
 
     public LonelySandbar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LorthosTheTidemaker.java b/Mage.Sets/src/mage/sets/commander2014/LorthosTheTidemaker.java
index 5e9a675bfd..25a56bc23c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LorthosTheTidemaker.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LorthosTheTidemaker.java
@@ -37,7 +37,7 @@ public class LorthosTheTidemaker extends mage.sets.zendikar.LorthosTheTidemaker
 
     public LorthosTheTidemaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/commander2014/LoxodonWarhammer.java
index cae7406486..5bc886445b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LoxodonWarhammer.java
@@ -37,7 +37,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
 
     public LoxodonWarhammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/commander2014/LysAlanaHuntmaster.java
index 6152357b6b..ec762d710b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/LysAlanaHuntmaster.java
+++ b/Mage.Sets/src/mage/sets/commander2014/LysAlanaHuntmaster.java
@@ -37,7 +37,7 @@ public class LysAlanaHuntmaster extends mage.sets.lorwyn.LysAlanaHuntmaster {
 
     public LysAlanaHuntmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Magmaquake.java b/Mage.Sets/src/mage/sets/commander2014/Magmaquake.java
index cce71020d9..bc8106311d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Magmaquake.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Magmaquake.java
@@ -37,7 +37,7 @@ public class Magmaquake extends mage.sets.magic2013.Magmaquake {
 
     public Magmaquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MarbleDiamond.java b/Mage.Sets/src/mage/sets/commander2014/MarbleDiamond.java
index 8ef07af050..8049bfd554 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MarbleDiamond.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MarbleDiamond.java
@@ -37,7 +37,7 @@ public class MarbleDiamond extends mage.sets.seventhedition.MarbleDiamond {
 
     public MarbleDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MarshalsAnthem.java b/Mage.Sets/src/mage/sets/commander2014/MarshalsAnthem.java
index 35ebe7844b..111ec39468 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MarshalsAnthem.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MarshalsAnthem.java
@@ -37,7 +37,7 @@ public class MarshalsAnthem extends mage.sets.worldwake.MarshalsAnthem {
 
     public MarshalsAnthem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MartialCoup.java b/Mage.Sets/src/mage/sets/commander2014/MartialCoup.java
index 7950af76ed..e9e7c93347 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MartialCoup.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MartialCoup.java
@@ -37,7 +37,7 @@ public class MartialCoup extends mage.sets.conflux.MartialCoup {
 
     public MartialCoup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MaskOfMemory.java b/Mage.Sets/src/mage/sets/commander2014/MaskOfMemory.java
index 1bccacc37e..86b6e4042f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MaskOfMemory.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MaskOfMemory.java
@@ -37,7 +37,7 @@ public class MaskOfMemory extends mage.sets.planechase.MaskOfMemory {
 
     public MaskOfMemory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MaskedAdmirers.java b/Mage.Sets/src/mage/sets/commander2014/MaskedAdmirers.java
index eb8c1a7401..dca2f4ab2a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MaskedAdmirers.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MaskedAdmirers.java
@@ -38,7 +38,7 @@ public class MaskedAdmirers extends mage.sets.modernmasters.MaskedAdmirers {
 
     public MaskedAdmirers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "C14";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2014/MentorOfTheMeek.java b/Mage.Sets/src/mage/sets/commander2014/MentorOfTheMeek.java
index 61a16ad705..8444349d7b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MentorOfTheMeek.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MentorOfTheMeek.java
@@ -37,7 +37,7 @@ public class MentorOfTheMeek extends mage.sets.innistrad.MentorOfTheMeek {
 
     public MentorOfTheMeek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MidnightHaunting.java b/Mage.Sets/src/mage/sets/commander2014/MidnightHaunting.java
index 3f7072e0fb..82ef8f4afa 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MidnightHaunting.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MidnightHaunting.java
@@ -37,7 +37,7 @@ public class MidnightHaunting extends mage.sets.innistrad.MidnightHaunting {
 
     public MidnightHaunting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MindStone.java b/Mage.Sets/src/mage/sets/commander2014/MindStone.java
index ecd8ba7c8a..51ae65dc80 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MindStone.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MindStone.java
@@ -37,7 +37,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Mobilization.java b/Mage.Sets/src/mage/sets/commander2014/Mobilization.java
index 06a3c2f6c3..ac8d73f756 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Mobilization.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Mobilization.java
@@ -37,7 +37,7 @@ public class Mobilization extends mage.sets.tenthedition.Mobilization {
 
     public Mobilization(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MoonsilverSpear.java b/Mage.Sets/src/mage/sets/commander2014/MoonsilverSpear.java
index 2711b80f0f..420b49acc6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MoonsilverSpear.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MoonsilverSpear.java
@@ -37,7 +37,7 @@ public class MoonsilverSpear extends mage.sets.avacynrestored.MoonsilverSpear {
 
     public MoonsilverSpear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MorkrutBanshee.java b/Mage.Sets/src/mage/sets/commander2014/MorkrutBanshee.java
index 93d502ea19..57985609c2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MorkrutBanshee.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MorkrutBanshee.java
@@ -37,7 +37,7 @@ public class MorkrutBanshee extends mage.sets.innistrad.MorkrutBanshee {
 
     public MorkrutBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MossDiamond.java b/Mage.Sets/src/mage/sets/commander2014/MossDiamond.java
index 9b2ef998ca..dbcf0d3222 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MossDiamond.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MossDiamond.java
@@ -37,7 +37,7 @@ public class MossDiamond extends mage.sets.seventhedition.MossDiamond {
 
     public MossDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Mulldrifter.java b/Mage.Sets/src/mage/sets/commander2014/Mulldrifter.java
index d0e04ee1eb..ced7a91eae 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Mulldrifter.java
@@ -37,7 +37,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Mutilate.java b/Mage.Sets/src/mage/sets/commander2014/Mutilate.java
index b08fe27612..8af65c696a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Mutilate.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Mutilate.java
@@ -37,7 +37,7 @@ public class Mutilate extends mage.sets.magic2013.Mutilate {
 
     public Mutilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MycosynthWellspring.java b/Mage.Sets/src/mage/sets/commander2014/MycosynthWellspring.java
index 8860d8f58b..64bc49532e 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MycosynthWellspring.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MycosynthWellspring.java
@@ -37,7 +37,7 @@ public class MycosynthWellspring extends mage.sets.newphyrexia.MycosynthWellspri
 
     public MycosynthWellspring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MyrBattlesphere.java b/Mage.Sets/src/mage/sets/commander2014/MyrBattlesphere.java
index c3996484d6..9d14a1276c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MyrBattlesphere.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MyrBattlesphere.java
@@ -37,7 +37,7 @@ public class MyrBattlesphere extends mage.sets.scarsofmirrodin.MyrBattlesphere {
 
     public MyrBattlesphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MyrRetriever.java b/Mage.Sets/src/mage/sets/commander2014/MyrRetriever.java
index a61ef33756..aca17c7ef4 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MyrRetriever.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MyrRetriever.java
@@ -37,7 +37,7 @@ public class MyrRetriever extends mage.sets.modernmasters.MyrRetriever {
 
     public MyrRetriever(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/MyrSire.java b/Mage.Sets/src/mage/sets/commander2014/MyrSire.java
index 88825d7c51..809fd39c58 100644
--- a/Mage.Sets/src/mage/sets/commander2014/MyrSire.java
+++ b/Mage.Sets/src/mage/sets/commander2014/MyrSire.java
@@ -37,7 +37,7 @@ public class MyrSire extends mage.sets.mirrodinbesieged.MyrSire {
 
     public MyrSire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/NantukoShade.java b/Mage.Sets/src/mage/sets/commander2014/NantukoShade.java
index cea8204bee..171cfe4bea 100644
--- a/Mage.Sets/src/mage/sets/commander2014/NantukoShade.java
+++ b/Mage.Sets/src/mage/sets/commander2014/NantukoShade.java
@@ -37,7 +37,7 @@ public class NantukoShade extends mage.sets.magic2011.NantukoShade {
 
     public NantukoShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Nekrataal.java b/Mage.Sets/src/mage/sets/commander2014/Nekrataal.java
index 7f46d87acd..e449075ec3 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Nekrataal.java
@@ -37,7 +37,7 @@ public class Nekrataal extends mage.sets.ninthedition.Nekrataal {
 
     public Nekrataal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/commander2014/NevinyrralsDisk.java
index 21224e6c2d..e536586e10 100644
--- a/Mage.Sets/src/mage/sets/commander2014/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/commander2014/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/NomadsAssembly.java b/Mage.Sets/src/mage/sets/commander2014/NomadsAssembly.java
index 531fa9cae1..47f150b552 100644
--- a/Mage.Sets/src/mage/sets/commander2014/NomadsAssembly.java
+++ b/Mage.Sets/src/mage/sets/commander2014/NomadsAssembly.java
@@ -37,7 +37,7 @@ public class NomadsAssembly extends mage.sets.riseoftheeldrazi.NomadsAssembly {
 
     public NomadsAssembly(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Oblation.java b/Mage.Sets/src/mage/sets/commander2014/Oblation.java
index c4c7a98f3c..8b251762e9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Oblation.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Oblation.java
@@ -37,7 +37,7 @@ public class Oblation extends mage.sets.onslaught.Oblation {
 
     public Oblation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/OranRiefTheVastwood.java b/Mage.Sets/src/mage/sets/commander2014/OranRiefTheVastwood.java
index f92e262233..984b9d8d58 100644
--- a/Mage.Sets/src/mage/sets/commander2014/OranRiefTheVastwood.java
+++ b/Mage.Sets/src/mage/sets/commander2014/OranRiefTheVastwood.java
@@ -37,7 +37,7 @@ public class OranRiefTheVastwood extends mage.sets.zendikar.OranRiefTheVastwood
 
     public OranRiefTheVastwood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Overrun.java b/Mage.Sets/src/mage/sets/commander2014/Overrun.java
index 2d13b90659..6580fccbec 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Overrun.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/OverwhelmingStampede.java b/Mage.Sets/src/mage/sets/commander2014/OverwhelmingStampede.java
index 69894894db..ae0b816568 100644
--- a/Mage.Sets/src/mage/sets/commander2014/OverwhelmingStampede.java
+++ b/Mage.Sets/src/mage/sets/commander2014/OverwhelmingStampede.java
@@ -37,7 +37,7 @@ public class OverwhelmingStampede extends mage.sets.magic2011.OverwhelmingStampe
 
     public OverwhelmingStampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PalladiumMyr.java b/Mage.Sets/src/mage/sets/commander2014/PalladiumMyr.java
index 7dcfc82ada..7b619f7f18 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PalladiumMyr.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PalladiumMyr.java
@@ -37,7 +37,7 @@ public class PalladiumMyr extends mage.sets.scarsofmirrodin.PalladiumMyr {
 
     public PalladiumMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PanicSpellbomb.java b/Mage.Sets/src/mage/sets/commander2014/PanicSpellbomb.java
index a4f583cdf3..6e4522439c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PanicSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PanicSpellbomb.java
@@ -37,7 +37,7 @@ public class PanicSpellbomb extends mage.sets.scarsofmirrodin.PanicSpellbomb {
 
     public PanicSpellbomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PearlMedallion.java b/Mage.Sets/src/mage/sets/commander2014/PearlMedallion.java
index 1ec7cdc7c7..41b1209df2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PearlMedallion.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PearlMedallion.java
@@ -37,7 +37,7 @@ public class PearlMedallion extends mage.sets.tempest.PearlMedallion {
 
     public PearlMedallion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Pentavus.java b/Mage.Sets/src/mage/sets/commander2014/Pentavus.java
index 8c7acd5049..da094e4cef 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Pentavus.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Pentavus.java
@@ -37,7 +37,7 @@ public class Pentavus extends mage.sets.elspethvstezzeret.Pentavus {
 
     public Pentavus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PestilenceDemon.java b/Mage.Sets/src/mage/sets/commander2014/PestilenceDemon.java
index a7e3631895..146a7c0e51 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PestilenceDemon.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PestilenceDemon.java
@@ -37,7 +37,7 @@ public class PestilenceDemon extends mage.sets.riseoftheeldrazi.PestilenceDemon
 
     public PestilenceDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/commander2014/PhyrexianGargantua.java
index 327ef03a96..0a2a1112e9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PhyrexianGargantua.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PhyrexianGargantua.java
@@ -37,7 +37,7 @@ public class PhyrexianGargantua extends mage.sets.apocalypse.PhyrexianGargantua
 
     public PhyrexianGargantua(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PhyrexianIngester.java b/Mage.Sets/src/mage/sets/commander2014/PhyrexianIngester.java
index 49f8b873d8..01deb9701c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PhyrexianIngester.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PhyrexianIngester.java
@@ -37,7 +37,7 @@ public class PhyrexianIngester extends mage.sets.newphyrexia.PhyrexianIngester {
 
     public PhyrexianIngester(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PhyrexiasCore.java b/Mage.Sets/src/mage/sets/commander2014/PhyrexiasCore.java
index d6c512233c..859a83c3f3 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PhyrexiasCore.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PhyrexiasCore.java
@@ -37,7 +37,7 @@ public class PhyrexiasCore extends mage.sets.newphyrexia.PhyrexiasCore {
 
     public PhyrexiasCore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PilgrimsEye.java b/Mage.Sets/src/mage/sets/commander2014/PilgrimsEye.java
index 55706347c3..21e7cb100a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PilgrimsEye.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PilgrimsEye.java
@@ -37,7 +37,7 @@ public class PilgrimsEye extends mage.sets.worldwake.PilgrimsEye {
 
     public PilgrimsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PollutedMire.java b/Mage.Sets/src/mage/sets/commander2014/PollutedMire.java
index 0097b92402..0406da9dc1 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PollutedMire.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PollutedMire.java
@@ -37,7 +37,7 @@ public class PollutedMire extends mage.sets.urzassaga.PollutedMire {
 
     public PollutedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Pongify.java b/Mage.Sets/src/mage/sets/commander2014/Pongify.java
index ed01698717..a8fa94bd5d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Pongify.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Pongify.java
@@ -37,7 +37,7 @@ public class Pongify extends mage.sets.planarchaos.Pongify {
 
     public Pongify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PontiffOfBlight.java b/Mage.Sets/src/mage/sets/commander2014/PontiffOfBlight.java
index 4c3a612732..712bc2ead6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PontiffOfBlight.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PontiffOfBlight.java
@@ -37,7 +37,7 @@ public class PontiffOfBlight extends mage.sets.dragonsmaze.PontiffOfBlight {
 
     public PontiffOfBlight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PraetorsCounsel.java b/Mage.Sets/src/mage/sets/commander2014/PraetorsCounsel.java
index fa5a534681..bac61c9e38 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PraetorsCounsel.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PraetorsCounsel.java
@@ -37,7 +37,7 @@ public class PraetorsCounsel extends mage.sets.mirrodinbesieged.PraetorsCounsel
 
     public PraetorsCounsel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PriestOfTitania.java b/Mage.Sets/src/mage/sets/commander2014/PriestOfTitania.java
index 863ad3975e..6afe105d4c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PriestOfTitania.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PriestOfTitania.java
@@ -37,7 +37,7 @@ public class PriestOfTitania extends mage.sets.urzassaga.PriestOfTitania {
 
     public PriestOfTitania(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PrimordialSage.java b/Mage.Sets/src/mage/sets/commander2014/PrimordialSage.java
index bf8ec89c47..e843eb3a51 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PrimordialSage.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PrimordialSage.java
@@ -37,7 +37,7 @@ public class PrimordialSage extends mage.sets.ravnica.PrimordialSage {
 
     public PrimordialSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/PristineTalisman.java b/Mage.Sets/src/mage/sets/commander2014/PristineTalisman.java
index 07202c80a1..61b882dec0 100644
--- a/Mage.Sets/src/mage/sets/commander2014/PristineTalisman.java
+++ b/Mage.Sets/src/mage/sets/commander2014/PristineTalisman.java
@@ -37,7 +37,7 @@ public class PristineTalisman extends mage.sets.newphyrexia.PristineTalisman {
 
     public PristineTalisman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/RampagingBaloths.java b/Mage.Sets/src/mage/sets/commander2014/RampagingBaloths.java
index e2c79757b9..3c561bda78 100644
--- a/Mage.Sets/src/mage/sets/commander2014/RampagingBaloths.java
+++ b/Mage.Sets/src/mage/sets/commander2014/RampagingBaloths.java
@@ -37,7 +37,7 @@ public class RampagingBaloths extends mage.sets.zendikar.RampagingBaloths {
 
     public RampagingBaloths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ReadTheBones.java b/Mage.Sets/src/mage/sets/commander2014/ReadTheBones.java
index 0f70e85cbd..38271c2219 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ReadTheBones.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ReadTheBones.java
@@ -37,7 +37,7 @@ public class ReadTheBones extends mage.sets.theros.ReadTheBones {
 
     public ReadTheBones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/sets/commander2014/ReaperFromTheAbyss.java
index e8725f1b70..33430244f3 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ReaperFromTheAbyss.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ReaperFromTheAbyss.java
@@ -37,7 +37,7 @@ public class ReaperFromTheAbyss extends mage.sets.innistrad.ReaperFromTheAbyss {
 
     public ReaperFromTheAbyss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ReclamationSage.java b/Mage.Sets/src/mage/sets/commander2014/ReclamationSage.java
index 11b800563a..52c63f10aa 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ReclamationSage.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ReclamationSage.java
@@ -37,7 +37,7 @@ public class ReclamationSage extends mage.sets.magic2015.ReclamationSage {
 
     public ReclamationSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ReliquaryTower.java b/Mage.Sets/src/mage/sets/commander2014/ReliquaryTower.java
index 75e2f275ad..0421fe8614 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ReliquaryTower.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ReliquaryTower.java
@@ -37,7 +37,7 @@ public class ReliquaryTower extends mage.sets.conflux.ReliquaryTower {
 
     public ReliquaryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/RemoteIsle.java b/Mage.Sets/src/mage/sets/commander2014/RemoteIsle.java
index a4075b4a73..61c3612583 100644
--- a/Mage.Sets/src/mage/sets/commander2014/RemoteIsle.java
+++ b/Mage.Sets/src/mage/sets/commander2014/RemoteIsle.java
@@ -37,7 +37,7 @@ public class RemoteIsle extends mage.sets.urzassaga.RemoteIsle {
 
     public RemoteIsle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/RequiemAngel.java b/Mage.Sets/src/mage/sets/commander2014/RequiemAngel.java
index 6408d2b848..246e32533a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/RequiemAngel.java
+++ b/Mage.Sets/src/mage/sets/commander2014/RequiemAngel.java
@@ -37,7 +37,7 @@ public class RequiemAngel extends mage.sets.darkascension.RequiemAngel {
 
     public RequiemAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ReturnToDust.java b/Mage.Sets/src/mage/sets/commander2014/ReturnToDust.java
index 251a8c87cd..04ce70a7ed 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ReturnToDust.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ReturnToDust.java
@@ -37,7 +37,7 @@ public class ReturnToDust extends mage.sets.commander.ReturnToDust {
 
     public ReturnToDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/RiteOfReplication.java b/Mage.Sets/src/mage/sets/commander2014/RiteOfReplication.java
index f604459c47..8cd8f399b9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/RiteOfReplication.java
+++ b/Mage.Sets/src/mage/sets/commander2014/RiteOfReplication.java
@@ -37,7 +37,7 @@ public class RiteOfReplication extends mage.sets.zendikar.RiteOfReplication {
 
     public RiteOfReplication(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/RubyMedallion.java b/Mage.Sets/src/mage/sets/commander2014/RubyMedallion.java
index 53cc883fe8..c7b61c9773 100644
--- a/Mage.Sets/src/mage/sets/commander2014/RubyMedallion.java
+++ b/Mage.Sets/src/mage/sets/commander2014/RubyMedallion.java
@@ -37,7 +37,7 @@ public class RubyMedallion extends mage.sets.tempest.RubyMedallion {
 
     public RubyMedallion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SacredMesa.java b/Mage.Sets/src/mage/sets/commander2014/SacredMesa.java
index 666bf9bad2..dd4d226854 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SacredMesa.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SacredMesa.java
@@ -37,7 +37,7 @@ public class SacredMesa extends mage.sets.mirage.SacredMesa {
 
     public SacredMesa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SapphireMedallion.java b/Mage.Sets/src/mage/sets/commander2014/SapphireMedallion.java
index a5fd3a6756..a4e0bea5b9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SapphireMedallion.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SapphireMedallion.java
@@ -37,7 +37,7 @@ public class SapphireMedallion extends mage.sets.tempest.SapphireMedallion {
 
     public SapphireMedallion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SeaGateOracle.java b/Mage.Sets/src/mage/sets/commander2014/SeaGateOracle.java
index 124c08bffd..be1ff16385 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SeaGateOracle.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SeaGateOracle.java
@@ -37,7 +37,7 @@ public class SeaGateOracle extends mage.sets.riseoftheeldrazi.SeaGateOracle {
 
     public SeaGateOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SecludedSteppe.java b/Mage.Sets/src/mage/sets/commander2014/SecludedSteppe.java
index 25d53d4cb0..5c4463a7bd 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SeersSundial.java b/Mage.Sets/src/mage/sets/commander2014/SeersSundial.java
index 952f1646f5..80ac5709e9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SeersSundial.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SeersSundial.java
@@ -37,7 +37,7 @@ public class SeersSundial extends mage.sets.worldwake.SeersSundial {
 
     public SeersSundial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SerraAvatar.java b/Mage.Sets/src/mage/sets/commander2014/SerraAvatar.java
index b27f2baa65..cffe0b38fe 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SerraAvatar.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SerraAvatar.java
@@ -38,7 +38,7 @@ public class SerraAvatar extends mage.sets.urzassaga.SerraAvatar {
 
     public SerraAvatar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "C14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2014/Shriekmaw.java b/Mage.Sets/src/mage/sets/commander2014/Shriekmaw.java
index 1cfc160cf4..a05f28e240 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Shriekmaw.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Shriekmaw.java
@@ -37,7 +37,7 @@ public class Shriekmaw extends mage.sets.commander.Shriekmaw {
 
     public Shriekmaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SignInBlood.java b/Mage.Sets/src/mage/sets/commander2014/SignInBlood.java
index 67f8dd3b9d..9bd1a23ef9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SilklashSpider.java b/Mage.Sets/src/mage/sets/commander2014/SilklashSpider.java
index 9c368d45bd..ac1cb264ac 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SilklashSpider.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SilklashSpider.java
@@ -37,7 +37,7 @@ public class SilklashSpider extends mage.sets.onslaught.SilklashSpider {
 
     public SilklashSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SilverbladePaladin.java b/Mage.Sets/src/mage/sets/commander2014/SilverbladePaladin.java
index e084ed4f11..93b7046a56 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SilverbladePaladin.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SilverbladePaladin.java
@@ -37,7 +37,7 @@ public class SilverbladePaladin extends mage.sets.avacynrestored.SilverbladePala
 
     public SilverbladePaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SkeletalScrying.java b/Mage.Sets/src/mage/sets/commander2014/SkeletalScrying.java
index 041de36320..169594b7ad 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SkeletalScrying.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SkeletalScrying.java
@@ -37,7 +37,7 @@ public class SkeletalScrying extends mage.sets.odyssey.SkeletalScrying {
 
     public SkeletalScrying(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SkirsdagHighPriest.java b/Mage.Sets/src/mage/sets/commander2014/SkirsdagHighPriest.java
index c5f8998f9e..fbf4e65826 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SkirsdagHighPriest.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SkirsdagHighPriest.java
@@ -37,7 +37,7 @@ public class SkirsdagHighPriest extends mage.sets.innistrad.SkirsdagHighPriest {
 
     public SkirsdagHighPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Skullclamp.java b/Mage.Sets/src/mage/sets/commander2014/Skullclamp.java
index a93559c407..117d66c8b7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Skullclamp.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Skullclamp.java
@@ -37,7 +37,7 @@ public class Skullclamp extends mage.sets.darksteel.Skullclamp {
 
     public Skullclamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SkyDiamond.java b/Mage.Sets/src/mage/sets/commander2014/SkyDiamond.java
index c9fdea6917..5a5da7744c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SkyDiamond.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SkyDiamond.java
@@ -37,7 +37,7 @@ public class SkyDiamond extends mage.sets.seventhedition.SkyDiamond {
 
     public SkyDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SkyhunterSkirmisher.java b/Mage.Sets/src/mage/sets/commander2014/SkyhunterSkirmisher.java
index 87cc18a080..c288a48c53 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SkyhunterSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SkyhunterSkirmisher.java
@@ -37,7 +37,7 @@ public class SkyhunterSkirmisher extends mage.sets.tenthedition.SkyhunterSkirmis
 
     public SkyhunterSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SlipperyKarst.java b/Mage.Sets/src/mage/sets/commander2014/SlipperyKarst.java
index d73c88ce45..7a98508cd2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SlipperyKarst.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SlipperyKarst.java
@@ -37,7 +37,7 @@ public class SlipperyKarst extends mage.sets.urzassaga.SlipperyKarst {
 
     public SlipperyKarst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SmolderingCrater.java b/Mage.Sets/src/mage/sets/commander2014/SmolderingCrater.java
index 7951301b1d..ce55f74671 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SmolderingCrater.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SmolderingCrater.java
@@ -37,7 +37,7 @@ public class SmolderingCrater extends mage.sets.urzassaga.SmolderingCrater {
 
     public SmolderingCrater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SolRing.java b/Mage.Sets/src/mage/sets/commander2014/SolRing.java
index 9209d0475e..825040e7b5 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SolRing.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/commander2014/SolemnSimulacrum.java
index 4dd6f12ef5..7c82990a0c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SolemnSimulacrum.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SolemnSimulacrum.java
@@ -37,7 +37,7 @@ public class SolemnSimulacrum extends mage.sets.magic2012.SolemnSimulacrum {
 
     public SolemnSimulacrum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SoulOfTheHarvest.java b/Mage.Sets/src/mage/sets/commander2014/SoulOfTheHarvest.java
index affc023f41..1eb7d7774c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SoulOfTheHarvest.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SoulOfTheHarvest.java
@@ -37,7 +37,7 @@ public class SoulOfTheHarvest extends mage.sets.avacynrestored.SoulOfTheHarvest
 
     public SoulOfTheHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SpectralProcession.java b/Mage.Sets/src/mage/sets/commander2014/SpectralProcession.java
index 2b4ae024fb..9c794ac67d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SpectralProcession.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SpectralProcession.java
@@ -37,7 +37,7 @@ public class SpectralProcession extends mage.sets.shadowmoor.SpectralProcession
 
     public SpectralProcession(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SphinxOfJwarIsle.java b/Mage.Sets/src/mage/sets/commander2014/SphinxOfJwarIsle.java
index c061ce1dbf..6e55be4170 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SphinxOfJwarIsle.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SphinxOfJwarIsle.java
@@ -37,7 +37,7 @@ public class SphinxOfJwarIsle extends mage.sets.zendikar.SphinxOfJwarIsle {
 
     public SphinxOfJwarIsle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SphinxOfMagosi.java b/Mage.Sets/src/mage/sets/commander2014/SphinxOfMagosi.java
index ba1f86ee7d..3b9dbe90b7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SphinxOfMagosi.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SphinxOfMagosi.java
@@ -37,7 +37,7 @@ public class SphinxOfMagosi extends mage.sets.riseoftheeldrazi.SphinxOfMagosi {
 
     public SphinxOfMagosi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SphinxOfUthuun.java b/Mage.Sets/src/mage/sets/commander2014/SphinxOfUthuun.java
index 2200b7dacd..fb4db01e88 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SphinxOfUthuun.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SphinxOfUthuun.java
@@ -37,7 +37,7 @@ public class SphinxOfUthuun extends mage.sets.magic2012.SphinxOfUthuun {
 
     public SphinxOfUthuun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SpineOfIshSah.java b/Mage.Sets/src/mage/sets/commander2014/SpineOfIshSah.java
index 8eea274de7..3bcad49e19 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SpineOfIshSah.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SpineOfIshSah.java
@@ -37,7 +37,7 @@ public class SpineOfIshSah extends mage.sets.mirrodinbesieged.SpineOfIshSah {
 
     public SpineOfIshSah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Spitebellows.java b/Mage.Sets/src/mage/sets/commander2014/Spitebellows.java
index 0fd5e07b5c..0e90ae10c6 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Spitebellows.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Spitebellows.java
@@ -37,7 +37,7 @@ public class Spitebellows extends mage.sets.commander.Spitebellows {
 
     public Spitebellows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Starstorm.java b/Mage.Sets/src/mage/sets/commander2014/Starstorm.java
index f47de36d19..97b8042330 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Starstorm.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Starstorm.java
@@ -37,7 +37,7 @@ public class Starstorm extends mage.sets.onslaught.Starstorm {
 
     public Starstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SteelHellkite.java b/Mage.Sets/src/mage/sets/commander2014/SteelHellkite.java
index 15d0471aaf..c59de02d31 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SteelHellkite.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SteelHellkite.java
@@ -37,7 +37,7 @@ public class SteelHellkite extends mage.sets.scarsofmirrodin.SteelHellkite {
 
     public SteelHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/StrataScythe.java b/Mage.Sets/src/mage/sets/commander2014/StrataScythe.java
index 9bf687a738..9b6cafd832 100644
--- a/Mage.Sets/src/mage/sets/commander2014/StrataScythe.java
+++ b/Mage.Sets/src/mage/sets/commander2014/StrataScythe.java
@@ -37,7 +37,7 @@ public class StrataScythe extends mage.sets.scarsofmirrodin.StrataScythe {
 
     public StrataScythe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/commander2014/StrokeOfGenius.java
index a2bc3fa38a..0cfc6b6da0 100644
--- a/Mage.Sets/src/mage/sets/commander2014/StrokeOfGenius.java
+++ b/Mage.Sets/src/mage/sets/commander2014/StrokeOfGenius.java
@@ -37,7 +37,7 @@ public class StrokeOfGenius extends mage.sets.urzassaga.StrokeOfGenius {
 
     public StrokeOfGenius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SuddenSpoiling.java b/Mage.Sets/src/mage/sets/commander2014/SuddenSpoiling.java
index 216dcd1281..a9bde11f5c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SuddenSpoiling.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SuddenSpoiling.java
@@ -37,7 +37,7 @@ public class SuddenSpoiling extends mage.sets.timespiral.SuddenSpoiling {
 
     public SuddenSpoiling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SunTitan.java b/Mage.Sets/src/mage/sets/commander2014/SunTitan.java
index 49061fdcbb..af4a99e026 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SunTitan.java
@@ -37,7 +37,7 @@ public class SunTitan extends mage.sets.magic2011.SunTitan {
 
     public SunTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SunblastAngel.java b/Mage.Sets/src/mage/sets/commander2014/SunblastAngel.java
index e23310c910..ac1bbea857 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SunblastAngel.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SunblastAngel.java
@@ -37,7 +37,7 @@ public class SunblastAngel extends mage.sets.scarsofmirrodin.SunblastAngel {
 
     public SunblastAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SwiftfootBoots.java b/Mage.Sets/src/mage/sets/commander2014/SwiftfootBoots.java
index 12a86cc011..7f40edda82 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SwiftfootBoots.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SwiftfootBoots.java
@@ -37,7 +37,7 @@ public class SwiftfootBoots extends mage.sets.magic2012.SwiftfootBoots {
 
     public SwiftfootBoots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SwordOfVengeance.java b/Mage.Sets/src/mage/sets/commander2014/SwordOfVengeance.java
index 95fa8fde2c..a03ae6d6c7 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SwordOfVengeance.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SwordOfVengeance.java
@@ -37,7 +37,7 @@ public class SwordOfVengeance extends mage.sets.magic2011.SwordOfVengeance {
 
     public SwordOfVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SylvanRanger.java b/Mage.Sets/src/mage/sets/commander2014/SylvanRanger.java
index 3662395dfd..10076e4443 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SylvanRanger.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SylvanRanger.java
@@ -37,7 +37,7 @@ public class SylvanRanger extends mage.sets.magic2011.SylvanRanger {
 
     public SylvanRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SylvanSafekeeper.java b/Mage.Sets/src/mage/sets/commander2014/SylvanSafekeeper.java
index 2f4fdbfc94..4f58460186 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SylvanSafekeeper.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SylvanSafekeeper.java
@@ -37,7 +37,7 @@ public class SylvanSafekeeper extends mage.sets.judgment.SylvanSafekeeper {
 
     public SylvanSafekeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/SyphonMind.java b/Mage.Sets/src/mage/sets/commander2014/SyphonMind.java
index 0a09c99b71..0563fcfe8d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/SyphonMind.java
+++ b/Mage.Sets/src/mage/sets/commander2014/SyphonMind.java
@@ -37,7 +37,7 @@ public class SyphonMind extends mage.sets.onslaught.SyphonMind {
 
     public SyphonMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TectonicEdge.java b/Mage.Sets/src/mage/sets/commander2014/TectonicEdge.java
index e546d0d213..f342833bbe 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TectonicEdge.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TectonicEdge.java
@@ -37,7 +37,7 @@ public class TectonicEdge extends mage.sets.worldwake.TectonicEdge {
 
     public TectonicEdge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TempleOfTheFalseGod.java b/Mage.Sets/src/mage/sets/commander2014/TempleOfTheFalseGod.java
index 9a72709804..b88923fbfe 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TempleOfTheFalseGod.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TempleOfTheFalseGod.java
@@ -37,7 +37,7 @@ public class TempleOfTheFalseGod extends mage.sets.commander2013.TempleOfTheFals
 
     public TempleOfTheFalseGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/commander2014/TendrilsOfCorruption.java
index 45f689b0a4..0362a99596 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TendrilsOfCorruption.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TendrilsOfCorruption.java
@@ -37,7 +37,7 @@ public class TendrilsOfCorruption extends mage.sets.magic2010.TendrilsOfCorrupti
 
     public TendrilsOfCorruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Terastodon.java b/Mage.Sets/src/mage/sets/commander2014/Terastodon.java
index daee670764..045496d8c0 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Terastodon.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Terastodon.java
@@ -37,7 +37,7 @@ public class Terastodon extends mage.sets.worldwake.Terastodon {
 
     public Terastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/commander2014/TerramorphicExpanse.java
index f719f9fbee..296411230c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ThornwealdArcher.java b/Mage.Sets/src/mage/sets/commander2014/ThornwealdArcher.java
index 8c6d5d202c..9e7c758227 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ThornwealdArcher.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ThornwealdArcher.java
@@ -37,7 +37,7 @@ public class ThornwealdArcher extends mage.sets.futuresight.ThornwealdArcher {
 
     public ThornwealdArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/ThranDynamo.java b/Mage.Sets/src/mage/sets/commander2014/ThranDynamo.java
index e4c9e25bb7..4bd4dd0536 100644
--- a/Mage.Sets/src/mage/sets/commander2014/ThranDynamo.java
+++ b/Mage.Sets/src/mage/sets/commander2014/ThranDynamo.java
@@ -37,7 +37,7 @@ public class ThranDynamo extends mage.sets.urzasdestiny.ThranDynamo {
 
     public ThranDynamo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TimberwatchElf.java b/Mage.Sets/src/mage/sets/commander2014/TimberwatchElf.java
index 22b4f804ca..50d916c4a2 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TimberwatchElf.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TimberwatchElf.java
@@ -37,7 +37,7 @@ public class TimberwatchElf extends mage.sets.elvesvsgoblins.TimberwatchElf {
 
     public TimberwatchElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TitaniasChosen.java b/Mage.Sets/src/mage/sets/commander2014/TitaniasChosen.java
index f6d364b282..f8b236d4b0 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TitaniasChosen.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TitaniasChosen.java
@@ -37,7 +37,7 @@ public class TitaniasChosen extends mage.sets.urzassaga.TitaniasChosen {
 
     public TitaniasChosen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TormodsCrypt.java b/Mage.Sets/src/mage/sets/commander2014/TormodsCrypt.java
index f69a03ed95..5462012c1a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TormodsCrypt.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TormodsCrypt.java
@@ -38,7 +38,7 @@ public class TormodsCrypt extends mage.sets.timeshifted.TormodsCrypt {
 
     public TormodsCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "C14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2014/TornadoElemental.java b/Mage.Sets/src/mage/sets/commander2014/TornadoElemental.java
index ad29737dca..2a89658dd0 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TornadoElemental.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TornadoElemental.java
@@ -37,7 +37,7 @@ public class TornadoElemental extends mage.sets.fifthdawn.TornadoElemental {
 
     public TornadoElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TradingPost.java b/Mage.Sets/src/mage/sets/commander2014/TradingPost.java
index 9336546ffa..555e31a669 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TradingPost.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TradingPost.java
@@ -37,7 +37,7 @@ public class TradingPost extends mage.sets.magic2013.TradingPost {
 
     public TradingPost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TragicSlip.java b/Mage.Sets/src/mage/sets/commander2014/TragicSlip.java
index e22d95d018..0c63ac1a2b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TragicSlip.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TragicSlip.java
@@ -37,7 +37,7 @@ public class TragicSlip extends mage.sets.darkascension.TragicSlip {
 
     public TragicSlip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TranquilThicket.java b/Mage.Sets/src/mage/sets/commander2014/TranquilThicket.java
index 794e73d81b..00df03c382 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TrueConviction.java b/Mage.Sets/src/mage/sets/commander2014/TrueConviction.java
index a2a0a5d687..d91b00a45f 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TrueConviction.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TrueConviction.java
@@ -37,7 +37,7 @@ public class TrueConviction extends mage.sets.scarsofmirrodin.TrueConviction {
 
     public TrueConviction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TuktukTheExplorer.java b/Mage.Sets/src/mage/sets/commander2014/TuktukTheExplorer.java
index 94f4e00d00..18d124ac61 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TuktukTheExplorer.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TuktukTheExplorer.java
@@ -37,7 +37,7 @@ public class TuktukTheExplorer extends mage.sets.riseoftheeldrazi.TuktukTheExplo
 
     public TuktukTheExplorer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TurnToFrog.java b/Mage.Sets/src/mage/sets/commander2014/TurnToFrog.java
index 9dcf16d210..1bab8e8ad3 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TurnToFrog.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TurnToFrog.java
@@ -37,7 +37,7 @@ public class TurnToFrog extends mage.sets.magic2012.TurnToFrog {
 
     public TurnToFrog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/TwilightShepherd.java b/Mage.Sets/src/mage/sets/commander2014/TwilightShepherd.java
index d7bed74325..a86c13537b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/TwilightShepherd.java
+++ b/Mage.Sets/src/mage/sets/commander2014/TwilightShepherd.java
@@ -37,7 +37,7 @@ public class TwilightShepherd extends mage.sets.shadowmoor.TwilightShepherd {
 
     public TwilightShepherd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/UrGolemsEye.java b/Mage.Sets/src/mage/sets/commander2014/UrGolemsEye.java
index 1d68365a28..ae32b8dec9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/UrGolemsEye.java
+++ b/Mage.Sets/src/mage/sets/commander2014/UrGolemsEye.java
@@ -38,7 +38,7 @@ public class UrGolemsEye extends mage.sets.darksteel.UrGolemsEye {
 
     public UrGolemsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "C14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2014/VampireHexmage.java b/Mage.Sets/src/mage/sets/commander2014/VampireHexmage.java
index b07c16e5b3..2ec6718712 100644
--- a/Mage.Sets/src/mage/sets/commander2014/VampireHexmage.java
+++ b/Mage.Sets/src/mage/sets/commander2014/VampireHexmage.java
@@ -37,7 +37,7 @@ public class VampireHexmage extends mage.sets.zendikar.VampireHexmage {
 
     public VampireHexmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Victimize.java b/Mage.Sets/src/mage/sets/commander2014/Victimize.java
index 6eb72dea0a..d28bd0b4c9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Victimize.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Victimize.java
@@ -37,7 +37,7 @@ public class Victimize extends mage.sets.conspiracy.Victimize {
 
     public Victimize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WayfarersBauble.java b/Mage.Sets/src/mage/sets/commander2014/WayfarersBauble.java
index 36a377c120..30af208d8d 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WayfarersBauble.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WayfarersBauble.java
@@ -37,7 +37,7 @@ public class WayfarersBauble extends mage.sets.commander2013.WayfarersBauble {
 
     public WayfarersBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Wellwisher.java b/Mage.Sets/src/mage/sets/commander2014/Wellwisher.java
index 929e7f18e8..cdd8ed9d8a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Wellwisher.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Wellwisher.java
@@ -37,7 +37,7 @@ public class Wellwisher extends mage.sets.onslaught.Wellwisher {
 
     public Wellwisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/Whipflare.java b/Mage.Sets/src/mage/sets/commander2014/Whipflare.java
index 1fa6cc8a60..e4d719fab5 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Whipflare.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Whipflare.java
@@ -37,7 +37,7 @@ public class Whipflare extends mage.sets.newphyrexia.Whipflare {
 
     public Whipflare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WhiteSunsZenith.java b/Mage.Sets/src/mage/sets/commander2014/WhiteSunsZenith.java
index d10528837d..71c21348f3 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WhiteSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WhiteSunsZenith.java
@@ -37,7 +37,7 @@ public class WhiteSunsZenith extends mage.sets.mirrodinbesieged.WhiteSunsZenith
 
     public WhiteSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WingShards.java b/Mage.Sets/src/mage/sets/commander2014/WingShards.java
index 0608e0d199..a0aed051b4 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WingShards.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WingShards.java
@@ -37,7 +37,7 @@ public class WingShards extends mage.sets.scourge.WingShards {
 
     public WingShards(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/commander2014/WolfbriarElemental.java
index 4dbfb83291..851925b30a 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WolfbriarElemental.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WolfbriarElemental.java
@@ -37,7 +37,7 @@ public class WolfbriarElemental extends mage.sets.worldwake.WolfbriarElemental {
 
     public WolfbriarElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WoodElves.java b/Mage.Sets/src/mage/sets/commander2014/WoodElves.java
index 0cc6b53a6f..895aaadbd8 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WornPowerstone.java b/Mage.Sets/src/mage/sets/commander2014/WornPowerstone.java
index d84f8dc369..5033583d75 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WornPowerstone.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WornPowerstone.java
@@ -37,7 +37,7 @@ public class WornPowerstone extends mage.sets.urzassaga.WornPowerstone {
 
     public WornPowerstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WrensRunPackmaster.java b/Mage.Sets/src/mage/sets/commander2014/WrensRunPackmaster.java
index 566f8522d0..aafd50297c 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WrensRunPackmaster.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WrensRunPackmaster.java
@@ -37,7 +37,7 @@ public class WrensRunPackmaster extends mage.sets.lorwyn.WrensRunPackmaster {
 
     public WrensRunPackmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WurmcoilEngine.java b/Mage.Sets/src/mage/sets/commander2014/WurmcoilEngine.java
index 7b3b28854c..71c0619ba9 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WurmcoilEngine.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WurmcoilEngine.java
@@ -37,7 +37,7 @@ public class WurmcoilEngine extends mage.sets.scarsofmirrodin.WurmcoilEngine {
 
     public WurmcoilEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/XathridDemon.java b/Mage.Sets/src/mage/sets/commander2014/XathridDemon.java
index 97475a82b3..b2c4fe707b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/XathridDemon.java
+++ b/Mage.Sets/src/mage/sets/commander2014/XathridDemon.java
@@ -37,7 +37,7 @@ public class XathridDemon extends mage.sets.magic2010.XathridDemon {
 
     public XathridDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "C14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AEtherize.java b/Mage.Sets/src/mage/sets/commander2015/AEtherize.java
index 685ee6dd1f..1cdecf9a0a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AEtherize.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AEtherize.java
@@ -37,7 +37,7 @@ public class AEtherize extends mage.sets.gatecrash.AEtherize {
 
     public AEtherize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AcidicSlime.java b/Mage.Sets/src/mage/sets/commander2015/AcidicSlime.java
index 945b301271..f7b4dbe06d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ActOfAggression.java b/Mage.Sets/src/mage/sets/commander2015/ActOfAggression.java
index 2720002549..57805b378e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ActOfAggression.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ActOfAggression.java
@@ -37,7 +37,7 @@ public class ActOfAggression extends mage.sets.newphyrexia.ActOfAggression {
 
     public ActOfAggression(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AjanisChosen.java b/Mage.Sets/src/mage/sets/commander2015/AjanisChosen.java
index aac099f95e..c858ecc983 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AjanisChosen.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AjanisChosen.java
@@ -37,7 +37,7 @@ public class AjanisChosen extends mage.sets.magic2014.AjanisChosen {
 
     public AjanisChosen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AltarsReap.java b/Mage.Sets/src/mage/sets/commander2015/AltarsReap.java
index 70e3023ad7..2dd3051a08 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AltarsReap.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AltarsReap.java
@@ -37,7 +37,7 @@ public class AltarsReap extends mage.sets.innistrad.AltarsReap {
 
     public AltarsReap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AmbitionsCost.java b/Mage.Sets/src/mage/sets/commander2015/AmbitionsCost.java
index b0ebdb59ca..6de0fce90d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AmbitionsCost.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AmbitionsCost.java
@@ -37,7 +37,7 @@ public class AmbitionsCost extends mage.sets.eighthedition.AmbitionsCost {
 
     public AmbitionsCost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AncientAmphitheater.java b/Mage.Sets/src/mage/sets/commander2015/AncientAmphitheater.java
index 21a5f92ec7..7fcb80d5a7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AncientAmphitheater.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AncientAmphitheater.java
@@ -37,7 +37,7 @@ public class AncientAmphitheater extends mage.sets.lorwyn.AncientAmphitheater {
 
     public AncientAmphitheater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AncientCraving.java b/Mage.Sets/src/mage/sets/commander2015/AncientCraving.java
index ec231cde4a..e39d95ad70 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AncientCraving.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AncientCraving.java
@@ -37,7 +37,7 @@ public class AncientCraving extends mage.sets.starter1999.AncientCraving {
 
     public AncientCraving(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AngelOfSerenity.java b/Mage.Sets/src/mage/sets/commander2015/AngelOfSerenity.java
index f20decba2c..a358e58c71 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AngelOfSerenity.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AngelOfSerenity.java
@@ -37,7 +37,7 @@ public class AngelOfSerenity extends mage.sets.returntoravnica.AngelOfSerenity {
 
     public AngelOfSerenity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ArbiterOfKnollridge.java b/Mage.Sets/src/mage/sets/commander2015/ArbiterOfKnollridge.java
index 9c0a178294..d09b546d18 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ArbiterOfKnollridge.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ArbiterOfKnollridge.java
@@ -37,7 +37,7 @@ public class ArbiterOfKnollridge extends mage.sets.lorwyn.ArbiterOfKnollridge {
 
     public ArbiterOfKnollridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ArborColossus.java b/Mage.Sets/src/mage/sets/commander2015/ArborColossus.java
index 9c70b372a2..82e8dbae0f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ArborColossus.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ArborColossus.java
@@ -37,7 +37,7 @@ public class ArborColossus extends mage.sets.theros.ArborColossus {
 
     public ArborColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/AuraOfSilence.java b/Mage.Sets/src/mage/sets/commander2015/AuraOfSilence.java
index bde64e9122..5ebe75aea2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/AuraOfSilence.java
+++ b/Mage.Sets/src/mage/sets/commander2015/AuraOfSilence.java
@@ -37,7 +37,7 @@ public class AuraOfSilence extends mage.sets.weatherlight.AuraOfSilence {
 
     public AuraOfSilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BaneOfProgress.java b/Mage.Sets/src/mage/sets/commander2015/BaneOfProgress.java
index 470b1b0d02..aaddbf1b9c 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BaneOfProgress.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BaneOfProgress.java
@@ -37,7 +37,7 @@ public class BaneOfProgress extends mage.sets.commander2013.BaneOfProgress {
 
     public BaneOfProgress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BanishingLight.java b/Mage.Sets/src/mage/sets/commander2015/BanishingLight.java
index 56f19fe651..a1e41fabdf 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BanishingLight.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BanishingLight.java
@@ -37,7 +37,7 @@ public class BanishingLight extends mage.sets.journeyintonyx.BanishingLight {
 
     public BanishingLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BarrenMoor.java b/Mage.Sets/src/mage/sets/commander2015/BarrenMoor.java
index 95a642c1e9..4e4ecc6434 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BarterInBlood.java b/Mage.Sets/src/mage/sets/commander2015/BarterInBlood.java
index 88b004a853..1120e685d7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BarterInBlood.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BarterInBlood.java
@@ -37,7 +37,7 @@ public class BarterInBlood extends mage.sets.avacynrestored.BarterInBlood {
 
     public BarterInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BasaltMonolith.java b/Mage.Sets/src/mage/sets/commander2015/BasaltMonolith.java
index 8caccf8959..c1edeea60e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BasaltMonolith.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BasaltMonolith.java
@@ -37,7 +37,7 @@ public class BasaltMonolith extends mage.sets.limitedalpha.BasaltMonolith {
 
     public BasaltMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/commander2015/BeastmasterAscension.java
index 8656995010..fc9f641832 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BeastmasterAscension.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BeastmasterAscension.java
@@ -37,7 +37,7 @@ public class BeastmasterAscension extends mage.sets.zendikar.BeastmasterAscensio
 
     public BeastmasterAscension(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BidentOfThassa.java b/Mage.Sets/src/mage/sets/commander2015/BidentOfThassa.java
index 3423b6dc81..0a7f08dd79 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BidentOfThassa.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BidentOfThassa.java
@@ -37,7 +37,7 @@ public class BidentOfThassa extends mage.sets.theros.BidentOfThassa {
 
     public BidentOfThassa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BiomanticMastery.java b/Mage.Sets/src/mage/sets/commander2015/BiomanticMastery.java
index 971dd0f6fe..6655ea2040 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BiomanticMastery.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BiomanticMastery.java
@@ -37,7 +37,7 @@ public class BiomanticMastery extends mage.sets.dissension.BiomanticMastery {
 
     public BiomanticMastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BlackMarket.java b/Mage.Sets/src/mage/sets/commander2015/BlackMarket.java
index e957cb54e9..b50ff5e1f2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BlackMarket.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BlackMarket.java
@@ -37,7 +37,7 @@ public class BlackMarket extends mage.sets.mercadianmasques.BlackMarket {
 
     public BlackMarket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BlastedLandscape.java b/Mage.Sets/src/mage/sets/commander2015/BlastedLandscape.java
index 8a3be21959..6cabe9f9b3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BlastedLandscape.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BlastedLandscape.java
@@ -37,7 +37,7 @@ public class BlastedLandscape extends mage.sets.urzassaga.BlastedLandscape {
 
     public BlastedLandscape(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BlatantThievery.java b/Mage.Sets/src/mage/sets/commander2015/BlatantThievery.java
index d201393e23..47d90a0045 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BlatantThievery.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BlatantThievery.java
@@ -37,7 +37,7 @@ public class BlatantThievery extends mage.sets.onslaught.BlatantThievery {
 
     public BlatantThievery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BloodBairn.java b/Mage.Sets/src/mage/sets/commander2015/BloodBairn.java
index a6572bd9fb..b85cb0d828 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BloodBairn.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BloodBairn.java
@@ -37,7 +37,7 @@ public class BloodBairn extends mage.sets.magic2014.BloodBairn {
 
     public BloodBairn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BlueSunsZenith.java b/Mage.Sets/src/mage/sets/commander2015/BlueSunsZenith.java
index 2b03a31ef3..a34921f598 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BlueSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BlueSunsZenith.java
@@ -37,7 +37,7 @@ public class BlueSunsZenith extends mage.sets.mirrodinbesieged.BlueSunsZenith {
 
     public BlueSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Blustersquall.java b/Mage.Sets/src/mage/sets/commander2015/Blustersquall.java
index 0277432714..32e3f27f32 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Blustersquall.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Blustersquall.java
@@ -37,7 +37,7 @@ public class Blustersquall extends mage.sets.returntoravnica.Blustersquall {
 
     public Blustersquall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Bonehoard.java b/Mage.Sets/src/mage/sets/commander2015/Bonehoard.java
index 1594dc3822..e427c684de 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Bonehoard.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Bonehoard.java
@@ -37,7 +37,7 @@ public class Bonehoard extends mage.sets.mirrodinbesieged.Bonehoard {
 
     public Bonehoard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BorosCluestone.java b/Mage.Sets/src/mage/sets/commander2015/BorosCluestone.java
index c6b00359f3..cfb72b1816 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BorosCluestone.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BorosCluestone.java
@@ -37,7 +37,7 @@ public class BorosCluestone extends mage.sets.dragonsmaze.BorosCluestone {
 
     public BorosCluestone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BorosGarrison.java b/Mage.Sets/src/mage/sets/commander2015/BorosGarrison.java
index 4228b3b0c7..64434774a7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BorosGarrison.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BorosGarrison.java
@@ -37,7 +37,7 @@ public class BorosGarrison extends mage.sets.planechase.BorosGarrison {
 
     public BorosGarrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BorosGuildgate.java b/Mage.Sets/src/mage/sets/commander2015/BorosGuildgate.java
index e0358daa1e..071e875b78 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BorosGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BorosGuildgate.java
@@ -37,7 +37,7 @@ public class BorosGuildgate extends mage.sets.gatecrash.BorosGuildgate {
 
     public BorosGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BorosSignet.java b/Mage.Sets/src/mage/sets/commander2015/BorosSignet.java
index c5ff28ea13..ff01131156 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BorosSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BorosSignet.java
@@ -37,7 +37,7 @@ public class BorosSignet extends mage.sets.ravnica.BorosSignet {
 
     public BorosSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Brainstorm.java b/Mage.Sets/src/mage/sets/commander2015/Brainstorm.java
index d7eed4c41d..2dbcec1cac 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BreathOfDarigaaz.java b/Mage.Sets/src/mage/sets/commander2015/BreathOfDarigaaz.java
index 004bec7ae2..03a08e57c3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BreathOfDarigaaz.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BreathOfDarigaaz.java
@@ -37,7 +37,7 @@ public class BreathOfDarigaaz extends mage.sets.commander.BreathOfDarigaaz {
 
     public BreathOfDarigaaz(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/BurnishedHart.java b/Mage.Sets/src/mage/sets/commander2015/BurnishedHart.java
index 37d613e3ec..20b8e881f3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/BurnishedHart.java
+++ b/Mage.Sets/src/mage/sets/commander2015/BurnishedHart.java
@@ -37,7 +37,7 @@ public class BurnishedHart extends mage.sets.theros.BurnishedHart {
 
     public BurnishedHart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/commander2015/ButcherOfMalakir.java
index cc13809840..83b1036a1c 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ButcherOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ButcherOfMalakir.java
@@ -37,7 +37,7 @@ public class ButcherOfMalakir extends mage.sets.worldwake.ButcherOfMalakir {
 
     public ButcherOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CageOfHands.java b/Mage.Sets/src/mage/sets/commander2015/CageOfHands.java
index b66d7722b7..22d18ff977 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CageOfHands.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CageOfHands.java
@@ -37,7 +37,7 @@ public class CageOfHands extends mage.sets.championsofkamigawa.CageOfHands {
 
     public CageOfHands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CallTheSkybreaker.java b/Mage.Sets/src/mage/sets/commander2015/CallTheSkybreaker.java
index 6fc69f0e5a..f6a27f53a6 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CallTheSkybreaker.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CallTheSkybreaker.java
@@ -37,7 +37,7 @@ public class CallTheSkybreaker extends mage.sets.commander.CallTheSkybreaker {
 
     public CallTheSkybreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CallerOfTheClaw.java b/Mage.Sets/src/mage/sets/commander2015/CallerOfTheClaw.java
index 00e1be423a..b91192661a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CallerOfTheClaw.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CallerOfTheClaw.java
@@ -37,7 +37,7 @@ public class CallerOfTheClaw extends mage.sets.legions.CallerOfTheClaw {
 
     public CallerOfTheClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CelestialAncient.java b/Mage.Sets/src/mage/sets/commander2015/CelestialAncient.java
index 0d4a44192b..0e5db5e617 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CelestialAncient.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CelestialAncient.java
@@ -37,7 +37,7 @@ public class CelestialAncient extends mage.sets.dissension.CelestialAncient {
 
     public CelestialAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CelestialArchon.java b/Mage.Sets/src/mage/sets/commander2015/CelestialArchon.java
index efc1c6bcef..d9de7020a5 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CelestialArchon.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CelestialArchon.java
@@ -37,7 +37,7 @@ public class CelestialArchon extends mage.sets.theros.CelestialArchon {
 
     public CelestialArchon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ChainReaction.java b/Mage.Sets/src/mage/sets/commander2015/ChainReaction.java
index f4a7e53e10..23a5e008bf 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ChainReaction.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ChainReaction.java
@@ -37,7 +37,7 @@ public class ChainReaction extends mage.sets.worldwake.ChainReaction {
 
     public ChainReaction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ChameleonColossus.java b/Mage.Sets/src/mage/sets/commander2015/ChameleonColossus.java
index 93d764688f..dca1d3d927 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ChameleonColossus.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ChameleonColossus.java
@@ -37,7 +37,7 @@ public class ChameleonColossus extends mage.sets.morningtide.ChameleonColossus {
 
     public ChameleonColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ChampionOfStraySouls.java b/Mage.Sets/src/mage/sets/commander2015/ChampionOfStraySouls.java
index de9ca77982..cd40d0e907 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ChampionOfStraySouls.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ChampionOfStraySouls.java
@@ -37,7 +37,7 @@ public class ChampionOfStraySouls extends mage.sets.bornofthegods.ChampionOfStra
 
     public ChampionOfStraySouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CharmbreakerDevils.java b/Mage.Sets/src/mage/sets/commander2015/CharmbreakerDevils.java
index 932ff9b7e4..cb86f48eae 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CharmbreakerDevils.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CharmbreakerDevils.java
@@ -37,7 +37,7 @@ public class CharmbreakerDevils extends mage.sets.innistrad.CharmbreakerDevils {
 
     public CharmbreakerDevils(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Cloudthresher.java b/Mage.Sets/src/mage/sets/commander2015/Cloudthresher.java
index 8cded42196..df5e068127 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Cloudthresher.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Cloudthresher.java
@@ -37,7 +37,7 @@ public class Cloudthresher extends mage.sets.lorwyn.Cloudthresher {
 
     public Cloudthresher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CobraTrap.java b/Mage.Sets/src/mage/sets/commander2015/CobraTrap.java
index d8a6571c1d..ccce3a1915 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CobraTrap.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CobraTrap.java
@@ -37,7 +37,7 @@ public class CobraTrap extends mage.sets.zendikar.CobraTrap {
 
     public CobraTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CoilingOracle.java b/Mage.Sets/src/mage/sets/commander2015/CoilingOracle.java
index 43d7eaa164..6562228071 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CoilingOracle.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CoilingOracle.java
@@ -37,7 +37,7 @@ public class CoilingOracle extends mage.sets.dissension.CoilingOracle {
 
     public CoilingOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ColdEyedSelkie.java b/Mage.Sets/src/mage/sets/commander2015/ColdEyedSelkie.java
index adb74c1e18..46aed2df8d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ColdEyedSelkie.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ColdEyedSelkie.java
@@ -37,7 +37,7 @@ public class ColdEyedSelkie extends mage.sets.eventide.ColdEyedSelkie {
 
     public ColdEyedSelkie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ColdsteelHeart.java b/Mage.Sets/src/mage/sets/commander2015/ColdsteelHeart.java
index af66575eca..64f6499e83 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ColdsteelHeart.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ColdsteelHeart.java
@@ -37,7 +37,7 @@ public class ColdsteelHeart extends mage.sets.coldsnap.ColdsteelHeart {
 
     public ColdsteelHeart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CometStorm.java b/Mage.Sets/src/mage/sets/commander2015/CometStorm.java
index 2da821aaf9..d800e5bcf8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CometStorm.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CometStorm.java
@@ -37,7 +37,7 @@ public class CometStorm extends mage.sets.worldwake.CometStorm {
 
     public CometStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CommandTower.java b/Mage.Sets/src/mage/sets/commander2015/CommandTower.java
index c49aab943d..d5d02e4d6b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CommandTower.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CommandTower.java
@@ -37,7 +37,7 @@ public class CommandTower extends mage.sets.commander2013.CommandTower {
 
     public CommandTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Counterflux.java b/Mage.Sets/src/mage/sets/commander2015/Counterflux.java
index 97bb07599d..b51e551032 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Counterflux.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Counterflux.java
@@ -37,7 +37,7 @@ public class Counterflux extends mage.sets.returntoravnica.Counterflux {
 
     public Counterflux(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CribSwap.java b/Mage.Sets/src/mage/sets/commander2015/CribSwap.java
index 6a8f7f533a..5fff714f81 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CribSwap.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CribSwap.java
@@ -37,7 +37,7 @@ public class CribSwap extends mage.sets.lorwyn.CribSwap {
 
     public CribSwap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/sets/commander2015/CurseOfTheNightlyHunt.java
index 51092b5411..5611c491b2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/CurseOfTheNightlyHunt.java
+++ b/Mage.Sets/src/mage/sets/commander2015/CurseOfTheNightlyHunt.java
@@ -37,7 +37,7 @@ public class CurseOfTheNightlyHunt extends mage.sets.innistrad.CurseOfTheNightly
 
     public CurseOfTheNightlyHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DarksteelIngot.java b/Mage.Sets/src/mage/sets/commander2015/DarksteelIngot.java
index 02be9f3a79..630eee15b0 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DarksteelIngot.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DarksteelIngot.java
@@ -38,7 +38,7 @@ public class DarksteelIngot extends mage.sets.darksteel.DarksteelIngot {
 
     public DarksteelIngot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "C15";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2015/DawnToDusk.java b/Mage.Sets/src/mage/sets/commander2015/DawnToDusk.java
index 49ebac9323..9f52800f45 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DawnToDusk.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DawnToDusk.java
@@ -37,7 +37,7 @@ public class DawnToDusk extends mage.sets.bornofthegods.DawnToDusk {
 
     public DawnToDusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DawnglareInvoker.java b/Mage.Sets/src/mage/sets/commander2015/DawnglareInvoker.java
index 9fbb403666..22865de306 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DawnglareInvoker.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DawnglareInvoker.java
@@ -37,7 +37,7 @@ public class DawnglareInvoker extends mage.sets.riseoftheeldrazi.DawnglareInvoke
 
     public DawnglareInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DayOfTheDragons.java b/Mage.Sets/src/mage/sets/commander2015/DayOfTheDragons.java
index 8e29a7a39d..0abec4a740 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DayOfTheDragons.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DayOfTheDragons.java
@@ -37,7 +37,7 @@ public class DayOfTheDragons extends mage.sets.scourge.DayOfTheDragons {
 
     public DayOfTheDragons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DeathGrasp.java b/Mage.Sets/src/mage/sets/commander2015/DeathGrasp.java
index 55f24816b8..3568e6627c 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DeathGrasp.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DeathGrasp.java
@@ -37,7 +37,7 @@ public class DeathGrasp extends mage.sets.apocalypse.DeathGrasp {
 
     public DeathGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DesertTwister.java b/Mage.Sets/src/mage/sets/commander2015/DesertTwister.java
index bd7d8a64ff..63f00ffb72 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DesolationGiant.java b/Mage.Sets/src/mage/sets/commander2015/DesolationGiant.java
index 76982a9f58..057a2ec5e8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DesolationGiant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DesolationGiant.java
@@ -37,7 +37,7 @@ public class DesolationGiant extends mage.sets.apocalypse.DesolationGiant {
 
     public DesolationGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DesperateRavings.java b/Mage.Sets/src/mage/sets/commander2015/DesperateRavings.java
index 2991bbcb07..6f0cc47098 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DesperateRavings.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DesperateRavings.java
@@ -37,7 +37,7 @@ public class DesperateRavings extends mage.sets.innistrad.DesperateRavings {
 
     public DesperateRavings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DiabolicServitude.java b/Mage.Sets/src/mage/sets/commander2015/DiabolicServitude.java
index 7e226b8f4c..59e7df431e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DiabolicServitude.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DiabolicServitude.java
@@ -37,7 +37,7 @@ public class DiabolicServitude extends mage.sets.urzassaga.DiabolicServitude {
 
     public DiabolicServitude(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DictateOfHeliod.java b/Mage.Sets/src/mage/sets/commander2015/DictateOfHeliod.java
index e78f912347..ebde12225a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DictateOfHeliod.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DictateOfHeliod.java
@@ -37,7 +37,7 @@ public class DictateOfHeliod extends mage.sets.journeyintonyx.DictateOfHeliod {
 
     public DictateOfHeliod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DisasterRadius.java b/Mage.Sets/src/mage/sets/commander2015/DisasterRadius.java
index cfb6de05ba..a032cfddc4 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DisasterRadius.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DisasterRadius.java
@@ -37,7 +37,7 @@ public class DisasterRadius extends mage.sets.riseoftheeldrazi.DisasterRadius {
 
     public DisasterRadius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Dominate.java b/Mage.Sets/src/mage/sets/commander2015/Dominate.java
index 8a6c392e21..1b46ef6661 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Dominate.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Dominate.java
@@ -37,7 +37,7 @@ public class Dominate extends mage.sets.nemesis.Dominate {
 
     public Dominate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DoomwakeGiant.java b/Mage.Sets/src/mage/sets/commander2015/DoomwakeGiant.java
index e4fcc3a412..341c8e93da 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DoomwakeGiant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DoomwakeGiant.java
@@ -37,7 +37,7 @@ public class DoomwakeGiant extends mage.sets.journeyintonyx.DoomwakeGiant {
 
     public DoomwakeGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DragonMage.java b/Mage.Sets/src/mage/sets/commander2015/DragonMage.java
index 985eeb5a07..c39b7a47d4 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DragonMage.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DragonMage.java
@@ -37,7 +37,7 @@ public class DragonMage extends mage.sets.scourge.DragonMage {
 
     public DragonMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DreadbringerLampads.java b/Mage.Sets/src/mage/sets/commander2015/DreadbringerLampads.java
index 40bd277c59..d394d4ae54 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DreadbringerLampads.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DreadbringerLampads.java
@@ -37,7 +37,7 @@ public class DreadbringerLampads extends mage.sets.journeyintonyx.DreadbringerLa
 
     public DreadbringerLampads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DreamstoneHedron.java b/Mage.Sets/src/mage/sets/commander2015/DreamstoneHedron.java
index 75d8d6a1a2..658bf3c040 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DreamstoneHedron.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DreamstoneHedron.java
@@ -37,7 +37,7 @@ public class DreamstoneHedron extends mage.sets.riseoftheeldrazi.DreamstoneHedro
 
     public DreamstoneHedron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/DriftingMeadow.java b/Mage.Sets/src/mage/sets/commander2015/DriftingMeadow.java
index 3f456bfd3b..e998ffd28a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/DriftingMeadow.java
+++ b/Mage.Sets/src/mage/sets/commander2015/DriftingMeadow.java
@@ -37,7 +37,7 @@ public class DriftingMeadow extends mage.sets.urzassaga.DriftingMeadow {
 
     public DriftingMeadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Earthquake.java b/Mage.Sets/src/mage/sets/commander2015/Earthquake.java
index bb54ec42ef..8ed25cbbcd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EaterOfHope.java b/Mage.Sets/src/mage/sets/commander2015/EaterOfHope.java
index b044d9823f..06a2574fca 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EaterOfHope.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EaterOfHope.java
@@ -37,7 +37,7 @@ public class EaterOfHope extends mage.sets.bornofthegods.EaterOfHope {
 
     public EaterOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EchoingTruth.java b/Mage.Sets/src/mage/sets/commander2015/EchoingTruth.java
index db0fe308b0..dc339aaebc 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EchoingTruth.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EchoingTruth.java
@@ -37,7 +37,7 @@ public class EchoingTruth extends mage.sets.elspethvstezzeret.EchoingTruth {
 
     public EchoingTruth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EldraziMonument.java b/Mage.Sets/src/mage/sets/commander2015/EldraziMonument.java
index ade2787147..bb77834e9b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EldraziMonument.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EldraziMonument.java
@@ -37,7 +37,7 @@ public class EldraziMonument extends mage.sets.zendikar.EldraziMonument {
 
     public EldraziMonument(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ElvishVisionary.java b/Mage.Sets/src/mage/sets/commander2015/ElvishVisionary.java
index c06da388da..9c56e71ce2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ElvishVisionary.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ElvishVisionary.java
@@ -37,7 +37,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
 
     public ElvishVisionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EpicExperiment.java b/Mage.Sets/src/mage/sets/commander2015/EpicExperiment.java
index dd720ca83b..4ba3e855d3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EpicExperiment.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EpicExperiment.java
@@ -37,7 +37,7 @@ public class EpicExperiment extends mage.sets.returntoravnica.EpicExperiment {
 
     public EpicExperiment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EternalWitness.java b/Mage.Sets/src/mage/sets/commander2015/EternalWitness.java
index 6d8b8f5065..36e3d21411 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EternalWitness.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EternalWitness.java
@@ -37,7 +37,7 @@ public class EternalWitness extends mage.sets.fifthdawn.EternalWitness {
 
     public EternalWitness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EtheriumHornSorcerer.java b/Mage.Sets/src/mage/sets/commander2015/EtheriumHornSorcerer.java
index 82017cf6a1..e1a01b3616 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EtheriumHornSorcerer.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EtheriumHornSorcerer.java
@@ -37,7 +37,7 @@ public class EtheriumHornSorcerer extends mage.sets.planechase2012.EtheriumHornS
 
     public EtheriumHornSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/EvolvingWilds.java b/Mage.Sets/src/mage/sets/commander2015/EvolvingWilds.java
index aa2e84982d..56e97f882b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/commander2015/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ExperimentOne.java b/Mage.Sets/src/mage/sets/commander2015/ExperimentOne.java
index 4f670a31e1..d0886abd52 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ExperimentOne.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ExperimentOne.java
@@ -37,7 +37,7 @@ public class ExperimentOne extends mage.sets.gatecrash.ExperimentOne {
 
     public ExperimentOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ExtractorDemon.java b/Mage.Sets/src/mage/sets/commander2015/ExtractorDemon.java
index 36ea209566..181bd92604 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ExtractorDemon.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ExtractorDemon.java
@@ -37,7 +37,7 @@ public class ExtractorDemon extends mage.sets.conflux.ExtractorDemon {
 
     public ExtractorDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FactOrFiction.java b/Mage.Sets/src/mage/sets/commander2015/FactOrFiction.java
index 388260e835..0bede6cf9e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FaithlessLooting.java b/Mage.Sets/src/mage/sets/commander2015/FaithlessLooting.java
index e6ca2d645d..fd79e5bcb2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FaithlessLooting.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FaithlessLooting.java
@@ -37,7 +37,7 @@ public class FaithlessLooting extends mage.sets.darkascension.FaithlessLooting {
 
     public FaithlessLooting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FaithsFetters.java b/Mage.Sets/src/mage/sets/commander2015/FaithsFetters.java
index 533bef2645..1f099b55a1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FaithsFetters.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FaithsFetters.java
@@ -37,7 +37,7 @@ public class FaithsFetters extends mage.sets.divinevsdemonic.FaithsFetters {
 
     public FaithsFetters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FallOfTheHammer.java b/Mage.Sets/src/mage/sets/commander2015/FallOfTheHammer.java
index 0d1ec478b7..4a0b7d71e7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FallOfTheHammer.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FallOfTheHammer.java
@@ -37,7 +37,7 @@ public class FallOfTheHammer extends mage.sets.bornofthegods.FallOfTheHammer {
 
     public FallOfTheHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FallenIdeal.java b/Mage.Sets/src/mage/sets/commander2015/FallenIdeal.java
index e5efb44f10..0ea9c0e59f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FallenIdeal.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FallenIdeal.java
@@ -37,7 +37,7 @@ public class FallenIdeal extends mage.sets.timespiral.FallenIdeal {
 
     public FallenIdeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FateUnraveler.java b/Mage.Sets/src/mage/sets/commander2015/FateUnraveler.java
index f176fee913..c4c1abdad2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FateUnraveler.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FateUnraveler.java
@@ -37,7 +37,7 @@ public class FateUnraveler extends mage.sets.bornofthegods.FateUnraveler {
 
     public FateUnraveler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FellwarStone.java b/Mage.Sets/src/mage/sets/commander2015/FellwarStone.java
index 94c57e79de..aaef23c158 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FellwarStone.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FellwarStone.java
@@ -37,7 +37,7 @@ public class FellwarStone extends mage.sets.ninthedition.FellwarStone {
 
     public FellwarStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FiremindsForesight.java b/Mage.Sets/src/mage/sets/commander2015/FiremindsForesight.java
index 4d5b379d65..0e5c95d10d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FiremindsForesight.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FiremindsForesight.java
@@ -37,7 +37,7 @@ public class FiremindsForesight extends mage.sets.returntoravnica.FiremindsFores
 
     public FiremindsForesight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ForgottenAncient.java b/Mage.Sets/src/mage/sets/commander2015/ForgottenAncient.java
index b056f39142..937510d267 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ForgottenAncient.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ForgottenAncient.java
@@ -37,7 +37,7 @@ public class ForgottenAncient extends mage.sets.scourge.ForgottenAncient {
 
     public ForgottenAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ForgottenCave.java b/Mage.Sets/src/mage/sets/commander2015/ForgottenCave.java
index 4fd1f75ed0..68e3180066 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/FumikoTheLowblood.java b/Mage.Sets/src/mage/sets/commander2015/FumikoTheLowblood.java
index 08db13e13b..61829e3db1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/FumikoTheLowblood.java
+++ b/Mage.Sets/src/mage/sets/commander2015/FumikoTheLowblood.java
@@ -37,7 +37,7 @@ public class FumikoTheLowblood extends mage.sets.betrayersofkamigawa.FumikoTheLo
 
     public FumikoTheLowblood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GhostQuarter.java b/Mage.Sets/src/mage/sets/commander2015/GhostQuarter.java
index d1e13df5a1..f62930d58d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GhostQuarter.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GhostQuarter.java
@@ -37,7 +37,7 @@ public class GhostQuarter extends mage.sets.innistrad.GhostQuarter {
 
     public GhostQuarter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GhostbladeEidolon.java b/Mage.Sets/src/mage/sets/commander2015/GhostbladeEidolon.java
index 5f0ab56bf8..4c01782cd6 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GhostbladeEidolon.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GhostbladeEidolon.java
@@ -37,7 +37,7 @@ public class GhostbladeEidolon extends mage.sets.bornofthegods.GhostbladeEidolon
 
     public GhostbladeEidolon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Gild.java b/Mage.Sets/src/mage/sets/commander2015/Gild.java
index 1131c232db..fbdc04e53b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Gild.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Gild.java
@@ -37,7 +37,7 @@ public class Gild extends mage.sets.bornofthegods.Gild {
 
     public Gild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GiselaBladeOfGoldnight.java b/Mage.Sets/src/mage/sets/commander2015/GiselaBladeOfGoldnight.java
index 4f76ad72e2..1efde458c3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GiselaBladeOfGoldnight.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GiselaBladeOfGoldnight.java
@@ -37,7 +37,7 @@ public class GiselaBladeOfGoldnight extends mage.sets.avacynrestored.GiselaBlade
 
     public GiselaBladeOfGoldnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GoblinElectromancer.java b/Mage.Sets/src/mage/sets/commander2015/GoblinElectromancer.java
index 27b2012a43..daab5c7d94 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GoblinElectromancer.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GoblinElectromancer.java
@@ -37,7 +37,7 @@ public class GoblinElectromancer extends mage.sets.returntoravnica.GoblinElectro
 
     public GoblinElectromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GolgariCharm.java b/Mage.Sets/src/mage/sets/commander2015/GolgariCharm.java
index 9df10beca4..06dd0d3914 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GolgariCharm.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GolgariCharm.java
@@ -37,7 +37,7 @@ public class GolgariCharm extends mage.sets.returntoravnica.GolgariCharm {
 
     public GolgariCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GolgariGuildgate.java b/Mage.Sets/src/mage/sets/commander2015/GolgariGuildgate.java
index cf2660d677..0ebd6b3397 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GolgariGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GolgariGuildgate.java
@@ -37,7 +37,7 @@ public class GolgariGuildgate extends mage.sets.returntoravnica.GolgariGuildgate
 
     public GolgariGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/commander2015/GolgariRotFarm.java
index cfe7028460..227c5c0c84 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GolgariRotFarm.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GolgariRotFarm.java
@@ -37,7 +37,7 @@ public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
 
     public GolgariRotFarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GolgariSignet.java b/Mage.Sets/src/mage/sets/commander2015/GolgariSignet.java
index 21269b7641..6db23bf1d9 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GolgariSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GolgariSignet.java
@@ -37,7 +37,7 @@ public class GolgariSignet extends mage.sets.ravnica.GolgariSignet {
 
     public GolgariSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GravePeril.java b/Mage.Sets/src/mage/sets/commander2015/GravePeril.java
index 5727c58a49..8a22759916 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GravePeril.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GravePeril.java
@@ -37,7 +37,7 @@ public class GravePeril extends mage.sets.futuresight.GravePeril {
 
     public GravePeril(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GrimBackwoods.java b/Mage.Sets/src/mage/sets/commander2015/GrimBackwoods.java
index a2d518a782..2befef952a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GrimBackwoods.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GrimBackwoods.java
@@ -37,7 +37,7 @@ public class GrimBackwoods extends mage.sets.darkascension.GrimBackwoods {
 
     public GrimBackwoods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/GrislySalvage.java b/Mage.Sets/src/mage/sets/commander2015/GrislySalvage.java
index 8e1ef1e810..7cbf94fa01 100644
--- a/Mage.Sets/src/mage/sets/commander2015/GrislySalvage.java
+++ b/Mage.Sets/src/mage/sets/commander2015/GrislySalvage.java
@@ -37,7 +37,7 @@ public class GrislySalvage extends mage.sets.returntoravnica.GrislySalvage {
 
     public GrislySalvage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/commander2015/HamletbackGoliath.java
index cf996481c2..95315ed3f1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/HamletbackGoliath.java
+++ b/Mage.Sets/src/mage/sets/commander2015/HamletbackGoliath.java
@@ -37,7 +37,7 @@ public class HamletbackGoliath extends mage.sets.magic2013.HamletbackGoliath {
 
     public HamletbackGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/HammerfistGiant.java b/Mage.Sets/src/mage/sets/commander2015/HammerfistGiant.java
index 2b4697036a..4b18e9ad1f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/HammerfistGiant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/HammerfistGiant.java
@@ -37,7 +37,7 @@ public class HammerfistGiant extends mage.sets.ravnica.HammerfistGiant {
 
     public HammerfistGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/HighMarket.java b/Mage.Sets/src/mage/sets/commander2015/HighMarket.java
index 48b361b8b1..cc41beb362 100644
--- a/Mage.Sets/src/mage/sets/commander2015/HighMarket.java
+++ b/Mage.Sets/src/mage/sets/commander2015/HighMarket.java
@@ -37,7 +37,7 @@ public class HighMarket extends mage.sets.mercadianmasques.HighMarket {
 
     public HighMarket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Hostility.java b/Mage.Sets/src/mage/sets/commander2015/Hostility.java
index e4573dede9..c3cf98c3b3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Hostility.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Hostility.java
@@ -37,7 +37,7 @@ public class Hostility extends mage.sets.jacevschandra.Hostility {
 
     public Hostility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/HuntedDragon.java b/Mage.Sets/src/mage/sets/commander2015/HuntedDragon.java
index 994af27c70..56764790bc 100644
--- a/Mage.Sets/src/mage/sets/commander2015/HuntedDragon.java
+++ b/Mage.Sets/src/mage/sets/commander2015/HuntedDragon.java
@@ -37,7 +37,7 @@ public class HuntedDragon extends mage.sets.ravnica.HuntedDragon {
 
     public HuntedDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/commander2015/IndrikStomphowler.java
index ebd219d35a..80d29c7574 100644
--- a/Mage.Sets/src/mage/sets/commander2015/IndrikStomphowler.java
+++ b/Mage.Sets/src/mage/sets/commander2015/IndrikStomphowler.java
@@ -37,7 +37,7 @@ public class IndrikStomphowler extends mage.sets.dissension.IndrikStomphowler {
 
     public IndrikStomphowler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/InfernoTitan.java b/Mage.Sets/src/mage/sets/commander2015/InfernoTitan.java
index 332a7608c7..21c2e19994 100644
--- a/Mage.Sets/src/mage/sets/commander2015/InfernoTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2015/InfernoTitan.java
@@ -37,7 +37,7 @@ public class InfernoTitan extends mage.sets.magic2011.InfernoTitan {
 
     public InfernoTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/commander2015/IzzetBoilerworks.java
index 0c13f02a23..ed15f2eac1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/IzzetBoilerworks.java
+++ b/Mage.Sets/src/mage/sets/commander2015/IzzetBoilerworks.java
@@ -37,7 +37,7 @@ public class IzzetBoilerworks extends mage.sets.guildpact.IzzetBoilerworks {
 
     public IzzetBoilerworks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/IzzetGuildgate.java b/Mage.Sets/src/mage/sets/commander2015/IzzetGuildgate.java
index 4b3e168dae..2a1b2f20c4 100644
--- a/Mage.Sets/src/mage/sets/commander2015/IzzetGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2015/IzzetGuildgate.java
@@ -37,7 +37,7 @@ public class IzzetGuildgate extends mage.sets.returntoravnica.IzzetGuildgate {
 
     public IzzetGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/IzzetSignet.java b/Mage.Sets/src/mage/sets/commander2015/IzzetSignet.java
index 93ef94f95e..906511941f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/IzzetSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2015/IzzetSignet.java
@@ -37,7 +37,7 @@ public class IzzetSignet extends mage.sets.guildpact.IzzetSignet {
 
     public IzzetSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/JacesArchivist.java b/Mage.Sets/src/mage/sets/commander2015/JacesArchivist.java
index 536237f18e..d4e59045e3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/JacesArchivist.java
+++ b/Mage.Sets/src/mage/sets/commander2015/JacesArchivist.java
@@ -37,7 +37,7 @@ public class JacesArchivist extends mage.sets.magic2012.JacesArchivist {
 
     public JacesArchivist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/JaradGolgariLichLord.java b/Mage.Sets/src/mage/sets/commander2015/JaradGolgariLichLord.java
index 111783a9e5..bf3aee6db9 100644
--- a/Mage.Sets/src/mage/sets/commander2015/JaradGolgariLichLord.java
+++ b/Mage.Sets/src/mage/sets/commander2015/JaradGolgariLichLord.java
@@ -37,7 +37,7 @@ public class JaradGolgariLichLord extends mage.sets.returntoravnica.JaradGolgari
 
     public JaradGolgariLichLord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/JarethLeonineTitan.java b/Mage.Sets/src/mage/sets/commander2015/JarethLeonineTitan.java
index fcfe6a6472..e51eaefa3f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/JarethLeonineTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2015/JarethLeonineTitan.java
@@ -37,7 +37,7 @@ public class JarethLeonineTitan extends mage.sets.onslaught.JarethLeonineTitan {
 
     public JarethLeonineTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/JungleHollow.java b/Mage.Sets/src/mage/sets/commander2015/JungleHollow.java
index 459a994596..36cb094016 100644
--- a/Mage.Sets/src/mage/sets/commander2015/JungleHollow.java
+++ b/Mage.Sets/src/mage/sets/commander2015/JungleHollow.java
@@ -37,7 +37,7 @@ public class JungleHollow extends mage.sets.khansoftarkir.JungleHollow {
 
     public JungleHollow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/KarmicJustice.java b/Mage.Sets/src/mage/sets/commander2015/KarmicJustice.java
index fa59189a76..433cf09175 100644
--- a/Mage.Sets/src/mage/sets/commander2015/KarmicJustice.java
+++ b/Mage.Sets/src/mage/sets/commander2015/KarmicJustice.java
@@ -37,7 +37,7 @@ public class KarmicJustice extends mage.sets.odyssey.KarmicJustice {
 
     public KarmicJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/KessigCagebreakers.java b/Mage.Sets/src/mage/sets/commander2015/KessigCagebreakers.java
index c8853c1200..3560e8f965 100644
--- a/Mage.Sets/src/mage/sets/commander2015/KessigCagebreakers.java
+++ b/Mage.Sets/src/mage/sets/commander2015/KessigCagebreakers.java
@@ -37,7 +37,7 @@ public class KessigCagebreakers extends mage.sets.innistrad.KessigCagebreakers {
 
     public KessigCagebreakers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/KodamasReach.java b/Mage.Sets/src/mage/sets/commander2015/KodamasReach.java
index 578869279f..e69b8b0865 100644
--- a/Mage.Sets/src/mage/sets/commander2015/KodamasReach.java
+++ b/Mage.Sets/src/mage/sets/commander2015/KodamasReach.java
@@ -37,7 +37,7 @@ public class KodamasReach extends mage.sets.commander.KodamasReach {
 
     public KodamasReach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/KorSanctifiers.java b/Mage.Sets/src/mage/sets/commander2015/KorSanctifiers.java
index 55363b484f..807f249455 100644
--- a/Mage.Sets/src/mage/sets/commander2015/KorSanctifiers.java
+++ b/Mage.Sets/src/mage/sets/commander2015/KorSanctifiers.java
@@ -37,7 +37,7 @@ public class KorSanctifiers extends mage.sets.zendikar.KorSanctifiers {
 
     public KorSanctifiers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/KorozdaGuildmage.java b/Mage.Sets/src/mage/sets/commander2015/KorozdaGuildmage.java
index de30f3299b..3039853fea 100644
--- a/Mage.Sets/src/mage/sets/commander2015/KorozdaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/commander2015/KorozdaGuildmage.java
@@ -37,7 +37,7 @@ public class KorozdaGuildmage extends mage.sets.returntoravnica.KorozdaGuildmage
 
     public KorozdaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/KrosanGrip.java b/Mage.Sets/src/mage/sets/commander2015/KrosanGrip.java
index 218786c9fd..bfbd6eb825 100644
--- a/Mage.Sets/src/mage/sets/commander2015/KrosanGrip.java
+++ b/Mage.Sets/src/mage/sets/commander2015/KrosanGrip.java
@@ -37,7 +37,7 @@ public class KrosanGrip extends mage.sets.timespiral.KrosanGrip {
 
     public KrosanGrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LightningGreaves.java b/Mage.Sets/src/mage/sets/commander2015/LightningGreaves.java
index c3bb0358be..5e8b1ebd28 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LightningGreaves.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LightningGreaves.java
@@ -37,7 +37,7 @@ public class LightningGreaves extends mage.sets.mirrodin.LightningGreaves {
 
     public LightningGreaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LlanowarReborn.java b/Mage.Sets/src/mage/sets/commander2015/LlanowarReborn.java
index 0186c1edf6..eac5e51f68 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LlanowarReborn.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LlanowarReborn.java
@@ -37,7 +37,7 @@ public class LlanowarReborn extends mage.sets.heroesvsmonsters.LlanowarReborn {
 
     public LlanowarReborn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LoamingShaman.java b/Mage.Sets/src/mage/sets/commander2015/LoamingShaman.java
index e40d9147cb..2a0deebd28 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LoamingShaman.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LoamingShaman.java
@@ -37,7 +37,7 @@ public class LoamingShaman extends mage.sets.dissension.LoamingShaman {
 
     public LoamingShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LoneRevenant.java b/Mage.Sets/src/mage/sets/commander2015/LoneRevenant.java
index 5f209497ea..babb6b2830 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LoneRevenant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LoneRevenant.java
@@ -37,7 +37,7 @@ public class LoneRevenant extends mage.sets.avacynrestored.LoneRevenant {
 
     public LoneRevenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LorescaleCoatl.java b/Mage.Sets/src/mage/sets/commander2015/LorescaleCoatl.java
index 974ff8433c..71bef164a1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LorescaleCoatl.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LorescaleCoatl.java
@@ -37,7 +37,7 @@ public class LorescaleCoatl extends mage.sets.alarareborn.LorescaleCoatl {
 
     public LorescaleCoatl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LotlethTroll.java b/Mage.Sets/src/mage/sets/commander2015/LotlethTroll.java
index 9ee92a7b72..d35085b00c 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LotlethTroll.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LotlethTroll.java
@@ -37,7 +37,7 @@ public class LotlethTroll extends mage.sets.returntoravnica.LotlethTroll {
 
     public LotlethTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/commander2015/LoxodonWarhammer.java
index eb96bcf799..2d961e6792 100644
--- a/Mage.Sets/src/mage/sets/commander2015/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/commander2015/LoxodonWarhammer.java
@@ -37,7 +37,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
 
     public LoxodonWarhammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MagmaGiant.java b/Mage.Sets/src/mage/sets/commander2015/MagmaGiant.java
index 050fa02e2a..b0c613f194 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MagmaGiant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MagmaGiant.java
@@ -37,7 +37,7 @@ public class MagmaGiant extends mage.sets.portalsecondage.MagmaGiant {
 
     public MagmaGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Magmaquake.java b/Mage.Sets/src/mage/sets/commander2015/Magmaquake.java
index 3c4691c371..d618d22488 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Magmaquake.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Magmaquake.java
@@ -37,7 +37,7 @@ public class Magmaquake extends mage.sets.magic2013.Magmaquake {
 
     public Magmaquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MarshalsAnthem.java b/Mage.Sets/src/mage/sets/commander2015/MarshalsAnthem.java
index 7478fe0e18..b52ebdea51 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MarshalsAnthem.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MarshalsAnthem.java
@@ -37,7 +37,7 @@ public class MarshalsAnthem extends mage.sets.worldwake.MarshalsAnthem {
 
     public MarshalsAnthem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MelekIzzetParagon.java b/Mage.Sets/src/mage/sets/commander2015/MelekIzzetParagon.java
index 1ddf055d2d..e3729f62dc 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MelekIzzetParagon.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MelekIzzetParagon.java
@@ -37,7 +37,7 @@ public class MelekIzzetParagon extends mage.sets.dragonsmaze.MelekIzzetParagon {
 
     public MelekIzzetParagon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MesaEnchantress.java b/Mage.Sets/src/mage/sets/commander2015/MesaEnchantress.java
index c2d51b3c8b..15549022e1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MesaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MesaEnchantress.java
@@ -37,7 +37,7 @@ public class MesaEnchantress extends mage.sets.magic2010.MesaEnchantress {
 
     public MesaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MindStone.java b/Mage.Sets/src/mage/sets/commander2015/MindStone.java
index 3b699f3148..1a17dbbf30 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MindStone.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MindStone.java
@@ -37,7 +37,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MizziumMortars.java b/Mage.Sets/src/mage/sets/commander2015/MizziumMortars.java
index 1c7969c8a0..5b5a57c39e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MizziumMortars.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MizziumMortars.java
@@ -37,7 +37,7 @@ public class MizziumMortars extends mage.sets.returntoravnica.MizziumMortars {
 
     public MizziumMortars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MonkIdealist.java b/Mage.Sets/src/mage/sets/commander2015/MonkIdealist.java
index 91dac8c97e..eda917617f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MonkIdealist.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MonkIdealist.java
@@ -37,7 +37,7 @@ public class MonkIdealist extends mage.sets.urzassaga.MonkIdealist {
 
     public MonkIdealist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MosswortBridge.java b/Mage.Sets/src/mage/sets/commander2015/MosswortBridge.java
index a67796f6cc..5de4983ff8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MosswortBridge.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MosswortBridge.java
@@ -37,7 +37,7 @@ public class MosswortBridge extends mage.sets.commander2013.MosswortBridge {
 
     public MosswortBridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Mulch.java b/Mage.Sets/src/mage/sets/commander2015/Mulch.java
index d5eab8ce89..5177f2c668 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Mulch.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Mulch.java
@@ -37,7 +37,7 @@ public class Mulch extends mage.sets.innistrad.Mulch {
 
     public Mulch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Mulldrifter.java b/Mage.Sets/src/mage/sets/commander2015/Mulldrifter.java
index b916017ea3..142135a340 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Mulldrifter.java
@@ -38,7 +38,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "C15";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2015/Mycoloth.java b/Mage.Sets/src/mage/sets/commander2015/Mycoloth.java
index 5174b44b87..4e5e279298 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Mycoloth.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Mycoloth.java
@@ -37,7 +37,7 @@ public class Mycoloth extends mage.sets.shardsofalara.Mycoloth {
 
     public Mycoloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MysticRetrieval.java b/Mage.Sets/src/mage/sets/commander2015/MysticRetrieval.java
index 6884113958..a82ebc4fd2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MysticRetrieval.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MysticRetrieval.java
@@ -37,7 +37,7 @@ public class MysticRetrieval extends mage.sets.darkascension.MysticRetrieval {
 
     public MysticRetrieval(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/MysticSnake.java b/Mage.Sets/src/mage/sets/commander2015/MysticSnake.java
index 7f52cfdad5..89ab07c9b9 100644
--- a/Mage.Sets/src/mage/sets/commander2015/MysticSnake.java
+++ b/Mage.Sets/src/mage/sets/commander2015/MysticSnake.java
@@ -37,7 +37,7 @@ public class MysticSnake extends mage.sets.apocalypse.MysticSnake {
 
     public MysticSnake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/NecromancersCovenant.java b/Mage.Sets/src/mage/sets/commander2015/NecromancersCovenant.java
index 4e33f50245..763ce05ad2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/NecromancersCovenant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/NecromancersCovenant.java
@@ -37,7 +37,7 @@ public class NecromancersCovenant extends mage.sets.alarareborn.NecromancersCove
 
     public NecromancersCovenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/NewBenalia.java b/Mage.Sets/src/mage/sets/commander2015/NewBenalia.java
index 25f45dcb9c..06f95359ff 100644
--- a/Mage.Sets/src/mage/sets/commander2015/NewBenalia.java
+++ b/Mage.Sets/src/mage/sets/commander2015/NewBenalia.java
@@ -37,7 +37,7 @@ public class NewBenalia extends mage.sets.futuresight.NewBenalia {
 
     public NewBenalia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Nighthowler.java b/Mage.Sets/src/mage/sets/commander2015/Nighthowler.java
index 35fb765437..efcb20b091 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Nighthowler.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Nighthowler.java
@@ -37,7 +37,7 @@ public class Nighthowler extends mage.sets.theros.Nighthowler {
 
     public Nighthowler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/NinjaOfTheDeepHours.java b/Mage.Sets/src/mage/sets/commander2015/NinjaOfTheDeepHours.java
index e3e028c624..3217a3a2c2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/NinjaOfTheDeepHours.java
+++ b/Mage.Sets/src/mage/sets/commander2015/NinjaOfTheDeepHours.java
@@ -37,7 +37,7 @@ public class NinjaOfTheDeepHours extends mage.sets.betrayersofkamigawa.NinjaOfTh
 
     public NinjaOfTheDeepHours(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/NobleQuarry.java b/Mage.Sets/src/mage/sets/commander2015/NobleQuarry.java
index 29d430a5a0..3d606120d3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/NobleQuarry.java
+++ b/Mage.Sets/src/mage/sets/commander2015/NobleQuarry.java
@@ -37,7 +37,7 @@ public class NobleQuarry extends mage.sets.bornofthegods.NobleQuarry {
 
     public NobleQuarry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/NovijenHeartOfProgress.java b/Mage.Sets/src/mage/sets/commander2015/NovijenHeartOfProgress.java
index d1863b2f48..0d23e89f1a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/NovijenHeartOfProgress.java
+++ b/Mage.Sets/src/mage/sets/commander2015/NovijenHeartOfProgress.java
@@ -37,7 +37,7 @@ public class NovijenHeartOfProgress extends mage.sets.dissension.NovijenHeartOfP
 
     public NovijenHeartOfProgress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OhranViper.java b/Mage.Sets/src/mage/sets/commander2015/OhranViper.java
index 2b7dbbef60..a85040fbd2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OhranViper.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OhranViper.java
@@ -37,7 +37,7 @@ public class OhranViper extends mage.sets.jacevsvraska.OhranViper {
 
     public OhranViper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OpenTheVaults.java b/Mage.Sets/src/mage/sets/commander2015/OpenTheVaults.java
index 4cf2f4529b..157795de9a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OpenTheVaults.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OpenTheVaults.java
@@ -37,7 +37,7 @@ public class OpenTheVaults extends mage.sets.magic2010.OpenTheVaults {
 
     public OpenTheVaults(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OranRiefTheVastwood.java b/Mage.Sets/src/mage/sets/commander2015/OranRiefTheVastwood.java
index 3ddc215763..76cf8550ce 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OranRiefTheVastwood.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OranRiefTheVastwood.java
@@ -37,7 +37,7 @@ public class OranRiefTheVastwood extends mage.sets.zendikar.OranRiefTheVastwood
 
     public OranRiefTheVastwood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OrimsThunder.java b/Mage.Sets/src/mage/sets/commander2015/OrimsThunder.java
index d729ba66a6..a8fc3cc312 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OrimsThunder.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OrimsThunder.java
@@ -37,7 +37,7 @@ public class OrimsThunder extends mage.sets.apocalypse.OrimsThunder {
 
     public OrimsThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OrochiHatchery.java b/Mage.Sets/src/mage/sets/commander2015/OrochiHatchery.java
index fd94f987e1..278ba25b88 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OrochiHatchery.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OrochiHatchery.java
@@ -37,7 +37,7 @@ public class OrochiHatchery extends mage.sets.championsofkamigawa.OrochiHatchery
 
     public OrochiHatchery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OrzhovBasilica.java b/Mage.Sets/src/mage/sets/commander2015/OrzhovBasilica.java
index 8415f29971..9c8084b74a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OrzhovBasilica.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OrzhovBasilica.java
@@ -37,7 +37,7 @@ public class OrzhovBasilica extends mage.sets.guildpact.OrzhovBasilica {
 
     public OrzhovBasilica(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OrzhovCluestone.java b/Mage.Sets/src/mage/sets/commander2015/OrzhovCluestone.java
index 0849f9dfee..c3836ed4cf 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OrzhovCluestone.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OrzhovCluestone.java
@@ -37,7 +37,7 @@ public class OrzhovCluestone extends mage.sets.dragonsmaze.OrzhovCluestone {
 
     public OrzhovCluestone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OrzhovGuildgate.java b/Mage.Sets/src/mage/sets/commander2015/OrzhovGuildgate.java
index ecbb8a3628..9446ccdf0b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OrzhovGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OrzhovGuildgate.java
@@ -37,7 +37,7 @@ public class OrzhovGuildgate extends mage.sets.gatecrash.OrzhovGuildgate {
 
     public OrzhovGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OrzhovSignet.java b/Mage.Sets/src/mage/sets/commander2015/OrzhovSignet.java
index 50ac955686..482b5db72b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OrzhovSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OrzhovSignet.java
@@ -37,7 +37,7 @@ public class OrzhovSignet extends mage.sets.guildpact.OrzhovSignet {
 
     public OrzhovSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Overrun.java b/Mage.Sets/src/mage/sets/commander2015/Overrun.java
index cb335fa682..3c60187208 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Overrun.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/OverwhelmingStampede.java b/Mage.Sets/src/mage/sets/commander2015/OverwhelmingStampede.java
index 83b92aa774..06bf248a46 100644
--- a/Mage.Sets/src/mage/sets/commander2015/OverwhelmingStampede.java
+++ b/Mage.Sets/src/mage/sets/commander2015/OverwhelmingStampede.java
@@ -37,7 +37,7 @@ public class OverwhelmingStampede extends mage.sets.magic2011.OverwhelmingStampe
 
     public OverwhelmingStampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PatagiaViper.java b/Mage.Sets/src/mage/sets/commander2015/PatagiaViper.java
index 1a4949fe0b..a31e4b2c4e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PatagiaViper.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PatagiaViper.java
@@ -37,7 +37,7 @@ public class PatagiaViper extends mage.sets.dissension.PatagiaViper {
 
     public PatagiaViper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PhyrexianArena.java b/Mage.Sets/src/mage/sets/commander2015/PhyrexianArena.java
index 5d56aca512..a36235d976 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PhyrexianArena.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PhyrexianArena.java
@@ -37,7 +37,7 @@ public class PhyrexianArena extends mage.sets.apocalypse.PhyrexianArena {
 
     public PhyrexianArena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/commander2015/PhyrexianPlaguelord.java
index 07d62c005f..556559db8c 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PhyrexianPlaguelord.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PhyrexianPlaguelord.java
@@ -37,7 +37,7 @@ public class PhyrexianPlaguelord extends mage.sets.urzaslegacy.PhyrexianPlaguelo
 
     public PhyrexianPlaguelord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PhyrexianRager.java b/Mage.Sets/src/mage/sets/commander2015/PhyrexianRager.java
index c7bbc39f9b..90ad20222e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PhyrexianRager.java
@@ -37,7 +37,7 @@ public class PhyrexianRager extends mage.sets.tenthedition.PhyrexianRager {
 
     public PhyrexianRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PhyrexianReclamation.java b/Mage.Sets/src/mage/sets/commander2015/PhyrexianReclamation.java
index 09c579380e..374d950ddb 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PhyrexianReclamation.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PhyrexianReclamation.java
@@ -37,7 +37,7 @@ public class PhyrexianReclamation extends mage.sets.urzaslegacy.PhyrexianReclama
 
     public PhyrexianReclamation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Plaxmanta.java b/Mage.Sets/src/mage/sets/commander2015/Plaxmanta.java
index 1526d4e5c6..642599c851 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Plaxmanta.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Plaxmanta.java
@@ -37,7 +37,7 @@ public class Plaxmanta extends mage.sets.dissension.Plaxmanta {
 
     public Plaxmanta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PollutedMire.java b/Mage.Sets/src/mage/sets/commander2015/PollutedMire.java
index 558092f2ec..24bc260210 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PollutedMire.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PollutedMire.java
@@ -37,7 +37,7 @@ public class PollutedMire extends mage.sets.urzassaga.PollutedMire {
 
     public PollutedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Preordain.java b/Mage.Sets/src/mage/sets/commander2015/Preordain.java
index 0bbe13d95f..9f38ec5a15 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Preordain.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Preordain.java
@@ -37,7 +37,7 @@ public class Preordain extends mage.sets.magic2011.Preordain {
 
     public Preordain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PrimalGrowth.java b/Mage.Sets/src/mage/sets/commander2015/PrimalGrowth.java
index 67fafd594a..5933daf4fd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PrimalGrowth.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PrimalGrowth.java
@@ -37,7 +37,7 @@ public class PrimalGrowth extends mage.sets.planeshift.PrimalGrowth {
 
     public PrimalGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PrimeSpeakerZegana.java b/Mage.Sets/src/mage/sets/commander2015/PrimeSpeakerZegana.java
index df10f93372..66c337be40 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PrimeSpeakerZegana.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PrimeSpeakerZegana.java
@@ -37,7 +37,7 @@ public class PrimeSpeakerZegana extends mage.sets.gatecrash.PrimeSpeakerZegana {
 
     public PrimeSpeakerZegana(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PropheticBolt.java b/Mage.Sets/src/mage/sets/commander2015/PropheticBolt.java
index bd9a87ca73..02df5b5236 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PropheticBolt.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PropheticBolt.java
@@ -37,7 +37,7 @@ public class PropheticBolt extends mage.sets.commander.PropheticBolt {
 
     public PropheticBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/PsychosisCrawler.java b/Mage.Sets/src/mage/sets/commander2015/PsychosisCrawler.java
index 745fa7cdfa..512fb1ec99 100644
--- a/Mage.Sets/src/mage/sets/commander2015/PsychosisCrawler.java
+++ b/Mage.Sets/src/mage/sets/commander2015/PsychosisCrawler.java
@@ -37,7 +37,7 @@ public class PsychosisCrawler extends mage.sets.mirrodinbesieged.PsychosisCrawle
 
     public PsychosisCrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Putrefy.java b/Mage.Sets/src/mage/sets/commander2015/Putrefy.java
index b2f063a6f0..037c3dba9c 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Putrefy.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Putrefy.java
@@ -37,7 +37,7 @@ public class Putrefy extends mage.sets.ravnica.Putrefy {
 
     public Putrefy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/RampantGrowth.java b/Mage.Sets/src/mage/sets/commander2015/RampantGrowth.java
index 2905ac935b..34fda98624 100644
--- a/Mage.Sets/src/mage/sets/commander2015/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/commander2015/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/RapidHybridization.java b/Mage.Sets/src/mage/sets/commander2015/RapidHybridization.java
index 8a781f0716..a0c4088de7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/RapidHybridization.java
+++ b/Mage.Sets/src/mage/sets/commander2015/RapidHybridization.java
@@ -37,7 +37,7 @@ public class RapidHybridization extends mage.sets.gatecrash.RapidHybridization {
 
     public RapidHybridization(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ReinsOfPower.java b/Mage.Sets/src/mage/sets/commander2015/ReinsOfPower.java
index 60611b63ea..ff319f77bd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ReinsOfPower.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ReinsOfPower.java
@@ -37,7 +37,7 @@ public class ReinsOfPower extends mage.sets.stronghold.ReinsOfPower {
 
     public ReinsOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ReliquaryTower.java b/Mage.Sets/src/mage/sets/commander2015/ReliquaryTower.java
index b9590f5136..393cedde6e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ReliquaryTower.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ReliquaryTower.java
@@ -37,7 +37,7 @@ public class ReliquaryTower extends mage.sets.conflux.ReliquaryTower {
 
     public ReliquaryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Repeal.java b/Mage.Sets/src/mage/sets/commander2015/Repeal.java
index cb707e76bf..6c3537a188 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Repeal.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Repeal.java
@@ -37,7 +37,7 @@ public class Repeal extends mage.sets.guildpact.Repeal {
 
     public Repeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/commander2015/RiseFromTheGrave.java
index 8ff6e8908b..a7623d4800 100644
--- a/Mage.Sets/src/mage/sets/commander2015/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/commander2015/RiseFromTheGrave.java
@@ -37,7 +37,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/RiteOfReplication.java b/Mage.Sets/src/mage/sets/commander2015/RiteOfReplication.java
index 59d33de763..a3f2a48d94 100644
--- a/Mage.Sets/src/mage/sets/commander2015/RiteOfReplication.java
+++ b/Mage.Sets/src/mage/sets/commander2015/RiteOfReplication.java
@@ -37,7 +37,7 @@ public class RiteOfReplication extends mage.sets.zendikar.RiteOfReplication {
 
     public RiteOfReplication(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/RoguesPassage.java b/Mage.Sets/src/mage/sets/commander2015/RoguesPassage.java
index 021d39a08a..2e40e59daf 100644
--- a/Mage.Sets/src/mage/sets/commander2015/RoguesPassage.java
+++ b/Mage.Sets/src/mage/sets/commander2015/RoguesPassage.java
@@ -37,7 +37,7 @@ public class RoguesPassage extends mage.sets.returntoravnica.RoguesPassage {
 
     public RoguesPassage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/commander2015/SakuraTribeElder.java
index c291e2e14f..778b572706 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SakuraTribeElder.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SakuraTribeElder.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder extends mage.sets.championsofkamigawa.SakuraTribeE
 
     public SakuraTribeElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SatyrWayfinder.java b/Mage.Sets/src/mage/sets/commander2015/SatyrWayfinder.java
index 61aebcfce3..8d2ae25fdd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SatyrWayfinder.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SatyrWayfinder.java
@@ -37,7 +37,7 @@ public class SatyrWayfinder extends mage.sets.bornofthegods.SatyrWayfinder {
 
     public SatyrWayfinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ScouredBarrens.java b/Mage.Sets/src/mage/sets/commander2015/ScouredBarrens.java
index 3ffe6f59bf..7b6fa11bbc 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ScouredBarrens.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ScouredBarrens.java
@@ -37,7 +37,7 @@ public class ScouredBarrens extends mage.sets.khansoftarkir.ScouredBarrens {
 
     public ScouredBarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SealOfCleansing.java b/Mage.Sets/src/mage/sets/commander2015/SealOfCleansing.java
index 244feeb52a..773a611eaa 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SealOfCleansing.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SealOfCleansing.java
@@ -37,7 +37,7 @@ public class SealOfCleansing extends mage.sets.nemesis.SealOfCleansing {
 
     public SealOfCleansing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SealOfDoom.java b/Mage.Sets/src/mage/sets/commander2015/SealOfDoom.java
index 5012cadab1..7ad5bc0c90 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SealOfDoom.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SealOfDoom.java
@@ -37,7 +37,7 @@ public class SealOfDoom extends mage.sets.dissension.SealOfDoom {
 
     public SealOfDoom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SecludedSteppe.java b/Mage.Sets/src/mage/sets/commander2015/SecludedSteppe.java
index ad46e9f008..2bd6d7d7b3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SeersSundial.java b/Mage.Sets/src/mage/sets/commander2015/SeersSundial.java
index 42c73d2a69..195b8d2c7d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SeersSundial.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SeersSundial.java
@@ -37,7 +37,7 @@ public class SeersSundial extends mage.sets.worldwake.SeersSundial {
 
     public SeersSundial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SeverTheBloodline.java b/Mage.Sets/src/mage/sets/commander2015/SeverTheBloodline.java
index 74b87eef06..6753b5604f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SeverTheBloodline.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SeverTheBloodline.java
@@ -37,7 +37,7 @@ public class SeverTheBloodline extends mage.sets.innistrad.SeverTheBloodline {
 
     public SeverTheBloodline(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Shriekmaw.java b/Mage.Sets/src/mage/sets/commander2015/Shriekmaw.java
index 025aad0dbf..cac9de4fca 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Shriekmaw.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Shriekmaw.java
@@ -37,7 +37,7 @@ public class Shriekmaw extends mage.sets.commander.Shriekmaw {
 
     public Shriekmaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/commander2015/SigilOfTheEmptyThrone.java
index c78877b3f8..88b75a7f0f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SigilOfTheEmptyThrone.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SigilOfTheEmptyThrone.java
@@ -37,7 +37,7 @@ public class SigilOfTheEmptyThrone extends mage.sets.conflux.SigilOfTheEmptyThro
 
     public SigilOfTheEmptyThrone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SilentSentinel.java b/Mage.Sets/src/mage/sets/commander2015/SilentSentinel.java
index d608fe628c..5665ab8bdb 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SilentSentinel.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SilentSentinel.java
@@ -37,7 +37,7 @@ public class SilentSentinel extends mage.sets.bornofthegods.SilentSentinel {
 
     public SilentSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SimicGrowthChamber.java b/Mage.Sets/src/mage/sets/commander2015/SimicGrowthChamber.java
index ef06b1b9f0..c50de3602d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SimicGrowthChamber.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SimicGrowthChamber.java
@@ -37,7 +37,7 @@ public class SimicGrowthChamber extends mage.sets.dissension.SimicGrowthChamber
 
     public SimicGrowthChamber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SimicGuildgate.java b/Mage.Sets/src/mage/sets/commander2015/SimicGuildgate.java
index 254b864fcb..700addc549 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SimicGuildgate.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SimicGuildgate.java
@@ -37,7 +37,7 @@ public class SimicGuildgate extends mage.sets.gatecrash.SimicGuildgate {
 
     public SimicGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SimicKeyrune.java b/Mage.Sets/src/mage/sets/commander2015/SimicKeyrune.java
index f1f1b75b73..4b4aca45c8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SimicKeyrune.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SimicKeyrune.java
@@ -37,7 +37,7 @@ public class SimicKeyrune extends mage.sets.gatecrash.SimicKeyrune {
 
     public SimicKeyrune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SimicSignet.java b/Mage.Sets/src/mage/sets/commander2015/SimicSignet.java
index 771152803e..ea6a2b7adc 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SimicSignet.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SimicSignet.java
@@ -37,7 +37,7 @@ public class SimicSignet extends mage.sets.dissension.SimicSignet {
 
     public SimicSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Skullclamp.java b/Mage.Sets/src/mage/sets/commander2015/Skullclamp.java
index 88b37bc159..38f87570b8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Skullclamp.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Skullclamp.java
@@ -37,7 +37,7 @@ public class Skullclamp extends mage.sets.darksteel.Skullclamp {
 
     public Skullclamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Sleep.java b/Mage.Sets/src/mage/sets/commander2015/Sleep.java
index 00425abf8a..125bbe55e9 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Sleep.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Sleep.java
@@ -37,7 +37,7 @@ public class Sleep extends mage.sets.magic2010.Sleep {
 
     public Sleep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SlipperyKarst.java b/Mage.Sets/src/mage/sets/commander2015/SlipperyKarst.java
index c1db1cdc6c..cdcd68a0f8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SlipperyKarst.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SlipperyKarst.java
@@ -37,7 +37,7 @@ public class SlipperyKarst extends mage.sets.urzassaga.SlipperyKarst {
 
     public SlipperyKarst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SmolderingCrater.java b/Mage.Sets/src/mage/sets/commander2015/SmolderingCrater.java
index f8f6dac90b..3236c4ebe2 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SmolderingCrater.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SmolderingCrater.java
@@ -37,7 +37,7 @@ public class SmolderingCrater extends mage.sets.urzassaga.SmolderingCrater {
 
     public SmolderingCrater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Snakeform.java b/Mage.Sets/src/mage/sets/commander2015/Snakeform.java
index 1d9be22ebf..302f947692 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Snakeform.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Snakeform.java
@@ -37,7 +37,7 @@ public class Snakeform extends mage.sets.eventide.Snakeform {
 
     public Snakeform(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SolRing.java b/Mage.Sets/src/mage/sets/commander2015/SolRing.java
index e1f03fe39f..01791998b9 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SolRing.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/commander2015/SolemnSimulacrum.java
index c09472ce0e..4227c85e89 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SolemnSimulacrum.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SolemnSimulacrum.java
@@ -37,7 +37,7 @@ public class SolemnSimulacrum extends mage.sets.magic2012.SolemnSimulacrum {
 
     public SolemnSimulacrum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SpiderSpawning.java b/Mage.Sets/src/mage/sets/commander2015/SpiderSpawning.java
index d91b5c51fe..7a13dc8fac 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SpiderSpawning.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SpiderSpawning.java
@@ -37,7 +37,7 @@ public class SpiderSpawning extends mage.sets.innistrad.SpiderSpawning {
 
     public SpiderSpawning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SpinerockKnoll.java b/Mage.Sets/src/mage/sets/commander2015/SpinerockKnoll.java
index 979edfc61a..3325ec7ff7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SpinerockKnoll.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SpinerockKnoll.java
@@ -37,7 +37,7 @@ public class SpinerockKnoll extends mage.sets.lorwyn.SpinerockKnoll {
 
     public SpinerockKnoll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/StaffOfNin.java b/Mage.Sets/src/mage/sets/commander2015/StaffOfNin.java
index c3a33f0467..a2228b2fbf 100644
--- a/Mage.Sets/src/mage/sets/commander2015/StaffOfNin.java
+++ b/Mage.Sets/src/mage/sets/commander2015/StaffOfNin.java
@@ -37,7 +37,7 @@ public class StaffOfNin extends mage.sets.magic2013.StaffOfNin {
 
     public StaffOfNin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SteamAugury.java b/Mage.Sets/src/mage/sets/commander2015/SteamAugury.java
index e8a9b3bade..4a57dcdc29 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SteamAugury.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SteamAugury.java
@@ -37,7 +37,7 @@ public class SteamAugury extends mage.sets.theros.SteamAugury {
 
     public SteamAugury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/StingerflingSpider.java b/Mage.Sets/src/mage/sets/commander2015/StingerflingSpider.java
index c4672e6683..c89a061b93 100644
--- a/Mage.Sets/src/mage/sets/commander2015/StingerflingSpider.java
+++ b/Mage.Sets/src/mage/sets/commander2015/StingerflingSpider.java
@@ -37,7 +37,7 @@ public class StingerflingSpider extends mage.sets.magic2012.StingerflingSpider {
 
     public StingerflingSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/StinkdrinkerDaredevil.java b/Mage.Sets/src/mage/sets/commander2015/StinkdrinkerDaredevil.java
index 9e8dacaa58..77c9d72ef1 100644
--- a/Mage.Sets/src/mage/sets/commander2015/StinkdrinkerDaredevil.java
+++ b/Mage.Sets/src/mage/sets/commander2015/StinkdrinkerDaredevil.java
@@ -37,7 +37,7 @@ public class StinkdrinkerDaredevil extends mage.sets.lorwyn.StinkdrinkerDaredevi
 
     public StinkdrinkerDaredevil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/StolenGoods.java b/Mage.Sets/src/mage/sets/commander2015/StolenGoods.java
index a72735aaf6..814a2698b0 100644
--- a/Mage.Sets/src/mage/sets/commander2015/StolenGoods.java
+++ b/Mage.Sets/src/mage/sets/commander2015/StolenGoods.java
@@ -37,7 +37,7 @@ public class StolenGoods extends mage.sets.avacynrestored.StolenGoods {
 
     public StolenGoods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/StoneshockGiant.java b/Mage.Sets/src/mage/sets/commander2015/StoneshockGiant.java
index fdf6e9245c..fba11af850 100644
--- a/Mage.Sets/src/mage/sets/commander2015/StoneshockGiant.java
+++ b/Mage.Sets/src/mage/sets/commander2015/StoneshockGiant.java
@@ -37,7 +37,7 @@ public class StoneshockGiant extends mage.sets.theros.StoneshockGiant {
 
     public StoneshockGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/commander2015/StrokeOfGenius.java
index 79953c02ae..3df2da7d6b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/StrokeOfGenius.java
+++ b/Mage.Sets/src/mage/sets/commander2015/StrokeOfGenius.java
@@ -37,7 +37,7 @@ public class StrokeOfGenius extends mage.sets.urzassaga.StrokeOfGenius {
 
     public StrokeOfGenius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SunTitan.java b/Mage.Sets/src/mage/sets/commander2015/SunTitan.java
index 1e35975952..5dfe19501a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SunTitan.java
@@ -37,7 +37,7 @@ public class SunTitan extends mage.sets.magic2011.SunTitan {
 
     public SunTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SunriseSovereign.java b/Mage.Sets/src/mage/sets/commander2015/SunriseSovereign.java
index bd0794d0e6..e2d56741cd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SunriseSovereign.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SunriseSovereign.java
@@ -37,7 +37,7 @@ public class SunriseSovereign extends mage.sets.lorwyn.SunriseSovereign {
 
     public SunriseSovereign(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SwiftfootBoots.java b/Mage.Sets/src/mage/sets/commander2015/SwiftfootBoots.java
index de7e11c4be..e06ec70060 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SwiftfootBoots.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SwiftfootBoots.java
@@ -37,7 +37,7 @@ public class SwiftfootBoots extends mage.sets.magic2012.SwiftfootBoots {
 
     public SwiftfootBoots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SwiftwaterCliffs.java b/Mage.Sets/src/mage/sets/commander2015/SwiftwaterCliffs.java
index 6ca4f2d701..8c1c459d9e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SwiftwaterCliffs.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SwiftwaterCliffs.java
@@ -37,7 +37,7 @@ public class SwiftwaterCliffs extends mage.sets.khansoftarkir.SwiftwaterCliffs {
 
     public SwiftwaterCliffs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/SwordOfVengeance.java b/Mage.Sets/src/mage/sets/commander2015/SwordOfVengeance.java
index b162c58e41..d95f294865 100644
--- a/Mage.Sets/src/mage/sets/commander2015/SwordOfVengeance.java
+++ b/Mage.Sets/src/mage/sets/commander2015/SwordOfVengeance.java
@@ -37,7 +37,7 @@ public class SwordOfVengeance extends mage.sets.magic2011.SwordOfVengeance {
 
     public SwordOfVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TaintedField.java b/Mage.Sets/src/mage/sets/commander2015/TaintedField.java
index 80dc39b9fd..ffc477806d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TaintedField.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TaintedField.java
@@ -37,7 +37,7 @@ public class TaintedField extends mage.sets.torment.TaintedField {
 
     public TaintedField(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TaintedWood.java b/Mage.Sets/src/mage/sets/commander2015/TaintedWood.java
index 7a8e5798e4..cdc7023e89 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TaintedWood.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TaintedWood.java
@@ -37,7 +37,7 @@ public class TaintedWood extends mage.sets.torment.TaintedWood {
 
     public TaintedWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TalrandSkySummoner.java b/Mage.Sets/src/mage/sets/commander2015/TalrandSkySummoner.java
index 7e67d277f5..964bce9231 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TalrandSkySummoner.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TalrandSkySummoner.java
@@ -37,7 +37,7 @@ public class TalrandSkySummoner extends mage.sets.magic2013.TalrandSkySummoner {
 
     public TalrandSkySummoner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TaureanMauler.java b/Mage.Sets/src/mage/sets/commander2015/TaureanMauler.java
index 3647d880d9..329309fce7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TaureanMauler.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TaureanMauler.java
@@ -37,7 +37,7 @@ public class TaureanMauler extends mage.sets.planechase.TaureanMauler {
 
     public TaureanMauler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TempleOfTheFalseGod.java b/Mage.Sets/src/mage/sets/commander2015/TempleOfTheFalseGod.java
index d981aea81d..aefaa8a64a 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TempleOfTheFalseGod.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TempleOfTheFalseGod.java
@@ -37,7 +37,7 @@ public class TempleOfTheFalseGod extends mage.sets.commander2013.TempleOfTheFals
 
     public TempleOfTheFalseGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Terastodon.java b/Mage.Sets/src/mage/sets/commander2015/Terastodon.java
index b63951115b..32b01a819e 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Terastodon.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Terastodon.java
@@ -37,7 +37,7 @@ public class Terastodon extends mage.sets.worldwake.Terastodon {
 
     public Terastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/commander2015/TerramorphicExpanse.java
index d3e55e2291..ed6e62bba6 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TeysaEnvoyOfGhosts.java b/Mage.Sets/src/mage/sets/commander2015/TeysaEnvoyOfGhosts.java
index c912353806..e96cd1c7d0 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TeysaEnvoyOfGhosts.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TeysaEnvoyOfGhosts.java
@@ -37,7 +37,7 @@ public class TeysaEnvoyOfGhosts extends mage.sets.dragonsmaze.TeysaEnvoyOfGhosts
 
     public TeysaEnvoyOfGhosts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TheloniteHermit.java b/Mage.Sets/src/mage/sets/commander2015/TheloniteHermit.java
index 44bc0e0304..1ded7056fd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TheloniteHermit.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TheloniteHermit.java
@@ -37,7 +37,7 @@ public class TheloniteHermit extends mage.sets.timespiral.TheloniteHermit {
 
     public TheloniteHermit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ThornwoodFalls.java b/Mage.Sets/src/mage/sets/commander2015/ThornwoodFalls.java
index 4c32317d1a..a0fc1124de 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ThornwoodFalls.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ThornwoodFalls.java
@@ -37,7 +37,7 @@ public class ThornwoodFalls extends mage.sets.khansoftarkir.ThornwoodFalls {
 
     public ThornwoodFalls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ThoughtReflection.java b/Mage.Sets/src/mage/sets/commander2015/ThoughtReflection.java
index 16f50b59ca..d6b065ce7d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ThoughtReflection.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ThoughtReflection.java
@@ -37,7 +37,7 @@ public class ThoughtReflection extends mage.sets.shadowmoor.ThoughtReflection {
 
     public ThoughtReflection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ThundercloudShaman.java b/Mage.Sets/src/mage/sets/commander2015/ThundercloudShaman.java
index 9de101c4d2..6e2a8226a9 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ThundercloudShaman.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ThundercloudShaman.java
@@ -37,7 +37,7 @@ public class ThundercloudShaman extends mage.sets.modernmasters.ThundercloudSham
 
     public ThundercloudShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TreasuryThrull.java b/Mage.Sets/src/mage/sets/commander2015/TreasuryThrull.java
index 259f0d81ed..86cffb0543 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TreasuryThrull.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TreasuryThrull.java
@@ -37,7 +37,7 @@ public class TreasuryThrull extends mage.sets.gatecrash.TreasuryThrull {
 
     public TreasuryThrull(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TributeToTheWild.java b/Mage.Sets/src/mage/sets/commander2015/TributeToTheWild.java
index ab082b37ef..e4010306b8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TributeToTheWild.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TributeToTheWild.java
@@ -37,7 +37,7 @@ public class TributeToTheWild extends mage.sets.commander.TributeToTheWild {
 
     public TributeToTheWild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/TrygonPredator.java b/Mage.Sets/src/mage/sets/commander2015/TrygonPredator.java
index f1f1b43982..dbf3ba155b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/TrygonPredator.java
+++ b/Mage.Sets/src/mage/sets/commander2015/TrygonPredator.java
@@ -37,7 +37,7 @@ public class TrygonPredator extends mage.sets.modernmasters.TrygonPredator {
 
     public TrygonPredator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/UnderworldCoinsmith.java b/Mage.Sets/src/mage/sets/commander2015/UnderworldCoinsmith.java
index 28e3ee5185..3c4feb5302 100644
--- a/Mage.Sets/src/mage/sets/commander2015/UnderworldCoinsmith.java
+++ b/Mage.Sets/src/mage/sets/commander2015/UnderworldCoinsmith.java
@@ -37,7 +37,7 @@ public class UnderworldCoinsmith extends mage.sets.journeyintonyx.UnderworldCoin
 
     public UnderworldCoinsmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/UnderworldConnections.java b/Mage.Sets/src/mage/sets/commander2015/UnderworldConnections.java
index fc9588828f..f97ebdc37f 100644
--- a/Mage.Sets/src/mage/sets/commander2015/UnderworldConnections.java
+++ b/Mage.Sets/src/mage/sets/commander2015/UnderworldConnections.java
@@ -37,7 +37,7 @@ public class UnderworldConnections extends mage.sets.returntoravnica.UnderworldC
 
     public UnderworldConnections(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/UrzasIncubator.java b/Mage.Sets/src/mage/sets/commander2015/UrzasIncubator.java
index 3dc8bf90d6..1c65d09dc4 100644
--- a/Mage.Sets/src/mage/sets/commander2015/UrzasIncubator.java
+++ b/Mage.Sets/src/mage/sets/commander2015/UrzasIncubator.java
@@ -37,7 +37,7 @@ public class UrzasIncubator extends mage.sets.urzasdestiny.UrzasIncubator {
 
     public UrzasIncubator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/UrzasRage.java b/Mage.Sets/src/mage/sets/commander2015/UrzasRage.java
index bfd24ac640..d78a48e346 100644
--- a/Mage.Sets/src/mage/sets/commander2015/UrzasRage.java
+++ b/Mage.Sets/src/mage/sets/commander2015/UrzasRage.java
@@ -38,7 +38,7 @@ public class UrzasRage extends mage.sets.phyrexiavsthecoalition.UrzasRage {
 
     public UrzasRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "C15";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/commander2015/Vandalblast.java b/Mage.Sets/src/mage/sets/commander2015/Vandalblast.java
index 5d4f5905b8..40ea42bed3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Vandalblast.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Vandalblast.java
@@ -37,7 +37,7 @@ public class Vandalblast extends mage.sets.returntoravnica.Vandalblast {
 
     public Vandalblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VerdantForce.java b/Mage.Sets/src/mage/sets/commander2015/VerdantForce.java
index fa57889476..4b0bd5d48d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VerdantForce.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VerdantForce.java
@@ -37,7 +37,7 @@ public class VerdantForce extends mage.sets.tempest.VerdantForce {
 
     public VerdantForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Victimize.java b/Mage.Sets/src/mage/sets/commander2015/Victimize.java
index a0f2bee200..16ab5fbe25 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Victimize.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Victimize.java
@@ -37,7 +37,7 @@ public class Victimize extends mage.sets.conspiracy.Victimize {
 
     public Victimize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VictorysHerald.java b/Mage.Sets/src/mage/sets/commander2015/VictorysHerald.java
index 6d6de19b30..844c9191a8 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VictorysHerald.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VictorysHerald.java
@@ -37,7 +37,7 @@ public class VictorysHerald extends mage.sets.mirrodinbesieged.VictorysHerald {
 
     public VictorysHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ViridianEmissary.java b/Mage.Sets/src/mage/sets/commander2015/ViridianEmissary.java
index b053b67fa3..6f10495d11 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ViridianEmissary.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ViridianEmissary.java
@@ -37,7 +37,7 @@ public class ViridianEmissary extends mage.sets.mirrodinbesieged.ViridianEmissar
 
     public ViridianEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ViridianShaman.java b/Mage.Sets/src/mage/sets/commander2015/ViridianShaman.java
index 786f130155..5271b741ed 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ViridianShaman.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ViridianShaman.java
@@ -37,7 +37,7 @@ public class ViridianShaman extends mage.sets.tenthedition.ViridianShaman {
 
     public ViridianShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ViridianZealot.java b/Mage.Sets/src/mage/sets/commander2015/ViridianZealot.java
index c588747531..0753d17c68 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ViridianZealot.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ViridianZealot.java
@@ -37,7 +37,7 @@ public class ViridianZealot extends mage.sets.darksteel.ViridianZealot {
 
     public ViridianZealot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VividCrag.java b/Mage.Sets/src/mage/sets/commander2015/VividCrag.java
index af972132ec..0548e488bc 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VividCrag.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VividCrag.java
@@ -37,7 +37,7 @@ public class VividCrag extends mage.sets.lorwyn.VividCrag {
 
     public VividCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VividCreek.java b/Mage.Sets/src/mage/sets/commander2015/VividCreek.java
index 5f40f37d31..7be52bec76 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VividCreek.java
@@ -37,7 +37,7 @@ public class VividCreek extends mage.sets.lorwyn.VividCreek {
 
     public VividCreek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VividGrove.java b/Mage.Sets/src/mage/sets/commander2015/VividGrove.java
index df5490213e..00b1a0a4f3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VividGrove.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VividGrove.java
@@ -37,7 +37,7 @@ public class VividGrove extends mage.sets.lorwyn.VividGrove {
 
     public VividGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VividMarsh.java b/Mage.Sets/src/mage/sets/commander2015/VividMarsh.java
index 84a2b6309f..9682365576 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VividMarsh.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VividMarsh.java
@@ -37,7 +37,7 @@ public class VividMarsh extends mage.sets.lorwyn.VividMarsh {
 
     public VividMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VividMeadow.java b/Mage.Sets/src/mage/sets/commander2015/VividMeadow.java
index f4261c57aa..075d770667 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VividMeadow.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VividMeadow.java
@@ -37,7 +37,7 @@ public class VividMeadow extends mage.sets.lorwyn.VividMeadow {
 
     public VividMeadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VowOfDuty.java b/Mage.Sets/src/mage/sets/commander2015/VowOfDuty.java
index 77bc9a7d50..d6b0abe204 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VowOfDuty.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VowOfDuty.java
@@ -37,7 +37,7 @@ public class VowOfDuty extends mage.sets.commander.VowOfDuty {
 
     public VowOfDuty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VowOfMalice.java b/Mage.Sets/src/mage/sets/commander2015/VowOfMalice.java
index 0b95284416..9a3464c2ae 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VowOfMalice.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VowOfMalice.java
@@ -37,7 +37,7 @@ public class VowOfMalice extends mage.sets.commander.VowOfMalice {
 
     public VowOfMalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/VulturousZombie.java b/Mage.Sets/src/mage/sets/commander2015/VulturousZombie.java
index a6676ea2c8..d1879d5f5d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/VulturousZombie.java
+++ b/Mage.Sets/src/mage/sets/commander2015/VulturousZombie.java
@@ -37,7 +37,7 @@ public class VulturousZombie extends mage.sets.commander.VulturousZombie {
 
     public VulturousZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/commander2015/WallOfBlossoms.java
index 49cf49d3a9..bf2b9c1640 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WallOfBlossoms.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WallOfBlossoms.java
@@ -37,7 +37,7 @@ public class WallOfBlossoms extends mage.sets.stronghold.WallOfBlossoms {
 
     public WallOfBlossoms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WarstormSurge.java b/Mage.Sets/src/mage/sets/commander2015/WarstormSurge.java
index 8783c69380..d1cf7ccc93 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WarstormSurge.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WarstormSurge.java
@@ -37,7 +37,7 @@ public class WarstormSurge extends mage.sets.magic2012.WarstormSurge {
 
     public WarstormSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WayfarersBauble.java b/Mage.Sets/src/mage/sets/commander2015/WayfarersBauble.java
index 9d3dcccc2a..ee81288398 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WayfarersBauble.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WayfarersBauble.java
@@ -37,7 +37,7 @@ public class WayfarersBauble extends mage.sets.commander2013.WayfarersBauble {
 
     public WayfarersBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WindScarredCrag.java b/Mage.Sets/src/mage/sets/commander2015/WindScarredCrag.java
index 36eefa8c03..b0e060e7dd 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WindScarredCrag.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WindScarredCrag.java
@@ -37,7 +37,7 @@ public class WindScarredCrag extends mage.sets.khansoftarkir.WindScarredCrag {
 
     public WindScarredCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/Windfall.java b/Mage.Sets/src/mage/sets/commander2015/Windfall.java
index 33003e65c5..33fd97ab6b 100644
--- a/Mage.Sets/src/mage/sets/commander2015/Windfall.java
+++ b/Mage.Sets/src/mage/sets/commander2015/Windfall.java
@@ -37,7 +37,7 @@ public class Windfall extends mage.sets.urzassaga.Windfall {
 
     public Windfall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WistfulSelkie.java b/Mage.Sets/src/mage/sets/commander2015/WistfulSelkie.java
index a6b80795e1..1db372c88d 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WistfulSelkie.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WistfulSelkie.java
@@ -37,7 +37,7 @@ public class WistfulSelkie extends mage.sets.eventide.WistfulSelkie {
 
     public WistfulSelkie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WoodElves.java b/Mage.Sets/src/mage/sets/commander2015/WoodElves.java
index 9f1cfb554e..2913a02308 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WordOfSeizing.java b/Mage.Sets/src/mage/sets/commander2015/WordOfSeizing.java
index eafa253301..2e39f95ad3 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WordOfSeizing.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WordOfSeizing.java
@@ -37,7 +37,7 @@ public class WordOfSeizing extends mage.sets.commander2014.WordOfSeizing {
 
     public WordOfSeizing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/WornPowerstone.java b/Mage.Sets/src/mage/sets/commander2015/WornPowerstone.java
index a4cc625b82..d8cddf25d7 100644
--- a/Mage.Sets/src/mage/sets/commander2015/WornPowerstone.java
+++ b/Mage.Sets/src/mage/sets/commander2015/WornPowerstone.java
@@ -37,7 +37,7 @@ public class WornPowerstone extends mage.sets.urzassaga.WornPowerstone {
 
     public WornPowerstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commander2015/ZoeticCavern.java b/Mage.Sets/src/mage/sets/commander2015/ZoeticCavern.java
index 745eb97f48..4989b06b52 100644
--- a/Mage.Sets/src/mage/sets/commander2015/ZoeticCavern.java
+++ b/Mage.Sets/src/mage/sets/commander2015/ZoeticCavern.java
@@ -37,7 +37,7 @@ public class ZoeticCavern extends mage.sets.commander2014.ZoeticCavern {
 
     public ZoeticCavern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "C15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/ChaosWarp.java b/Mage.Sets/src/mage/sets/commandersarsenal/ChaosWarp.java
index a22bfaae0d..5ec634fc64 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/ChaosWarp.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/ChaosWarp.java
@@ -38,7 +38,7 @@ public class ChaosWarp extends mage.sets.vintagemasters.ChaosWarp {
 
     public ChaosWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/CommandTower.java b/Mage.Sets/src/mage/sets/commandersarsenal/CommandTower.java
index 6cba89b886..440b68846b 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/CommandTower.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/CommandTower.java
@@ -37,7 +37,7 @@ public class CommandTower extends mage.sets.commander2013.CommandTower {
 
     public CommandTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "CMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/DecreeOfPain.java b/Mage.Sets/src/mage/sets/commandersarsenal/DecreeOfPain.java
index 97a2fb5818..2daaa1c323 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/DecreeOfPain.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/DecreeOfPain.java
@@ -38,7 +38,7 @@ public class DecreeOfPain extends mage.sets.commander2013.DecreeOfPain {
 
     public DecreeOfPain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/Desertion.java b/Mage.Sets/src/mage/sets/commandersarsenal/Desertion.java
index 5d17a60851..07f61fc054 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/Desertion.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/Desertion.java
@@ -38,7 +38,7 @@ public class Desertion extends mage.sets.visions.Desertion {
 
     public Desertion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/DiaochanArtfulBeauty.java b/Mage.Sets/src/mage/sets/commandersarsenal/DiaochanArtfulBeauty.java
index fc567e98c8..390a3dc496 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/DiaochanArtfulBeauty.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/DiaochanArtfulBeauty.java
@@ -38,7 +38,7 @@ public class DiaochanArtfulBeauty extends mage.sets.portalthreekingdoms.Diaochan
 
     public DiaochanArtfulBeauty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/DragonlairSpider.java b/Mage.Sets/src/mage/sets/commandersarsenal/DragonlairSpider.java
index 9dd65f1d9a..c27bbb17b0 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/DragonlairSpider.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/DragonlairSpider.java
@@ -38,7 +38,7 @@ public class DragonlairSpider extends mage.sets.planechase2012.DragonlairSpider
 
     public DragonlairSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/Duplicant.java b/Mage.Sets/src/mage/sets/commandersarsenal/Duplicant.java
index 3b155c3e56..5c9913024c 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/Duplicant.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/Duplicant.java
@@ -38,7 +38,7 @@ public class Duplicant extends mage.sets.mirrodin.Duplicant {
 
     public Duplicant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/EdricSpymasterOfTrest.java b/Mage.Sets/src/mage/sets/commandersarsenal/EdricSpymasterOfTrest.java
index c365b213e7..b315668e9c 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/EdricSpymasterOfTrest.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/EdricSpymasterOfTrest.java
@@ -38,7 +38,7 @@ public class EdricSpymasterOfTrest extends mage.sets.commander.EdricSpymasterOfT
 
     public EdricSpymasterOfTrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/KaaliaOfTheVast.java b/Mage.Sets/src/mage/sets/commandersarsenal/KaaliaOfTheVast.java
index a57e4ad69b..ea290f8021 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/KaaliaOfTheVast.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/KaaliaOfTheVast.java
@@ -38,7 +38,7 @@ public class KaaliaOfTheVast extends mage.sets.commander.KaaliaOfTheVast {
 
     public KaaliaOfTheVast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/LoyalRetainers.java b/Mage.Sets/src/mage/sets/commandersarsenal/LoyalRetainers.java
index 59b1a84175..acb6fce35d 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/LoyalRetainers.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/LoyalRetainers.java
@@ -38,7 +38,7 @@ public class LoyalRetainers extends mage.sets.portalthreekingdoms.LoyalRetainers
 
     public LoyalRetainers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/MaelstromWanderer.java b/Mage.Sets/src/mage/sets/commandersarsenal/MaelstromWanderer.java
index ceb630335d..698d765cbf 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/MaelstromWanderer.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/MaelstromWanderer.java
@@ -38,7 +38,7 @@ public class MaelstromWanderer extends mage.sets.planechase2012.MaelstromWandere
 
     public MaelstromWanderer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/MindsEye.java b/Mage.Sets/src/mage/sets/commandersarsenal/MindsEye.java
index 26de77df97..7d11ffe508 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/MindsEye.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/MindsEye.java
@@ -38,7 +38,7 @@ public class MindsEye extends mage.sets.mirrodin.MindsEye {
 
     public MindsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/MirarisWake.java b/Mage.Sets/src/mage/sets/commandersarsenal/MirarisWake.java
index 3f1f40c49c..fef803ec4e 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/MirarisWake.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/MirarisWake.java
@@ -38,7 +38,7 @@ public class MirarisWake extends mage.sets.judgment.MirarisWake {
 
     public MirarisWake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/RhysticStudy.java b/Mage.Sets/src/mage/sets/commandersarsenal/RhysticStudy.java
index 677146bba1..0b72a3560c 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/RhysticStudy.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/RhysticStudy.java
@@ -37,7 +37,7 @@ public class RhysticStudy extends mage.sets.prophecy.RhysticStudy {
 
     public RhysticStudy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "CMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/ScrollRack.java b/Mage.Sets/src/mage/sets/commandersarsenal/ScrollRack.java
index a0e6b82f54..2cf93381c7 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/ScrollRack.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/ScrollRack.java
@@ -38,7 +38,7 @@ public class ScrollRack extends mage.sets.tempest.ScrollRack {
 
     public ScrollRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/SylvanLibrary.java b/Mage.Sets/src/mage/sets/commandersarsenal/SylvanLibrary.java
index 20603b7d23..07142262bd 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/SylvanLibrary.java
@@ -38,7 +38,7 @@ public class SylvanLibrary extends mage.sets.fifthedition.SylvanLibrary {
 
     public SylvanLibrary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/TheMimeoplasm.java b/Mage.Sets/src/mage/sets/commandersarsenal/TheMimeoplasm.java
index 2cf1b45963..34e152376c 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/TheMimeoplasm.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/TheMimeoplasm.java
@@ -38,7 +38,7 @@ public class TheMimeoplasm extends mage.sets.commander.TheMimeoplasm {
 
     public TheMimeoplasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/commandersarsenal/VelaTheNightClad.java b/Mage.Sets/src/mage/sets/commandersarsenal/VelaTheNightClad.java
index 7b2e1a01f2..ef83b964e7 100644
--- a/Mage.Sets/src/mage/sets/commandersarsenal/VelaTheNightClad.java
+++ b/Mage.Sets/src/mage/sets/commandersarsenal/VelaTheNightClad.java
@@ -38,7 +38,7 @@ public class VelaTheNightClad extends mage.sets.planechase2012.VelaTheNightClad
 
     public VelaTheNightClad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "CMA";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/conflux/IgniteDisorder.java b/Mage.Sets/src/mage/sets/conflux/IgniteDisorder.java
index deea8ba08a..4bc407af4c 100644
--- a/Mage.Sets/src/mage/sets/conflux/IgniteDisorder.java
+++ b/Mage.Sets/src/mage/sets/conflux/IgniteDisorder.java
@@ -37,7 +37,7 @@ public class IgniteDisorder extends mage.sets.magic2010.IgniteDisorder {
 
     public IgniteDisorder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "CON";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conflux/Unsummon.java b/Mage.Sets/src/mage/sets/conflux/Unsummon.java
index 505747af5b..e3a4ed263e 100644
--- a/Mage.Sets/src/mage/sets/conflux/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/conflux/Unsummon.java
@@ -38,7 +38,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "CON";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conflux/WorldheartPhoenix.java b/Mage.Sets/src/mage/sets/conflux/WorldheartPhoenix.java
index 5a8a025449..07070d7268 100644
--- a/Mage.Sets/src/mage/sets/conflux/WorldheartPhoenix.java
+++ b/Mage.Sets/src/mage/sets/conflux/WorldheartPhoenix.java
@@ -38,7 +38,7 @@ public class WorldheartPhoenix extends mage.sets.modernmasters2015.WorldheartPho
 
     public WorldheartPhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "CON";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java
index b5261a942b..4d87581e8b 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java
@@ -37,7 +37,7 @@ public class AEtherTradewinds extends mage.sets.worldwake.AEtherTradewinds {
 
     public AEtherTradewinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/AirServant.java b/Mage.Sets/src/mage/sets/conspiracy/AirServant.java
index 5d85048c26..ed73f3696b 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/AirServant.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/AirServant.java
@@ -37,7 +37,7 @@ public class AirServant extends mage.sets.magic2011.AirServant {
 
     public AirServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/AjanisSunstriker.java b/Mage.Sets/src/mage/sets/conspiracy/AjanisSunstriker.java
index 3b2f98f867..c42f2b9e20 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/AjanisSunstriker.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/AjanisSunstriker.java
@@ -37,7 +37,7 @@ public class AjanisSunstriker extends mage.sets.magic2013.AjanisSunstriker {
 
     public AjanisSunstriker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/AltarOfDementia.java b/Mage.Sets/src/mage/sets/conspiracy/AltarOfDementia.java
index 9b0c707a58..8e9df11e00 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/AltarOfDementia.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/AltarOfDementia.java
@@ -37,7 +37,7 @@ public class AltarOfDementia extends mage.sets.tempest.AltarOfDementia {
 
     public AltarOfDementia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/AltarsReap.java b/Mage.Sets/src/mage/sets/conspiracy/AltarsReap.java
index 3d9c766351..67d19a361e 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/AltarsReap.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/AltarsReap.java
@@ -37,7 +37,7 @@ public class AltarsReap extends mage.sets.innistrad.AltarsReap {
 
     public AltarsReap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ApexHawks.java b/Mage.Sets/src/mage/sets/conspiracy/ApexHawks.java
index 5d7a7a0984..4641c4fa09 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ApexHawks.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ApexHawks.java
@@ -37,7 +37,7 @@ public class ApexHawks extends mage.sets.worldwake.ApexHawks {
 
     public ApexHawks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Assassinate.java b/Mage.Sets/src/mage/sets/conspiracy/Assassinate.java
index 42a4924e2a..cadb1f7054 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Assassinate.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Assassinate.java
@@ -37,7 +37,7 @@ public class Assassinate extends mage.sets.tenthedition.Assassinate {
 
     public Assassinate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/BasandraBattleSeraph.java b/Mage.Sets/src/mage/sets/conspiracy/BasandraBattleSeraph.java
index 20d52731cd..71f2b6667b 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/BasandraBattleSeraph.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/BasandraBattleSeraph.java
@@ -37,7 +37,7 @@ public class BasandraBattleSeraph extends mage.sets.commander.BasandraBattleSera
 
     public BasandraBattleSeraph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/BoldwyrIntimidator.java b/Mage.Sets/src/mage/sets/conspiracy/BoldwyrIntimidator.java
index 2ab7eb29e0..adfbc09200 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/BoldwyrIntimidator.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/BoldwyrIntimidator.java
@@ -37,7 +37,7 @@ public class BoldwyrIntimidator extends mage.sets.morningtide.BoldwyrIntimidator
 
     public BoldwyrIntimidator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/BragoKingEternal.java b/Mage.Sets/src/mage/sets/conspiracy/BragoKingEternal.java
index aed2579d41..09c45910e7 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/BragoKingEternal.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/BragoKingEternal.java
@@ -37,7 +37,7 @@ public class BragoKingEternal extends mage.sets.vintagemasters.BragoKingEternal
 
     public BragoKingEternal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Brainstorm.java b/Mage.Sets/src/mage/sets/conspiracy/Brainstorm.java
index 5c2edf92d6..d03aaaa687 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/BrimstoneVolley.java b/Mage.Sets/src/mage/sets/conspiracy/BrimstoneVolley.java
index 432eac5bc7..e95e890071 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/BrimstoneVolley.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/BrimstoneVolley.java
@@ -37,7 +37,7 @@ public class BrimstoneVolley extends mage.sets.innistrad.BrimstoneVolley {
 
     public BrimstoneVolley(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ChargingRhino.java b/Mage.Sets/src/mage/sets/conspiracy/ChargingRhino.java
index d770b3a89d..4e61a0ae37 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ChargingRhino.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ChargingRhino.java
@@ -38,7 +38,7 @@ public class ChargingRhino extends mage.sets.tempest.ChargingRhino {
 
     public ChargingRhino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ChartoothCougar.java b/Mage.Sets/src/mage/sets/conspiracy/ChartoothCougar.java
index 714e920292..e2830b792c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ChartoothCougar.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ChartoothCougar.java
@@ -37,7 +37,7 @@ public class ChartoothCougar extends mage.sets.scourge.ChartoothCougar {
 
     public ChartoothCougar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/CinderWall.java b/Mage.Sets/src/mage/sets/conspiracy/CinderWall.java
index a883b56501..5ef67a4b42 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/CinderWall.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/CinderWall.java
@@ -37,7 +37,7 @@ public class CinderWall extends mage.sets.knightsvsdragons.CinderWall {
 
     public CinderWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/CompulsiveResearch.java b/Mage.Sets/src/mage/sets/conspiracy/CompulsiveResearch.java
index 6d23e4a16a..5d1555115f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/CompulsiveResearch.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/CompulsiveResearch.java
@@ -37,7 +37,7 @@ public class CompulsiveResearch extends mage.sets.ravnica.CompulsiveResearch {
 
     public CompulsiveResearch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/CopperhornScout.java b/Mage.Sets/src/mage/sets/conspiracy/CopperhornScout.java
index abcf6c1f96..ef694c0190 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/CopperhornScout.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/CopperhornScout.java
@@ -37,7 +37,7 @@ public class CopperhornScout extends mage.sets.scarsofmirrodin.CopperhornScout {
 
     public CopperhornScout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/CouncilsJudgment.java b/Mage.Sets/src/mage/sets/conspiracy/CouncilsJudgment.java
index 14b12147e9..aa31d88756 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/CouncilsJudgment.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/CouncilsJudgment.java
@@ -37,7 +37,7 @@ public class CouncilsJudgment extends mage.sets.vintagemasters.CouncilsJudgment
 
     public CouncilsJudgment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/CourierHawk.java b/Mage.Sets/src/mage/sets/conspiracy/CourierHawk.java
index 05b777a075..1ec464dd11 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/CourierHawk.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/CourierHawk.java
@@ -37,7 +37,7 @@ public class CourierHawk extends mage.sets.ravnica.CourierHawk {
 
     public CourierHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/CrookclawTransmuter.java b/Mage.Sets/src/mage/sets/conspiracy/CrookclawTransmuter.java
index c47b8fdb32..4292401a85 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/CrookclawTransmuter.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/CrookclawTransmuter.java
@@ -37,7 +37,7 @@ public class CrookclawTransmuter extends mage.sets.timespiral.CrookclawTransmute
 
     public CrookclawTransmuter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/DacksDuplicate.java b/Mage.Sets/src/mage/sets/conspiracy/DacksDuplicate.java
index 414d9724dd..23c0379c9e 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/DacksDuplicate.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/DacksDuplicate.java
@@ -37,7 +37,7 @@ public class DacksDuplicate extends mage.sets.vintagemasters.DacksDuplicate {
 
     public DacksDuplicate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/DeathforgeShaman.java b/Mage.Sets/src/mage/sets/conspiracy/DeathforgeShaman.java
index db5da74ca3..c0df0e0628 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/DeathforgeShaman.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/DeathforgeShaman.java
@@ -37,7 +37,7 @@ public class DeathforgeShaman extends mage.sets.worldwake.DeathforgeShaman {
 
     public DeathforgeShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Deathrender.java b/Mage.Sets/src/mage/sets/conspiracy/Deathrender.java
index 80d8b94691..77699df99b 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Deathrender.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Deathrender.java
@@ -37,7 +37,7 @@ public class Deathrender extends mage.sets.lorwyn.Deathrender {
 
     public Deathrender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Decimate.java b/Mage.Sets/src/mage/sets/conspiracy/Decimate.java
index a570b3c4fb..4e23768d90 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Decimate.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Decimate.java
@@ -37,7 +37,7 @@ public class Decimate extends mage.sets.odyssey.Decimate {
 
     public Decimate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/DimirDoppelganger.java b/Mage.Sets/src/mage/sets/conspiracy/DimirDoppelganger.java
index 5d2bfd5cdd..b67fce95a5 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/DimirDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/DimirDoppelganger.java
@@ -37,7 +37,7 @@ public class DimirDoppelganger extends mage.sets.ravnica.DimirDoppelganger {
 
     public DimirDoppelganger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/DoomedTraveler.java b/Mage.Sets/src/mage/sets/conspiracy/DoomedTraveler.java
index f99843182f..fee204ff2f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/DoomedTraveler.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/DoomedTraveler.java
@@ -37,7 +37,7 @@ public class DoomedTraveler extends mage.sets.innistrad.DoomedTraveler {
 
     public DoomedTraveler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/DreamFracture.java b/Mage.Sets/src/mage/sets/conspiracy/DreamFracture.java
index 5ff39aabef..bfe238ce42 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/DreamFracture.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/DreamFracture.java
@@ -38,7 +38,7 @@ public class DreamFracture extends mage.sets.eventide.DreamFracture {
 
     public DreamFracture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/EchoingCourage.java b/Mage.Sets/src/mage/sets/conspiracy/EchoingCourage.java
index 5ebec65e59..d678ee1391 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/EchoingCourage.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/EchoingCourage.java
@@ -37,7 +37,7 @@ public class EchoingCourage extends mage.sets.modernmasters.EchoingCourage {
 
     public EchoingCourage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/EdricSpymasterOfTrest.java b/Mage.Sets/src/mage/sets/conspiracy/EdricSpymasterOfTrest.java
index 74f2cdd34c..91e0d554b3 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/EdricSpymasterOfTrest.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/EdricSpymasterOfTrest.java
@@ -37,7 +37,7 @@ public class EdricSpymasterOfTrest extends mage.sets.commander.EdricSpymasterOfT
 
     public EdricSpymasterOfTrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ElephantGuide.java b/Mage.Sets/src/mage/sets/conspiracy/ElephantGuide.java
index 78228d5f20..3a8cc92c86 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ElephantGuide.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ElephantGuide.java
@@ -37,7 +37,7 @@ public class ElephantGuide extends mage.sets.judgment.ElephantGuide {
 
     public ElephantGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ElvishAberration.java b/Mage.Sets/src/mage/sets/conspiracy/ElvishAberration.java
index 9059d65561..1881dd4808 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ElvishAberration.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ElvishAberration.java
@@ -38,7 +38,7 @@ public class ElvishAberration extends mage.sets.scourge.ElvishAberration {
 
     public ElvishAberration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/EnclaveElite.java b/Mage.Sets/src/mage/sets/conspiracy/EnclaveElite.java
index a836afef2f..08e0b28d1c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/EnclaveElite.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/EnclaveElite.java
@@ -37,7 +37,7 @@ public class EnclaveElite extends mage.sets.worldwake.EnclaveElite {
 
     public EnclaveElite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Exploration.java b/Mage.Sets/src/mage/sets/conspiracy/Exploration.java
index 30da897226..a04d2975e1 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Exploration.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Exploration.java
@@ -37,7 +37,7 @@ public class Exploration extends mage.sets.urzassaga.Exploration {
 
     public Exploration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ExplorersScope.java b/Mage.Sets/src/mage/sets/conspiracy/ExplorersScope.java
index 601c179d74..44268bb524 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ExplorersScope.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ExplorersScope.java
@@ -38,7 +38,7 @@ public class ExplorersScope extends mage.sets.zendikar.ExplorersScope {
 
     public ExplorersScope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/FactOrFiction.java b/Mage.Sets/src/mage/sets/conspiracy/FactOrFiction.java
index c394f6d234..b87898dd82 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/FavorableWinds.java b/Mage.Sets/src/mage/sets/conspiracy/FavorableWinds.java
index 46b57dbfcc..760bbd0aa3 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/FavorableWinds.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/FavorableWinds.java
@@ -37,7 +37,7 @@ public class FavorableWinds extends mage.sets.avacynrestored.FavorableWinds {
 
     public FavorableWinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/conspiracy/FiresOfYavimaya.java
index e1b674f32d..5decf39182 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Fireshrieker.java b/Mage.Sets/src/mage/sets/conspiracy/Fireshrieker.java
index f703986c93..7214f39416 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Fireshrieker.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Fireshrieker.java
@@ -37,7 +37,7 @@ public class Fireshrieker extends mage.sets.magic2014.Fireshrieker {
 
     public Fireshrieker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/FlaringFlameKin.java b/Mage.Sets/src/mage/sets/conspiracy/FlaringFlameKin.java
index e5de2274b8..854c390ce1 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/FlaringFlameKin.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/FlaringFlameKin.java
@@ -37,7 +37,7 @@ public class FlaringFlameKin extends mage.sets.dissension.FlaringFlameKin {
 
     public FlaringFlameKin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/GalvanicJuggernaut.java b/Mage.Sets/src/mage/sets/conspiracy/GalvanicJuggernaut.java
index 28a6ac909b..9e6b31a3fb 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/GalvanicJuggernaut.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/GalvanicJuggernaut.java
@@ -37,7 +37,7 @@ public class GalvanicJuggernaut extends mage.sets.innistrad.GalvanicJuggernaut {
 
     public GalvanicJuggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Gamekeeper.java b/Mage.Sets/src/mage/sets/conspiracy/Gamekeeper.java
index 92a52b2266..8cc3e82fb4 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Gamekeeper.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Gamekeeper.java
@@ -37,7 +37,7 @@ public class Gamekeeper extends mage.sets.urzasdestiny.Gamekeeper {
 
     public Gamekeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/GlimmerpointStag.java b/Mage.Sets/src/mage/sets/conspiracy/GlimmerpointStag.java
index 0ec7e79cbc..de5f6b7a60 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/GlimmerpointStag.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/GlimmerpointStag.java
@@ -37,7 +37,7 @@ public class GlimmerpointStag extends mage.sets.scarsofmirrodin.GlimmerpointStag
 
     public GlimmerpointStag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/GnarlidPack.java b/Mage.Sets/src/mage/sets/conspiracy/GnarlidPack.java
index dd58053212..eab7729dcc 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/GnarlidPack.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/GnarlidPack.java
@@ -37,7 +37,7 @@ public class GnarlidPack extends mage.sets.worldwake.GnarlidPack {
 
     public GnarlidPack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/GrixisIllusionist.java b/Mage.Sets/src/mage/sets/conspiracy/GrixisIllusionist.java
index 82fff22d3b..17f17501df 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/GrixisIllusionist.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/GrixisIllusionist.java
@@ -37,7 +37,7 @@ public class GrixisIllusionist extends mage.sets.conflux.GrixisIllusionist {
 
     public GrixisIllusionist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/GuardianZendikon.java b/Mage.Sets/src/mage/sets/conspiracy/GuardianZendikon.java
index c205cd6270..5d90ce2905 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/GuardianZendikon.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/GuardianZendikon.java
@@ -37,7 +37,7 @@ public class GuardianZendikon extends mage.sets.worldwake.GuardianZendikon {
 
     public GuardianZendikon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/HeartlessHidetsugu.java b/Mage.Sets/src/mage/sets/conspiracy/HeartlessHidetsugu.java
index da5e386bcb..fb21b67cb6 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/HeartlessHidetsugu.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/HeartlessHidetsugu.java
@@ -37,7 +37,7 @@ public class HeartlessHidetsugu extends mage.sets.betrayersofkamigawa.HeartlessH
 
     public HeartlessHidetsugu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/HecklingFiends.java b/Mage.Sets/src/mage/sets/conspiracy/HecklingFiends.java
index cd9ac889d9..9d00fbd2b4 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/HecklingFiends.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/HecklingFiends.java
@@ -37,7 +37,7 @@ public class HecklingFiends extends mage.sets.darkascension.HecklingFiends {
 
     public HecklingFiends(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/HowlingWolf.java b/Mage.Sets/src/mage/sets/conspiracy/HowlingWolf.java
index dac9d6b1f4..91e0970c88 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/HowlingWolf.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/HowlingWolf.java
@@ -37,7 +37,7 @@ public class HowlingWolf extends mage.sets.mercadianmasques.HowlingWolf {
 
     public HowlingWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/HungerOfTheHowlpack.java b/Mage.Sets/src/mage/sets/conspiracy/HungerOfTheHowlpack.java
index 46b26841e4..973a87f66c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/HungerOfTheHowlpack.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/HungerOfTheHowlpack.java
@@ -37,7 +37,7 @@ public class HungerOfTheHowlpack extends mage.sets.darkascension.HungerOfTheHowl
 
     public HungerOfTheHowlpack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/HydraOmnivore.java b/Mage.Sets/src/mage/sets/conspiracy/HydraOmnivore.java
index 48ac4e703a..5d7feb5dfe 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/HydraOmnivore.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/HydraOmnivore.java
@@ -38,7 +38,7 @@ public class HydraOmnivore extends mage.sets.commander.HydraOmnivore {
 
     public HydraOmnivore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/IllGottenGains.java b/Mage.Sets/src/mage/sets/conspiracy/IllGottenGains.java
index 8359491d54..1e1a635af4 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/IllGottenGains.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/IllGottenGains.java
@@ -37,7 +37,7 @@ public class IllGottenGains extends mage.sets.urzassaga.IllGottenGains {
 
     public IllGottenGains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/InfectiousHorror.java b/Mage.Sets/src/mage/sets/conspiracy/InfectiousHorror.java
index 7234ae6e60..e4a2ef687c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/InfectiousHorror.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/InfectiousHorror.java
@@ -37,7 +37,7 @@ public class InfectiousHorror extends mage.sets.conflux.InfectiousHorror {
 
     public InfectiousHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/IntangibleVirtue.java b/Mage.Sets/src/mage/sets/conspiracy/IntangibleVirtue.java
index 4a265d9c9a..205ae65833 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/IntangibleVirtue.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/IntangibleVirtue.java
@@ -37,7 +37,7 @@ public class IntangibleVirtue extends mage.sets.innistrad.IntangibleVirtue {
 
     public IntangibleVirtue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/JettingGlasskite.java b/Mage.Sets/src/mage/sets/conspiracy/JettingGlasskite.java
index 50bb571637..da288c0ebd 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/JettingGlasskite.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/JettingGlasskite.java
@@ -37,7 +37,7 @@ public class JettingGlasskite extends mage.sets.betrayersofkamigawa.JettingGlass
 
     public JettingGlasskite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/KorChant.java b/Mage.Sets/src/mage/sets/conspiracy/KorChant.java
index e84e62e72d..4daca3a9a0 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/KorChant.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/KorChant.java
@@ -37,7 +37,7 @@ public class KorChant extends mage.sets.exodus.KorChant {
 
     public KorChant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/LeadTheStampede.java b/Mage.Sets/src/mage/sets/conspiracy/LeadTheStampede.java
index e2ef875f2a..c0d7c519a2 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/LeadTheStampede.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/LeadTheStampede.java
@@ -37,7 +37,7 @@ public class LeadTheStampede extends mage.sets.mirrodinbesieged.LeadTheStampede
 
     public LeadTheStampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/LilianasSpecter.java b/Mage.Sets/src/mage/sets/conspiracy/LilianasSpecter.java
index 99a66ef450..c590b2a16b 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/LilianasSpecter.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/LilianasSpecter.java
@@ -37,7 +37,7 @@ public class LilianasSpecter extends mage.sets.magic2011.LilianasSpecter {
 
     public LilianasSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/LizardWarrior.java b/Mage.Sets/src/mage/sets/conspiracy/LizardWarrior.java
index caac4ac5f2..f68def048a 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/LizardWarrior.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/LizardWarrior.java
@@ -37,7 +37,7 @@ public class LizardWarrior extends mage.sets.portal.LizardWarrior {
 
     public LizardWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MagisterOfWorth.java b/Mage.Sets/src/mage/sets/conspiracy/MagisterOfWorth.java
index c9ede50c8d..58a5884f4d 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MagisterOfWorth.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MagisterOfWorth.java
@@ -38,7 +38,7 @@ public class MagisterOfWorth extends mage.sets.mediainserts.MagisterOfWorth {
 
     public MagisterOfWorth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MarchesaTheBlackRose.java b/Mage.Sets/src/mage/sets/conspiracy/MarchesaTheBlackRose.java
index 5e80c24831..1cd0d9e88d 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MarchesaTheBlackRose.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MarchesaTheBlackRose.java
@@ -37,7 +37,7 @@ public class MarchesaTheBlackRose extends mage.sets.vintagemasters.MarchesaTheBl
 
     public MarchesaTheBlackRose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MinamoScrollkeeper.java b/Mage.Sets/src/mage/sets/conspiracy/MinamoScrollkeeper.java
index fd5410690b..b3294de512 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MinamoScrollkeeper.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MinamoScrollkeeper.java
@@ -37,7 +37,7 @@ public class MinamoScrollkeeper extends mage.sets.saviorsofkamigawa.MinamoScroll
 
     public MinamoScrollkeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MirarisWake.java b/Mage.Sets/src/mage/sets/conspiracy/MirarisWake.java
index adfd5606ff..13aaa12308 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MirarisWake.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MirarisWake.java
@@ -38,7 +38,7 @@ public class MirarisWake extends mage.sets.judgment.MirarisWake {
 
     public MirarisWake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MirrodinsCore.java b/Mage.Sets/src/mage/sets/conspiracy/MirrodinsCore.java
index fe07d338d1..1346c532eb 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MirrodinsCore.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MirrodinsCore.java
@@ -37,7 +37,7 @@ public class MirrodinsCore extends mage.sets.darksteel.MirrodinsCore {
 
     public MirrodinsCore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Misdirection.java b/Mage.Sets/src/mage/sets/conspiracy/Misdirection.java
index ad2f270482..be17793053 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Misdirection.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Misdirection.java
@@ -37,7 +37,7 @@ public class Misdirection extends mage.sets.mercadianmasques.Misdirection {
 
     public Misdirection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MomentOfHeroism.java b/Mage.Sets/src/mage/sets/conspiracy/MomentOfHeroism.java
index 78f2babdbb..1ea9331912 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MomentOfHeroism.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MomentOfHeroism.java
@@ -37,7 +37,7 @@ public class MomentOfHeroism extends mage.sets.innistrad.MomentOfHeroism {
 
     public MomentOfHeroism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/MorkrutBanshee.java b/Mage.Sets/src/mage/sets/conspiracy/MorkrutBanshee.java
index 937399ade6..32e86651cb 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/MorkrutBanshee.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/MorkrutBanshee.java
@@ -37,7 +37,7 @@ public class MorkrutBanshee extends mage.sets.innistrad.MorkrutBanshee {
 
     public MorkrutBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Mortify.java b/Mage.Sets/src/mage/sets/conspiracy/Mortify.java
index dd37861a81..b06ce02da9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Mortify.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Mortify.java
@@ -37,7 +37,7 @@ public class Mortify extends mage.sets.guildpact.Mortify {
 
     public Mortify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/NaturesClaim.java b/Mage.Sets/src/mage/sets/conspiracy/NaturesClaim.java
index 2fe9befdbd..b1f8f338f9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/NaturesClaim.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/NaturesClaim.java
@@ -37,7 +37,7 @@ public class NaturesClaim extends mage.sets.worldwake.NaturesClaim {
 
     public NaturesClaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/NecromanticThirst.java b/Mage.Sets/src/mage/sets/conspiracy/NecromanticThirst.java
index da05bf72cd..cca99912b1 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/NecromanticThirst.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/NecromanticThirst.java
@@ -37,7 +37,7 @@ public class NecromanticThirst extends mage.sets.ravnica.NecromanticThirst {
 
     public NecromanticThirst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/NobleTemplar.java b/Mage.Sets/src/mage/sets/conspiracy/NobleTemplar.java
index dad77de231..97c61e83fc 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/NobleTemplar.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/NobleTemplar.java
@@ -37,7 +37,7 @@ public class NobleTemplar extends mage.sets.scourge.NobleTemplar {
 
     public NobleTemplar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/OrcishCannonade.java b/Mage.Sets/src/mage/sets/conspiracy/OrcishCannonade.java
index ca4a20c271..02fb06350f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/OrcishCannonade.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/OrcishCannonade.java
@@ -37,7 +37,7 @@ public class OrcishCannonade extends mage.sets.speedvscunning.OrcishCannonade {
 
     public OrcishCannonade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PeaceStrider.java b/Mage.Sets/src/mage/sets/conspiracy/PeaceStrider.java
index 825a07b6a1..d491bfa7f0 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PeaceStrider.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PeaceStrider.java
@@ -37,7 +37,7 @@ public class PeaceStrider extends mage.sets.mirrodinbesieged.PeaceStrider {
 
     public PeaceStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PelakkaWurm.java b/Mage.Sets/src/mage/sets/conspiracy/PelakkaWurm.java
index 38485e4ff3..c43fef8da9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PelakkaWurm.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PelakkaWurm.java
@@ -37,7 +37,7 @@ public class PelakkaWurm extends mage.sets.riseoftheeldrazi.PelakkaWurm {
 
     public PelakkaWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PerniciousDeed.java b/Mage.Sets/src/mage/sets/conspiracy/PerniciousDeed.java
index e0ce83d063..b5d81f2a8f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PerniciousDeed.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PerniciousDeed.java
@@ -38,7 +38,7 @@ public class PerniciousDeed extends mage.sets.apocalypse.PerniciousDeed {
 
     public PerniciousDeed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PhageTheUntouchable.java b/Mage.Sets/src/mage/sets/conspiracy/PhageTheUntouchable.java
index c158c5e68d..47712791d9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PhageTheUntouchable.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PhageTheUntouchable.java
@@ -38,7 +38,7 @@ public class PhageTheUntouchable extends mage.sets.tenthedition.PhageTheUntoucha
 
     public PhageTheUntouchable(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PillarfieldOx.java b/Mage.Sets/src/mage/sets/conspiracy/PillarfieldOx.java
index 121e0d345f..1b8caa2c24 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PillarfieldOx.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PillarfieldOx.java
@@ -37,7 +37,7 @@ public class PillarfieldOx extends mage.sets.zendikar.PillarfieldOx {
 
     public PillarfieldOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PitchburnDevils.java b/Mage.Sets/src/mage/sets/conspiracy/PitchburnDevils.java
index b69ef17586..0adf0ccc12 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PitchburnDevils.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PitchburnDevils.java
@@ -37,7 +37,7 @@ public class PitchburnDevils extends mage.sets.innistrad.PitchburnDevils {
 
     public PitchburnDevils(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PlaguedRusalka.java b/Mage.Sets/src/mage/sets/conspiracy/PlaguedRusalka.java
index 5eeac1a766..2e90b9c984 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PlaguedRusalka.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PlaguedRusalka.java
@@ -37,7 +37,7 @@ public class PlaguedRusalka extends mage.sets.guildpact.PlaguedRusalka {
 
     public PlaguedRusalka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PlatedSeastrider.java b/Mage.Sets/src/mage/sets/conspiracy/PlatedSeastrider.java
index 7e833f1fd8..daeadb7133 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PlatedSeastrider.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PlatedSeastrider.java
@@ -37,7 +37,7 @@ public class PlatedSeastrider extends mage.sets.scarsofmirrodin.PlatedSeastrider
 
     public PlatedSeastrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PleaForPower.java b/Mage.Sets/src/mage/sets/conspiracy/PleaForPower.java
index 70f5d10df6..dc4f5e0c76 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PleaForPower.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PleaForPower.java
@@ -37,7 +37,7 @@ public class PleaForPower extends mage.sets.vintagemasters.PleaForPower {
 
     public PleaForPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Plummet.java b/Mage.Sets/src/mage/sets/conspiracy/Plummet.java
index 3ad0794afa..02f029b1ae 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Plummet.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PrideGuardian.java b/Mage.Sets/src/mage/sets/conspiracy/PrideGuardian.java
index 072c0223e7..ca8d3f89ba 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PrideGuardian.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PrideGuardian.java
@@ -37,7 +37,7 @@ public class PrideGuardian extends mage.sets.magic2012.PrideGuardian {
 
     public PrideGuardian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/PristineAngel.java b/Mage.Sets/src/mage/sets/conspiracy/PristineAngel.java
index be633efdaf..8ff873ca0c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/PristineAngel.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/PristineAngel.java
@@ -38,7 +38,7 @@ public class PristineAngel extends mage.sets.darksteel.PristineAngel {
 
     public PristineAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Provoke.java b/Mage.Sets/src/mage/sets/conspiracy/Provoke.java
index 7f8d277956..825f64bc41 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Provoke.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Provoke.java
@@ -37,7 +37,7 @@ public class Provoke extends mage.sets.stronghold.Provoke {
 
     public Provoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/QuagVampires.java b/Mage.Sets/src/mage/sets/conspiracy/QuagVampires.java
index 309902feef..c14811dc74 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/QuagVampires.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/QuagVampires.java
@@ -37,7 +37,7 @@ public class QuagVampires extends mage.sets.worldwake.QuagVampires {
 
     public QuagVampires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Quicksand.java b/Mage.Sets/src/mage/sets/conspiracy/Quicksand.java
index bb005d7e66..0aaf9b4cf9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Quicksand.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Quicksand.java
@@ -37,7 +37,7 @@ public class Quicksand extends mage.sets.tenthedition.Quicksand {
 
     public Quicksand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/RecklessScholar.java b/Mage.Sets/src/mage/sets/conspiracy/RecklessScholar.java
index 6079bba082..5b98e8ed1f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/RecklessScholar.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/RecklessScholar.java
@@ -37,7 +37,7 @@ public class RecklessScholar extends mage.sets.zendikar.RecklessScholar {
 
     public RecklessScholar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/RecklessSpite.java b/Mage.Sets/src/mage/sets/conspiracy/RecklessSpite.java
index d2af225e5c..175c3b1860 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/RecklessSpite.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/RecklessSpite.java
@@ -37,7 +37,7 @@ public class RecklessSpite extends mage.sets.tempest.RecklessSpite {
 
     public RecklessSpite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ReflectingPool.java b/Mage.Sets/src/mage/sets/conspiracy/ReflectingPool.java
index 36ac4a73a2..329c907077 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ReflectingPool.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ReflectingPool.java
@@ -37,7 +37,7 @@ public class ReflectingPool extends mage.sets.tempest.ReflectingPool {
 
     public ReflectingPool(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ReignOfThePit.java b/Mage.Sets/src/mage/sets/conspiracy/ReignOfThePit.java
index 0fd6abaa3f..32f4a2bb1c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ReignOfThePit.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ReignOfThePit.java
@@ -37,7 +37,7 @@ public class ReignOfThePit extends mage.sets.vintagemasters.ReignOfThePit {
 
     public ReignOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ReitoLantern.java b/Mage.Sets/src/mage/sets/conspiracy/ReitoLantern.java
index eef43e40a5..52b1d2cc9a 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ReitoLantern.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ReitoLantern.java
@@ -37,7 +37,7 @@ public class ReitoLantern extends mage.sets.championsofkamigawa.ReitoLantern {
 
     public ReitoLantern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/RelicCrush.java b/Mage.Sets/src/mage/sets/conspiracy/RelicCrush.java
index 4d9c85af1d..51e36cdab9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/RelicCrush.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/RelicCrush.java
@@ -38,7 +38,7 @@ public class RelicCrush extends mage.sets.zendikar.RelicCrush {
 
     public RelicCrush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Respite.java b/Mage.Sets/src/mage/sets/conspiracy/Respite.java
index cf9230da3d..ed1a2e311a 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Respite.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Respite.java
@@ -37,7 +37,7 @@ public class Respite extends mage.sets.tempest.Respite {
 
     public Respite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/conspiracy/ReyaDawnbringer.java
index 3d8e924d10..87490516a1 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ReyaDawnbringer.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ReyaDawnbringer.java
@@ -37,7 +37,7 @@ public class ReyaDawnbringer extends mage.sets.tenthedition.ReyaDawnbringer {
 
     public ReyaDawnbringer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/RunedServitor.java b/Mage.Sets/src/mage/sets/conspiracy/RunedServitor.java
index eeef6e14ec..64c3ec5c1c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/RunedServitor.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/RunedServitor.java
@@ -37,7 +37,7 @@ public class RunedServitor extends mage.sets.riseoftheeldrazi.RunedServitor {
 
     public RunedServitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/conspiracy/SakuraTribeElder.java
index 5d4789ddcf..00b155c3d2 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SakuraTribeElder.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SakuraTribeElder.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder extends mage.sets.championsofkamigawa.SakuraTribeE
 
     public SakuraTribeElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ScaledWurm.java b/Mage.Sets/src/mage/sets/conspiracy/ScaledWurm.java
index d0d1fa3fd8..6b2a1d0c92 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ScaledWurm.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ScaledWurm.java
@@ -37,7 +37,7 @@ public class ScaledWurm extends mage.sets.ninthedition.ScaledWurm {
 
     public ScaledWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ScourgeOfTheThrone.java b/Mage.Sets/src/mage/sets/conspiracy/ScourgeOfTheThrone.java
index 7894829aa4..9947ff94fa 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ScourgeOfTheThrone.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ScourgeOfTheThrone.java
@@ -37,7 +37,7 @@ public class ScourgeOfTheThrone extends mage.sets.vintagemasters.ScourgeOfTheThr
 
     public ScourgeOfTheThrone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SelvalaExplorerReturned.java b/Mage.Sets/src/mage/sets/conspiracy/SelvalaExplorerReturned.java
index 8c92b5b6fe..9dae6fafa0 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SelvalaExplorerReturned.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SelvalaExplorerReturned.java
@@ -37,7 +37,7 @@ public class SelvalaExplorerReturned extends mage.sets.vintagemasters.SelvalaExp
 
     public SelvalaExplorerReturned(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ShorelineRanger.java b/Mage.Sets/src/mage/sets/conspiracy/ShorelineRanger.java
index 341539983e..2fb27e248a 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ShorelineRanger.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ShorelineRanger.java
@@ -37,7 +37,7 @@ public class ShorelineRanger extends mage.sets.scourge.ShorelineRanger {
 
     public ShorelineRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SilentArbiter.java b/Mage.Sets/src/mage/sets/conspiracy/SilentArbiter.java
index 19543752f9..0b391009cd 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SilentArbiter.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SilentArbiter.java
@@ -37,7 +37,7 @@ public class SilentArbiter extends mage.sets.fifthdawn.SilentArbiter {
 
     public SilentArbiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SilverchaseFox.java b/Mage.Sets/src/mage/sets/conspiracy/SilverchaseFox.java
index 2c10962891..72f2231d76 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SilverchaseFox.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SilverchaseFox.java
@@ -37,7 +37,7 @@ public class SilverchaseFox extends mage.sets.innistrad.SilverchaseFox {
 
     public SilverchaseFox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SkeletalScrying.java b/Mage.Sets/src/mage/sets/conspiracy/SkeletalScrying.java
index 0364e881ee..da42724315 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SkeletalScrying.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SkeletalScrying.java
@@ -37,7 +37,7 @@ public class SkeletalScrying extends mage.sets.odyssey.SkeletalScrying {
 
     public SkeletalScrying(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SkitterOfLizards.java b/Mage.Sets/src/mage/sets/conspiracy/SkitterOfLizards.java
index 72214f2ace..ba25dfe084 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SkitterOfLizards.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SkitterOfLizards.java
@@ -37,7 +37,7 @@ public class SkitterOfLizards extends mage.sets.worldwake.SkitterOfLizards {
 
     public SkitterOfLizards(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SkySpirit.java b/Mage.Sets/src/mage/sets/conspiracy/SkySpirit.java
index f5c2629c85..be2dd58223 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SkySpirit.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SkySpirit.java
@@ -37,7 +37,7 @@ public class SkySpirit extends mage.sets.tempest.SkySpirit {
 
     public SkySpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Smallpox.java b/Mage.Sets/src/mage/sets/conspiracy/Smallpox.java
index 11d1345e6b..b5716db39f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Smallpox.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Smallpox.java
@@ -37,7 +37,7 @@ public class Smallpox extends mage.sets.magic2012.Smallpox {
 
     public Smallpox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Soulcatcher.java b/Mage.Sets/src/mage/sets/conspiracy/Soulcatcher.java
index 2a21541337..b063e4b8a9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Soulcatcher.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Soulcatcher.java
@@ -37,7 +37,7 @@ public class Soulcatcher extends mage.sets.odyssey.Soulcatcher {
 
     public Soulcatcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Spiritmonger.java b/Mage.Sets/src/mage/sets/conspiracy/Spiritmonger.java
index b21a8fdf43..83be0b5044 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Spiritmonger.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Spiritmonger.java
@@ -37,7 +37,7 @@ public class Spiritmonger extends mage.sets.apocalypse.Spiritmonger {
 
     public Spiritmonger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SpontaneousCombustion.java b/Mage.Sets/src/mage/sets/conspiracy/SpontaneousCombustion.java
index 771fdea44d..fbf1203b64 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SpontaneousCombustion.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SpontaneousCombustion.java
@@ -37,7 +37,7 @@ public class SpontaneousCombustion extends mage.sets.tempest.SpontaneousCombusti
 
     public SpontaneousCombustion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SporecapSpider.java b/Mage.Sets/src/mage/sets/conspiracy/SporecapSpider.java
index cd6d468965..e360a84316 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SporecapSpider.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SporecapSpider.java
@@ -37,7 +37,7 @@ public class SporecapSpider extends mage.sets.riseoftheeldrazi.SporecapSpider {
 
     public SporecapSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/StasisCell.java b/Mage.Sets/src/mage/sets/conspiracy/StasisCell.java
index dd59b89b4e..692ba931d6 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/StasisCell.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/StasisCell.java
@@ -37,7 +37,7 @@ public class StasisCell extends mage.sets.ravnica.StasisCell {
 
     public StasisCell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/StaveOff.java b/Mage.Sets/src/mage/sets/conspiracy/StaveOff.java
index bff316b1d8..607a630695 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/StaveOff.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/StaveOff.java
@@ -37,7 +37,7 @@ public class StaveOff extends mage.sets.magic2012.StaveOff {
 
     public StaveOff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Stifle.java b/Mage.Sets/src/mage/sets/conspiracy/Stifle.java
index 20684f60fc..22f5766c94 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Stifle.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Stifle.java
@@ -37,7 +37,7 @@ public class Stifle extends mage.sets.scourge.Stifle {
 
     public Stifle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SulfuricVortex.java b/Mage.Sets/src/mage/sets/conspiracy/SulfuricVortex.java
index 25488911cd..4901fb0950 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SulfuricVortex.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SulfuricVortex.java
@@ -37,7 +37,7 @@ public class SulfuricVortex extends mage.sets.scourge.SulfuricVortex {
 
     public SulfuricVortex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/conspiracy/SwordsToPlowshares.java
index e0d0368540..27456c8307 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/SyphonSoul.java b/Mage.Sets/src/mage/sets/conspiracy/SyphonSoul.java
index 10948fc30d..59e589294c 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/SyphonSoul.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/SyphonSoul.java
@@ -37,7 +37,7 @@ public class SyphonSoul extends mage.sets.planechase.SyphonSoul {
 
     public SyphonSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Terastodon.java b/Mage.Sets/src/mage/sets/conspiracy/Terastodon.java
index 458ec6d43d..603fb61f93 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Terastodon.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Terastodon.java
@@ -37,7 +37,7 @@ public class Terastodon extends mage.sets.worldwake.Terastodon {
 
     public Terastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/TorchFiend.java b/Mage.Sets/src/mage/sets/conspiracy/TorchFiend.java
index 248617e373..3d5dc86494 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/TorchFiend.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/TorchFiend.java
@@ -37,7 +37,7 @@ public class TorchFiend extends mage.sets.darkascension.TorchFiend {
 
     public TorchFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/TragicSlip.java b/Mage.Sets/src/mage/sets/conspiracy/TragicSlip.java
index ec25302462..9b98334ae3 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/TragicSlip.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/TragicSlip.java
@@ -37,7 +37,7 @@ public class TragicSlip extends mage.sets.darkascension.TragicSlip {
 
     public TragicSlip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/TrumpetBlast.java b/Mage.Sets/src/mage/sets/conspiracy/TrumpetBlast.java
index b93b56c02b..f861147d84 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/TrumpetBlast.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/TrumpetBlast.java
@@ -37,7 +37,7 @@ public class TrumpetBlast extends mage.sets.magic2010.TrumpetBlast {
 
     public TrumpetBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/TurnTheTide.java b/Mage.Sets/src/mage/sets/conspiracy/TurnTheTide.java
index d37b3290a4..a62f846856 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/TurnTheTide.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/TurnTheTide.java
@@ -37,7 +37,7 @@ public class TurnTheTide extends mage.sets.mirrodinbesieged.TurnTheTide {
 
     public TurnTheTide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/TwistedAbomination.java b/Mage.Sets/src/mage/sets/conspiracy/TwistedAbomination.java
index e24e38fc04..1228a994ca 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/TwistedAbomination.java
@@ -38,7 +38,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/TyphoidRats.java b/Mage.Sets/src/mage/sets/conspiracy/TyphoidRats.java
index 04fd16fb71..c5b8778ebd 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/TyphoidRats.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/TyphoidRats.java
@@ -37,7 +37,7 @@ public class TyphoidRats extends mage.sets.innistrad.TyphoidRats {
 
     public TyphoidRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/UncontrollableAnger.java b/Mage.Sets/src/mage/sets/conspiracy/UncontrollableAnger.java
index fe9a0927be..eeb0954031 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/UncontrollableAnger.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/UncontrollableAnger.java
@@ -38,7 +38,7 @@ public class UncontrollableAnger extends mage.sets.championsofkamigawa.Uncontrol
 
     public UncontrollableAnger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/UnhallowedPact.java b/Mage.Sets/src/mage/sets/conspiracy/UnhallowedPact.java
index bc22f9adc9..81864fdd23 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/UnhallowedPact.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/UnhallowedPact.java
@@ -37,7 +37,7 @@ public class UnhallowedPact extends mage.sets.avacynrestored.UnhallowedPact {
 
     public UnhallowedPact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/UnquestionedAuthority.java b/Mage.Sets/src/mage/sets/conspiracy/UnquestionedAuthority.java
index ee3b11292f..7fba398924 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/UnquestionedAuthority.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/UnquestionedAuthority.java
@@ -37,7 +37,7 @@ public class UnquestionedAuthority extends mage.sets.judgment.UnquestionedAuthor
 
     public UnquestionedAuthority(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/VampireHexmage.java b/Mage.Sets/src/mage/sets/conspiracy/VampireHexmage.java
index 65bf66fbe6..bda7ab293a 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/VampireHexmage.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/VampireHexmage.java
@@ -37,7 +37,7 @@ public class VampireHexmage extends mage.sets.zendikar.VampireHexmage {
 
     public VampireHexmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/VedalkenOrrery.java b/Mage.Sets/src/mage/sets/conspiracy/VedalkenOrrery.java
index 9f65b8198f..902bcad5f3 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/VedalkenOrrery.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/VedalkenOrrery.java
@@ -37,7 +37,7 @@ public class VedalkenOrrery extends mage.sets.fifthdawn.VedalkenOrrery {
 
     public VedalkenOrrery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/VentSentinel.java b/Mage.Sets/src/mage/sets/conspiracy/VentSentinel.java
index 742fd4f490..56abc91ead 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/VentSentinel.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/VentSentinel.java
@@ -37,7 +37,7 @@ public class VentSentinel extends mage.sets.riseoftheeldrazi.VentSentinel {
 
     public VentSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/VolcanicFallout.java b/Mage.Sets/src/mage/sets/conspiracy/VolcanicFallout.java
index 6548995b48..cbb3f9a51f 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/VolcanicFallout.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/VolcanicFallout.java
@@ -37,7 +37,7 @@ public class VolcanicFallout extends mage.sets.conflux.VolcanicFallout {
 
     public VolcanicFallout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/VowOfDuty.java b/Mage.Sets/src/mage/sets/conspiracy/VowOfDuty.java
index 69935c9954..900af4afd8 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/VowOfDuty.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/VowOfDuty.java
@@ -37,7 +37,7 @@ public class VowOfDuty extends mage.sets.commander.VowOfDuty {
 
     public VowOfDuty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/Wakedancer.java b/Mage.Sets/src/mage/sets/conspiracy/Wakedancer.java
index 38e8f78d52..6179d68b7a 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/Wakedancer.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/Wakedancer.java
@@ -38,7 +38,7 @@ public class Wakedancer extends mage.sets.darkascension.Wakedancer {
 
     public Wakedancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/WarmongersChariot.java b/Mage.Sets/src/mage/sets/conspiracy/WarmongersChariot.java
index d9bdaaf85e..4215039df9 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/WarmongersChariot.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/WarmongersChariot.java
@@ -37,7 +37,7 @@ public class WarmongersChariot extends mage.sets.riseoftheeldrazi.WarmongersChar
 
     public WarmongersChariot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/WindDancer.java b/Mage.Sets/src/mage/sets/conspiracy/WindDancer.java
index 64e4261fcc..64d47e016b 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/WindDancer.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/WindDancer.java
@@ -37,7 +37,7 @@ public class WindDancer extends mage.sets.tempest.WindDancer {
 
     public WindDancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/conspiracy/WolfbriarElemental.java
index dec4d983f9..7abf1eca50 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/WolfbriarElemental.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/WolfbriarElemental.java
@@ -37,7 +37,7 @@ public class WolfbriarElemental extends mage.sets.worldwake.WolfbriarElemental {
 
     public WolfbriarElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/WoodSage.java b/Mage.Sets/src/mage/sets/conspiracy/WoodSage.java
index 6083d0df70..52a9efff4d 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/WoodSage.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/WoodSage.java
@@ -38,7 +38,7 @@ public class WoodSage extends mage.sets.tempest.WoodSage {
 
     public WoodSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "CNS";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/conspiracy/WrapInFlames.java b/Mage.Sets/src/mage/sets/conspiracy/WrapInFlames.java
index d449ee799c..ecfbc26203 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/WrapInFlames.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/WrapInFlames.java
@@ -37,7 +37,7 @@ public class WrapInFlames extends mage.sets.riseoftheeldrazi.WrapInFlames {
 
     public WrapInFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/conspiracy/ZombieGoliath.java b/Mage.Sets/src/mage/sets/conspiracy/ZombieGoliath.java
index d590da34a0..0c30166093 100644
--- a/Mage.Sets/src/mage/sets/conspiracy/ZombieGoliath.java
+++ b/Mage.Sets/src/mage/sets/conspiracy/ZombieGoliath.java
@@ -37,7 +37,7 @@ public class ZombieGoliath extends mage.sets.magic2012.ZombieGoliath {
 
     public ZombieGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "CNS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/Divination.java b/Mage.Sets/src/mage/sets/darkascension/Divination.java
index 572631e862..64a1dc5658 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Divination.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Divination.java
@@ -37,7 +37,7 @@ public class Divination extends mage.sets.magic2012.Divination {
 
     public Divination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DKA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/EvolvingWilds.java b/Mage.Sets/src/mage/sets/darkascension/EvolvingWilds.java
index 3f27c09d8e..eacfe3937b 100644
--- a/Mage.Sets/src/mage/sets/darkascension/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/darkascension/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "DKA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/Fling.java b/Mage.Sets/src/mage/sets/darkascension/Fling.java
index 20513bbbe2..cf97d1c148 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Fling.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Fling.java
@@ -37,7 +37,7 @@ public class Fling extends mage.sets.magic2011.Fling {
 
     public Fling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "DKA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java b/Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java
index 40ce40e2c2..3f095f1414 100644
--- a/Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java
+++ b/Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java
@@ -37,7 +37,7 @@ public class AEtherSnap extends mage.sets.commander2014.AEtherSnap {
 
     public AEtherSnap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/AgelessEntity.java b/Mage.Sets/src/mage/sets/darksteel/AgelessEntity.java
index ad672574b1..3accd585c6 100644
--- a/Mage.Sets/src/mage/sets/darksteel/AgelessEntity.java
+++ b/Mage.Sets/src/mage/sets/darksteel/AgelessEntity.java
@@ -37,7 +37,7 @@ public class AgelessEntity extends mage.sets.ajanivsnicolbolas.AgelessEntity {
 
     public AgelessEntity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/AngelsFeather.java b/Mage.Sets/src/mage/sets/darksteel/AngelsFeather.java
index 91ca78aad2..ce26418c47 100644
--- a/Mage.Sets/src/mage/sets/darksteel/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/darksteel/AngelsFeather.java
@@ -40,7 +40,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundCrusher.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundCrusher.java
index a4aa7d6736..93d056490a 100644
--- a/Mage.Sets/src/mage/sets/darksteel/ArcboundCrusher.java
+++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundCrusher.java
@@ -37,7 +37,7 @@ public class ArcboundCrusher extends mage.sets.planechase.ArcboundCrusher {
 
     public ArcboundCrusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundSlith.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundSlith.java
index 66e382da2b..df0c8544f4 100644
--- a/Mage.Sets/src/mage/sets/darksteel/ArcboundSlith.java
+++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundSlith.java
@@ -37,7 +37,7 @@ public class ArcboundSlith extends mage.sets.planechase.ArcboundSlith {
 
     public ArcboundSlith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/DeathCloud.java b/Mage.Sets/src/mage/sets/darksteel/DeathCloud.java
index ae05e71408..b0903d86e3 100644
--- a/Mage.Sets/src/mage/sets/darksteel/DeathCloud.java
+++ b/Mage.Sets/src/mage/sets/darksteel/DeathCloud.java
@@ -37,7 +37,7 @@ public class DeathCloud extends mage.sets.modernmasters.DeathCloud {
 
     public DeathCloud(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/DemonsHorn.java b/Mage.Sets/src/mage/sets/darksteel/DemonsHorn.java
index 5e6b0ff62e..aeb3efd67b 100644
--- a/Mage.Sets/src/mage/sets/darksteel/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/darksteel/DemonsHorn.java
@@ -38,7 +38,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/DragonsClaw.java b/Mage.Sets/src/mage/sets/darksteel/DragonsClaw.java
index 28fd0babf7..24a0cd0eb4 100644
--- a/Mage.Sets/src/mage/sets/darksteel/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/darksteel/DragonsClaw.java
@@ -38,7 +38,7 @@ public class DragonsClaw extends mage.sets.tenthedition.DragonsClaw {
 
     public DragonsClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/EchoingCourage.java b/Mage.Sets/src/mage/sets/darksteel/EchoingCourage.java
index 85858bdd93..bec37f5ea7 100644
--- a/Mage.Sets/src/mage/sets/darksteel/EchoingCourage.java
+++ b/Mage.Sets/src/mage/sets/darksteel/EchoingCourage.java
@@ -37,7 +37,7 @@ public class EchoingCourage extends mage.sets.modernmasters.EchoingCourage {
 
     public EchoingCourage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/EchoingTruth.java b/Mage.Sets/src/mage/sets/darksteel/EchoingTruth.java
index c03c6a479d..26050cdef9 100644
--- a/Mage.Sets/src/mage/sets/darksteel/EchoingTruth.java
+++ b/Mage.Sets/src/mage/sets/darksteel/EchoingTruth.java
@@ -37,7 +37,7 @@ public class EchoingTruth extends mage.sets.elspethvstezzeret.EchoingTruth {
 
     public EchoingTruth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/Fireball.java b/Mage.Sets/src/mage/sets/darksteel/Fireball.java
index dcefbad7c1..7278d3c304 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Fireball.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/Inflame.java b/Mage.Sets/src/mage/sets/darksteel/Inflame.java
index 1147a2232e..bf6809cfa2 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Inflame.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Inflame.java
@@ -37,7 +37,7 @@ public class Inflame extends mage.sets.prophecy.Inflame {
 
     public Inflame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/Juggernaut.java b/Mage.Sets/src/mage/sets/darksteel/Juggernaut.java
index 73fca2cfcd..6f00b8c0f7 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Juggernaut.java
@@ -38,7 +38,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/KrakensEye.java b/Mage.Sets/src/mage/sets/darksteel/KrakensEye.java
index 44d7341030..a53d2bc211 100644
--- a/Mage.Sets/src/mage/sets/darksteel/KrakensEye.java
+++ b/Mage.Sets/src/mage/sets/darksteel/KrakensEye.java
@@ -38,7 +38,7 @@ public class KrakensEye extends mage.sets.tenthedition.KrakensEye {
 
     public KrakensEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/OxiddaGolem.java b/Mage.Sets/src/mage/sets/darksteel/OxiddaGolem.java
index a5bfdc3218..e323d025e3 100644
--- a/Mage.Sets/src/mage/sets/darksteel/OxiddaGolem.java
+++ b/Mage.Sets/src/mage/sets/darksteel/OxiddaGolem.java
@@ -37,7 +37,7 @@ public class OxiddaGolem extends mage.sets.jacevschandra.OxiddaGolem {
 
     public OxiddaGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/Shunt.java b/Mage.Sets/src/mage/sets/darksteel/Shunt.java
index e9343026be..17dc9fa1fd 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Shunt.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Shunt.java
@@ -37,7 +37,7 @@ public class Shunt extends mage.sets.tenthedition.Shunt {
 
     public Shunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/SpireGolem.java b/Mage.Sets/src/mage/sets/darksteel/SpireGolem.java
index 20e8b4340c..c597d11bf2 100644
--- a/Mage.Sets/src/mage/sets/darksteel/SpireGolem.java
+++ b/Mage.Sets/src/mage/sets/darksteel/SpireGolem.java
@@ -37,7 +37,7 @@ public class SpireGolem extends mage.sets.jacevschandra.SpireGolem {
 
     public SpireGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/StirThePride.java b/Mage.Sets/src/mage/sets/darksteel/StirThePride.java
index 867ca0da92..febad1b3f7 100644
--- a/Mage.Sets/src/mage/sets/darksteel/StirThePride.java
+++ b/Mage.Sets/src/mage/sets/darksteel/StirThePride.java
@@ -37,7 +37,7 @@ public class StirThePride extends mage.sets.modernmasters.StirThePride {
 
     public StirThePride(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/TestOfFaith.java b/Mage.Sets/src/mage/sets/darksteel/TestOfFaith.java
index 1cca2b41ca..a267afc164 100644
--- a/Mage.Sets/src/mage/sets/darksteel/TestOfFaith.java
+++ b/Mage.Sets/src/mage/sets/darksteel/TestOfFaith.java
@@ -38,7 +38,7 @@ public class TestOfFaith extends mage.sets.modernmasters.TestOfFaith {
 
     public TestOfFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DST";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/darksteel/Thunderstaff.java b/Mage.Sets/src/mage/sets/darksteel/Thunderstaff.java
index 3071688a7e..f6750e5a69 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Thunderstaff.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Thunderstaff.java
@@ -37,7 +37,7 @@ public class Thunderstaff extends mage.sets.commander2013.Thunderstaff {
 
     public Thunderstaff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/VedalkenEngineer.java b/Mage.Sets/src/mage/sets/darksteel/VedalkenEngineer.java
index d1c6e8ba8e..9e798c9cec 100644
--- a/Mage.Sets/src/mage/sets/darksteel/VedalkenEngineer.java
+++ b/Mage.Sets/src/mage/sets/darksteel/VedalkenEngineer.java
@@ -37,7 +37,7 @@ public class VedalkenEngineer extends mage.sets.planechase.VedalkenEngineer {
 
     public VedalkenEngineer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/WellOfLostDreams.java b/Mage.Sets/src/mage/sets/darksteel/WellOfLostDreams.java
index 2875efabe4..5c1eb07865 100644
--- a/Mage.Sets/src/mage/sets/darksteel/WellOfLostDreams.java
+++ b/Mage.Sets/src/mage/sets/darksteel/WellOfLostDreams.java
@@ -37,7 +37,7 @@ public class WellOfLostDreams extends mage.sets.commander2013.WellOfLostDreams {
 
     public WellOfLostDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java
index a85cf7f27f..83337e3f01 100644
--- a/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java
+++ b/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java
@@ -38,7 +38,7 @@ public class WhispersilkCloak extends mage.sets.tenthedition.WhispersilkCloak {
 
     public WhispersilkCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "DST";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/darksteel/WurmsTooth.java b/Mage.Sets/src/mage/sets/darksteel/WurmsTooth.java
index f31d89fad4..4d655854b3 100644
--- a/Mage.Sets/src/mage/sets/darksteel/WurmsTooth.java
+++ b/Mage.Sets/src/mage/sets/darksteel/WurmsTooth.java
@@ -38,7 +38,7 @@ public class WurmsTooth extends mage.sets.tenthedition.WurmsTooth {
 
     public WurmsTooth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "DST";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java b/Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java
index 5ed74de402..79f6dd8e79 100644
--- a/Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java
+++ b/Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java
@@ -37,7 +37,7 @@ public class AEthermagesTouch extends mage.sets.commander2013.AEthermagesTouch {
 
     public AEthermagesTouch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/AzoriusHerald.java b/Mage.Sets/src/mage/sets/dissension/AzoriusHerald.java
index 5a50c60271..901958c473 100644
--- a/Mage.Sets/src/mage/sets/dissension/AzoriusHerald.java
+++ b/Mage.Sets/src/mage/sets/dissension/AzoriusHerald.java
@@ -37,7 +37,7 @@ public class AzoriusHerald extends mage.sets.commander2013.AzoriusHerald {
 
     public AzoriusHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/Condemn.java b/Mage.Sets/src/mage/sets/dissension/Condemn.java
index 6a135cf31e..177d8bf0b2 100644
--- a/Mage.Sets/src/mage/sets/dissension/Condemn.java
+++ b/Mage.Sets/src/mage/sets/dissension/Condemn.java
@@ -37,7 +37,7 @@ public class Condemn extends mage.sets.tenthedition.Condemn {
 
     public Condemn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/CourtHussar.java b/Mage.Sets/src/mage/sets/dissension/CourtHussar.java
index a442ad773d..0c415f64d4 100644
--- a/Mage.Sets/src/mage/sets/dissension/CourtHussar.java
+++ b/Mage.Sets/src/mage/sets/dissension/CourtHussar.java
@@ -37,7 +37,7 @@ public class CourtHussar extends mage.sets.commander.CourtHussar {
 
     public CourtHussar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/GhostQuarter.java b/Mage.Sets/src/mage/sets/dissension/GhostQuarter.java
index d9a0c657a4..0f40a3199e 100644
--- a/Mage.Sets/src/mage/sets/dissension/GhostQuarter.java
+++ b/Mage.Sets/src/mage/sets/dissension/GhostQuarter.java
@@ -37,7 +37,7 @@ public class GhostQuarter extends mage.sets.innistrad.GhostQuarter {
 
     public GhostQuarter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/GrandArbiterAugustinIV.java b/Mage.Sets/src/mage/sets/dissension/GrandArbiterAugustinIV.java
index a590ed9528..99c26a676f 100644
--- a/Mage.Sets/src/mage/sets/dissension/GrandArbiterAugustinIV.java
+++ b/Mage.Sets/src/mage/sets/dissension/GrandArbiterAugustinIV.java
@@ -37,7 +37,7 @@ public class GrandArbiterAugustinIV extends mage.sets.modernmasters.GrandArbiter
 
     public GrandArbiterAugustinIV(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/LeafdrakeRoost.java b/Mage.Sets/src/mage/sets/dissension/LeafdrakeRoost.java
index 78dfaa2df2..9e998bf4a7 100644
--- a/Mage.Sets/src/mage/sets/dissension/LeafdrakeRoost.java
+++ b/Mage.Sets/src/mage/sets/dissension/LeafdrakeRoost.java
@@ -37,7 +37,7 @@ public class LeafdrakeRoost extends mage.sets.commander2013.LeafdrakeRoost {
 
     public LeafdrakeRoost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/MacabreWaltz.java b/Mage.Sets/src/mage/sets/dissension/MacabreWaltz.java
index 96cccbcd3a..55970e3d15 100644
--- a/Mage.Sets/src/mage/sets/dissension/MacabreWaltz.java
+++ b/Mage.Sets/src/mage/sets/dissension/MacabreWaltz.java
@@ -38,7 +38,7 @@ public class MacabreWaltz extends mage.sets.magicorigins.MacabreWaltz {
 
     public MacabreWaltz(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/Overrule.java b/Mage.Sets/src/mage/sets/dissension/Overrule.java
index eca7ae0b9a..781b371bd2 100644
--- a/Mage.Sets/src/mage/sets/dissension/Overrule.java
+++ b/Mage.Sets/src/mage/sets/dissension/Overrule.java
@@ -37,7 +37,7 @@ public class Overrule extends mage.sets.venservskoth.Overrule {
 
     public Overrule(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/PaladinOfPrahv.java b/Mage.Sets/src/mage/sets/dissension/PaladinOfPrahv.java
index eeb45a44fa..318122b383 100644
--- a/Mage.Sets/src/mage/sets/dissension/PaladinOfPrahv.java
+++ b/Mage.Sets/src/mage/sets/dissension/PaladinOfPrahv.java
@@ -37,7 +37,7 @@ public class PaladinOfPrahv extends mage.sets.knightsvsdragons.PaladinOfPrahv {
 
     public PaladinOfPrahv(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/SealOfFire.java b/Mage.Sets/src/mage/sets/dissension/SealOfFire.java
index 376a7dbb85..14d26799d9 100644
--- a/Mage.Sets/src/mage/sets/dissension/SealOfFire.java
+++ b/Mage.Sets/src/mage/sets/dissension/SealOfFire.java
@@ -37,7 +37,7 @@ public class SealOfFire extends mage.sets.nemesis.SealOfFire {
 
     public SealOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/Skyscribing.java b/Mage.Sets/src/mage/sets/dissension/Skyscribing.java
index ee29a01610..fb7439f122 100644
--- a/Mage.Sets/src/mage/sets/dissension/Skyscribing.java
+++ b/Mage.Sets/src/mage/sets/dissension/Skyscribing.java
@@ -37,7 +37,7 @@ public class Skyscribing extends mage.sets.commander2013.Skyscribing {
 
     public Skyscribing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/StalkingVengeance.java b/Mage.Sets/src/mage/sets/dissension/StalkingVengeance.java
index d2accaeb64..6372d872e5 100644
--- a/Mage.Sets/src/mage/sets/dissension/StalkingVengeance.java
+++ b/Mage.Sets/src/mage/sets/dissension/StalkingVengeance.java
@@ -37,7 +37,7 @@ public class StalkingVengeance extends mage.sets.commander2013.StalkingVengeance
 
     public StalkingVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/Thrive.java b/Mage.Sets/src/mage/sets/dissension/Thrive.java
index 29ae0f7c6f..e6a8642ff4 100644
--- a/Mage.Sets/src/mage/sets/dissension/Thrive.java
+++ b/Mage.Sets/src/mage/sets/dissension/Thrive.java
@@ -37,7 +37,7 @@ public class Thrive extends mage.sets.prophecy.Thrive {
 
     public Thrive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/TrygonPredator.java b/Mage.Sets/src/mage/sets/dissension/TrygonPredator.java
index 036ff2e5a2..a4ee40606f 100644
--- a/Mage.Sets/src/mage/sets/dissension/TrygonPredator.java
+++ b/Mage.Sets/src/mage/sets/dissension/TrygonPredator.java
@@ -37,7 +37,7 @@ public class TrygonPredator extends mage.sets.modernmasters.TrygonPredator {
 
     public TrygonPredator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/ValorMadeReal.java b/Mage.Sets/src/mage/sets/dissension/ValorMadeReal.java
index 18b8e5b602..59ab9759bd 100644
--- a/Mage.Sets/src/mage/sets/dissension/ValorMadeReal.java
+++ b/Mage.Sets/src/mage/sets/dissension/ValorMadeReal.java
@@ -37,7 +37,7 @@ public class ValorMadeReal extends mage.sets.conspiracy.ValorMadeReal {
 
     public ValorMadeReal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/VisionSkeins.java b/Mage.Sets/src/mage/sets/dissension/VisionSkeins.java
index 67a543872d..929c8618a4 100644
--- a/Mage.Sets/src/mage/sets/dissension/VisionSkeins.java
+++ b/Mage.Sets/src/mage/sets/dissension/VisionSkeins.java
@@ -37,7 +37,7 @@ public class VisionSkeins extends mage.sets.commander2013.VisionSkeins {
 
     public VisionSkeins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/WakestoneGargoyle.java b/Mage.Sets/src/mage/sets/dissension/WakestoneGargoyle.java
index f5a41c37b0..ce7e36798d 100644
--- a/Mage.Sets/src/mage/sets/dissension/WakestoneGargoyle.java
+++ b/Mage.Sets/src/mage/sets/dissension/WakestoneGargoyle.java
@@ -38,7 +38,7 @@ public class WakestoneGargoyle extends mage.sets.conspiracy.WakestoneGargoyle {
 
     public WakestoneGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DIS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/dissension/WitsEnd.java b/Mage.Sets/src/mage/sets/dissension/WitsEnd.java
index 01542da36e..3344a29571 100644
--- a/Mage.Sets/src/mage/sets/dissension/WitsEnd.java
+++ b/Mage.Sets/src/mage/sets/dissension/WitsEnd.java
@@ -37,7 +37,7 @@ public class WitsEnd extends mage.sets.magic2013.WitsEnd {
 
     public WitsEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/WreckingBall.java b/Mage.Sets/src/mage/sets/dissension/WreckingBall.java
index 693fccd626..6ad7575031 100644
--- a/Mage.Sets/src/mage/sets/dissension/WreckingBall.java
+++ b/Mage.Sets/src/mage/sets/dissension/WreckingBall.java
@@ -38,7 +38,7 @@ public class WreckingBall extends mage.sets.commander.WreckingBall {
 
     public WreckingBall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "DIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AbyssalSpecter.java
index 6d3a71b2c1..a1abd0b1c9 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AbyssalSpecter.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AbyssalSpecter.java
@@ -37,7 +37,7 @@ public class AbyssalSpecter extends mage.sets.fifthedition.AbyssalSpecter {
 
     public AbyssalSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AkromaAngelOfWrath.java
index f6561b1372..85a257b004 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AkromaAngelOfWrath.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AkromaAngelOfWrath.java
@@ -38,7 +38,7 @@ public class AkromaAngelOfWrath extends mage.sets.timeshifted.AkromaAngelOfWrath
 
     public AkromaAngelOfWrath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDC";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelOfMercy.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelOfMercy.java
index 32c1aa67c9..ce9c2494af 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicBenediction.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicBenediction.java
index 36f2c41b38..51fa185041 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicBenediction.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicBenediction.java
@@ -37,7 +37,7 @@ public class AngelicBenediction extends mage.sets.shardsofalara.AngelicBenedicti
 
     public AngelicBenediction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicPage.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicPage.java
index 0f926d33b5..c2e7ba45b5 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicPage.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicPage.java
@@ -37,7 +37,7 @@ public class AngelicPage extends mage.sets.urzassaga.AngelicPage {
 
     public AngelicPage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicProtector.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicProtector.java
index cda8c5a08f..273766e580 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicProtector.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelicProtector.java
@@ -37,7 +37,7 @@ public class AngelicProtector extends mage.sets.tempest.AngelicProtector {
 
     public AngelicProtector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelsFeather.java b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelsFeather.java
index b431713802..ddbaace88a 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/AngelsFeather.java
@@ -37,7 +37,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/Angelsong.java b/Mage.Sets/src/mage/sets/divinevsdemonic/Angelsong.java
index 6153a758a2..bae015ce94 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/Angelsong.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/Angelsong.java
@@ -37,7 +37,7 @@ public class Angelsong extends mage.sets.shardsofalara.Angelsong {
 
     public Angelsong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/BarrenMoor.java b/Mage.Sets/src/mage/sets/divinevsdemonic/BarrenMoor.java
index 4114e8d267..64441d298e 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/BarterInBlood.java b/Mage.Sets/src/mage/sets/divinevsdemonic/BarterInBlood.java
index f3926c6946..15fb648911 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/BarterInBlood.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/BarterInBlood.java
@@ -37,7 +37,7 @@ public class BarterInBlood extends mage.sets.avacynrestored.BarterInBlood {
 
     public BarterInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/BreedingPit.java b/Mage.Sets/src/mage/sets/divinevsdemonic/BreedingPit.java
index 41bb9ffa22..fd58758208 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/BreedingPit.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/BreedingPit.java
@@ -37,7 +37,7 @@ public class BreedingPit extends mage.sets.fifthedition.BreedingPit {
 
     public BreedingPit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/divinevsdemonic/ConsumeSpirit.java
index 714b9fbdab..44fb0e65c3 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/ConsumeSpirit.java
@@ -37,7 +37,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/Corrupt.java b/Mage.Sets/src/mage/sets/divinevsdemonic/Corrupt.java
index 9f45963979..66c4d0f884 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/Corrupt.java
@@ -37,7 +37,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/CruelEdict.java b/Mage.Sets/src/mage/sets/divinevsdemonic/CruelEdict.java
index 3cf0db0c89..b0c2773057 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/CruelEdict.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/CruelEdict.java
@@ -37,7 +37,7 @@ public class CruelEdict extends mage.sets.tenthedition.CruelEdict {
 
     public CruelEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DaggerclawImp.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DaggerclawImp.java
index d2cc3e084e..45f9d9f1d9 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DaggerclawImp.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DaggerclawImp.java
@@ -37,7 +37,7 @@ public class DaggerclawImp extends mage.sets.guildpact.DaggerclawImp {
 
     public DaggerclawImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DarkBanishing.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DarkBanishing.java
index a8aba95d06..caecb638d5 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DarkRitual.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DarkRitual.java
index 4237527a9c..0f1b323471 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DemonicTutor.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DemonicTutor.java
index 360a13ce01..35f8449a54 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DemonicTutor.java
@@ -37,7 +37,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsHorn.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsHorn.java
index 45262459ca..3c8dc4ad70 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsHorn.java
@@ -37,7 +37,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsJester.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsJester.java
index 38a8cfe66d..98d1492d1c 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsJester.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DemonsJester.java
@@ -37,7 +37,7 @@ public class DemonsJester extends mage.sets.dissension.DemonsJester {
 
     public DemonsJester(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/Duress.java b/Mage.Sets/src/mage/sets/divinevsdemonic/Duress.java
index c1a74ee9f5..dc9d65404b 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/Duress.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/DuskImp.java b/Mage.Sets/src/mage/sets/divinevsdemonic/DuskImp.java
index 1184a2d17d..987b5c5543 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/DuskImp.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/DuskImp.java
@@ -37,7 +37,7 @@ public class DuskImp extends mage.sets.tenthedition.DuskImp {
 
     public DuskImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/FallenAngel.java b/Mage.Sets/src/mage/sets/divinevsdemonic/FallenAngel.java
index 954aed8712..30056df2ad 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/FallenAngel.java
@@ -37,7 +37,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/FoulImp.java b/Mage.Sets/src/mage/sets/divinevsdemonic/FoulImp.java
index a8f28604bc..e27b18c313 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/FoulImp.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/FoulImp.java
@@ -37,7 +37,7 @@ public class FoulImp extends mage.sets.stronghold.FoulImp {
 
     public FoulImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/HealingSalve.java b/Mage.Sets/src/mage/sets/divinevsdemonic/HealingSalve.java
index 09aa56c042..6f89a757e9 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/IcatianPriest.java b/Mage.Sets/src/mage/sets/divinevsdemonic/IcatianPriest.java
index 6875693249..ccf59b3a30 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/IcatianPriest.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/IcatianPriest.java
@@ -37,7 +37,7 @@ public class IcatianPriest extends mage.sets.tenthedition.IcatianPriest {
 
     public IcatianPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/KuroPitlord.java b/Mage.Sets/src/mage/sets/divinevsdemonic/KuroPitlord.java
index ba517ce71b..af373a654d 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/KuroPitlord.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/KuroPitlord.java
@@ -37,7 +37,7 @@ public class KuroPitlord extends mage.sets.championsofkamigawa.KuroPitlord {
 
     public KuroPitlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/LuminousAngel.java b/Mage.Sets/src/mage/sets/divinevsdemonic/LuminousAngel.java
index e41d57a645..d107d020bf 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/LuminousAngel.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/LuminousAngel.java
@@ -37,7 +37,7 @@ public class LuminousAngel extends mage.sets.mirrodin.LuminousAngel {
 
     public LuminousAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/MarbleDiamond.java b/Mage.Sets/src/mage/sets/divinevsdemonic/MarbleDiamond.java
index 9c61c81910..8dc08731c5 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/MarbleDiamond.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/MarbleDiamond.java
@@ -37,7 +37,7 @@ public class MarbleDiamond extends mage.sets.seventhedition.MarbleDiamond {
 
     public MarbleDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/OniPossession.java b/Mage.Sets/src/mage/sets/divinevsdemonic/OniPossession.java
index fb031840d4..a56414e404 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/OniPossession.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/OniPossession.java
@@ -37,7 +37,7 @@ public class OniPossession extends mage.sets.championsofkamigawa.OniPossession {
 
     public OniPossession(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/divinevsdemonic/OtherworldlyJourney.java
index 9cf7b9340f..b9dda952c5 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/OtherworldlyJourney.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/OtherworldlyJourney.java
@@ -37,7 +37,7 @@ public class OtherworldlyJourney extends mage.sets.championsofkamigawa.Otherworl
 
     public OtherworldlyJourney(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/OvereagerApprentice.java b/Mage.Sets/src/mage/sets/divinevsdemonic/OvereagerApprentice.java
index 0d0d04f0dd..317c9c4d20 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/OvereagerApprentice.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/OvereagerApprentice.java
@@ -37,7 +37,7 @@ public class OvereagerApprentice extends mage.sets.odyssey.OvereagerApprentice {
 
     public OvereagerApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/Pacifism.java b/Mage.Sets/src/mage/sets/divinevsdemonic/Pacifism.java
index bec9eb0aaf..619b3f60c2 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/PromiseOfPower.java b/Mage.Sets/src/mage/sets/divinevsdemonic/PromiseOfPower.java
index 848c94397e..4ab202c36e 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/PromiseOfPower.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/PromiseOfPower.java
@@ -37,7 +37,7 @@ public class PromiseOfPower extends mage.sets.commander2014.PromiseOfPower {
 
     public PromiseOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/divinevsdemonic/ReyaDawnbringer.java
index 5cb977309c..9d668fb05a 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/ReyaDawnbringer.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/ReyaDawnbringer.java
@@ -37,7 +37,7 @@ public class ReyaDawnbringer extends mage.sets.tenthedition.ReyaDawnbringer {
 
     public ReyaDawnbringer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/RighteousCause.java b/Mage.Sets/src/mage/sets/divinevsdemonic/RighteousCause.java
index d014304f86..7ab5d0f5be 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/RighteousCause.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/RighteousCause.java
@@ -37,7 +37,7 @@ public class RighteousCause extends mage.sets.commander.RighteousCause {
 
     public RighteousCause(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SecludedSteppe.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SecludedSteppe.java
index 0fdd5df6e0..a3cb900bf3 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAdvocate.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAdvocate.java
index 61482eb9f0..e5b5e7bbe3 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAdvocate.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAdvocate.java
@@ -37,7 +37,7 @@ public class SerraAdvocate extends mage.sets.urzasdestiny.SerraAdvocate {
 
     public SerraAdvocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAngel.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAngel.java
index 1558870dc7..92b5e9ccdc 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SerraAngel.java
@@ -37,7 +37,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasEmbrace.java
index 2b17690fa0..c602d159ca 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasEmbrace.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasEmbrace.java
@@ -37,7 +37,7 @@ public class SerrasEmbrace extends mage.sets.tenthedition.SerrasEmbrace {
 
     public SerrasEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SootImp.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SootImp.java
index a39ca8aac7..d4531aadc9 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/SootImp.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SootImp.java
@@ -37,7 +37,7 @@ public class SootImp extends mage.sets.eventide.SootImp {
 
     public SootImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/Souldrinker.java b/Mage.Sets/src/mage/sets/divinevsdemonic/Souldrinker.java
index 8df7b97bf8..96e766f3c1 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/Souldrinker.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/Souldrinker.java
@@ -37,7 +37,7 @@ public class Souldrinker extends mage.sets.tempest.Souldrinker {
 
     public Souldrinker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/StinkweedImp.java b/Mage.Sets/src/mage/sets/divinevsdemonic/StinkweedImp.java
index 7077dd3ca0..296c9eee95 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/StinkweedImp.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/StinkweedImp.java
@@ -37,7 +37,7 @@ public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
 
     public StinkweedImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SustainerOfTheRealm.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SustainerOfTheRealm.java
index ae81b33ffa..32e9d3e3ce 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/SustainerOfTheRealm.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SustainerOfTheRealm.java
@@ -37,7 +37,7 @@ public class SustainerOfTheRealm extends mage.sets.urzaslegacy.SustainerOfTheRea
 
     public SustainerOfTheRealm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/TwilightShepherd.java b/Mage.Sets/src/mage/sets/divinevsdemonic/TwilightShepherd.java
index 6485f4d3e1..773c5aaafd 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/TwilightShepherd.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/TwilightShepherd.java
@@ -37,7 +37,7 @@ public class TwilightShepherd extends mage.sets.shadowmoor.TwilightShepherd {
 
     public TwilightShepherd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/UnholyStrength.java b/Mage.Sets/src/mage/sets/divinevsdemonic/UnholyStrength.java
index 71da118a92..747bfce1bd 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/VenerableMonk.java b/Mage.Sets/src/mage/sets/divinevsdemonic/VenerableMonk.java
index 95939a2949..05a00a0d79 100644
--- a/Mage.Sets/src/mage/sets/divinevsdemonic/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/divinevsdemonic/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusGuildgate.java
index fa3282685d..6670cd278e 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusGuildgate.java
@@ -37,7 +37,7 @@ public class AzoriusGuildgate extends mage.sets.returntoravnica.AzoriusGuildgate
 
     public AzoriusGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BorosGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/BorosGuildgate.java
index 210b710240..d1b0384602 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/BorosGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/BorosGuildgate.java
@@ -37,7 +37,7 @@ public class BorosGuildgate extends mage.sets.gatecrash.BorosGuildgate {
 
     public BorosGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DimirGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/DimirGuildgate.java
index d99f65cb27..4ab16e6744 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/DimirGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/DimirGuildgate.java
@@ -37,7 +37,7 @@ public class DimirGuildgate extends mage.sets.gatecrash.DimirGuildgate {
 
     public DimirGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FeralAnimist.java b/Mage.Sets/src/mage/sets/dragonsmaze/FeralAnimist.java
index 9dc91842ac..9705bd1516 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/FeralAnimist.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/FeralAnimist.java
@@ -37,7 +37,7 @@ public class FeralAnimist extends mage.sets.guildpact.FeralAnimist {
 
     public FeralAnimist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GolgariGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/GolgariGuildgate.java
index 6576d7af0f..5894cb2f49 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/GolgariGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/GolgariGuildgate.java
@@ -37,7 +37,7 @@ public class GolgariGuildgate extends mage.sets.returntoravnica.GolgariGuildgate
 
     public GolgariGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GruulGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/GruulGuildgate.java
index 175480f4dc..b58e2a8ad8 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/GruulGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/GruulGuildgate.java
@@ -37,7 +37,7 @@ public class GruulGuildgate extends mage.sets.gatecrash.GruulGuildgate {
 
     public GruulGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/IzzetGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/IzzetGuildgate.java
index 49fac125dd..06356bc95d 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/IzzetGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/IzzetGuildgate.java
@@ -37,7 +37,7 @@ public class IzzetGuildgate extends mage.sets.returntoravnica.IzzetGuildgate {
 
     public IzzetGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovGuildgate.java
index f4e841922a..bd8109bf5a 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovGuildgate.java
@@ -37,7 +37,7 @@ public class OrzhovGuildgate extends mage.sets.gatecrash.OrzhovGuildgate {
 
     public OrzhovGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Putrefy.java b/Mage.Sets/src/mage/sets/dragonsmaze/Putrefy.java
index fc4b9ca8f6..f63c593b05 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/Putrefy.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/Putrefy.java
@@ -37,7 +37,7 @@ public class Putrefy extends mage.sets.ravnica.Putrefy {
 
     public Putrefy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosGuildgate.java
index 77c18d9009..c909b12d7a 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosGuildgate.java
@@ -37,7 +37,7 @@ public class RakdosGuildgate extends mage.sets.returntoravnica.RakdosGuildgate {
 
     public RakdosGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaGuildgate.java
index f2e6c6df44..3612c9e4d0 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaGuildgate.java
@@ -37,7 +37,7 @@ public class SelesnyaGuildgate extends mage.sets.returntoravnica.SelesnyaGuildga
 
     public SelesnyaGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SimicGuildgate.java b/Mage.Sets/src/mage/sets/dragonsmaze/SimicGuildgate.java
index 804581a3d3..30843b32f8 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/SimicGuildgate.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/SimicGuildgate.java
@@ -37,7 +37,7 @@ public class SimicGuildgate extends mage.sets.gatecrash.SimicGuildgate {
 
     public SimicGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WindDrake.java b/Mage.Sets/src/mage/sets/dragonsmaze/WindDrake.java
index 04014ac9c7..37070e0bd4 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DGM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/BattleMastery.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/BattleMastery.java
index 8b71c20fa2..603cebd479 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/BattleMastery.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/BattleMastery.java
@@ -37,7 +37,7 @@ public class BattleMastery extends mage.sets.lorwyn.BattleMastery {
 
     public BattleMastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathWind.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathWind.java
index c6ed33ec34..83451d3c57 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathWind.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathWind.java
@@ -38,7 +38,7 @@ public class DeathWind extends mage.sets.avacynrestored.DeathWind {
 
     public DeathWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "DTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/DragonFodder.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/DragonFodder.java
index c7cc138106..5c747c1520 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/DragonFodder.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/DragonFodder.java
@@ -37,7 +37,7 @@ public class DragonFodder extends mage.sets.shardsofalara.DragonFodder {
 
     public DragonFodder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/Duress.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/Duress.java
index f722c04e80..f21b4b2058 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/Duress.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/EvolvingWilds.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/EvolvingWilds.java
index ed6cac02b4..40e9cef715 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/ExplosiveVegetation.java
index fdf63cbf48..0c980295ab 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/ExplosiveVegetation.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/ExplosiveVegetation.java
@@ -37,7 +37,7 @@ public class ExplosiveVegetation extends mage.sets.planechase.ExplosiveVegetatio
 
     public ExplosiveVegetation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/Gravepurge.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/Gravepurge.java
index bc4bf2aef0..626157b605 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/Gravepurge.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/Gravepurge.java
@@ -37,7 +37,7 @@ public class Gravepurge extends mage.sets.darkascension.Gravepurge {
 
     public Gravepurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/KindledFury.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/KindledFury.java
index a8558c00dc..63d36422a5 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/KindledFury.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/KindledFury.java
@@ -37,7 +37,7 @@ public class KindledFury extends mage.sets.magic2010.KindledFury {
 
     public KindledFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/MindRot.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/MindRot.java
index d9953a9ebe..25cff85505 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/MindRot.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/Naturalize.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/Naturalize.java
index 8fea0d82e6..ae64732501 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/Negate.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/Negate.java
index d46f53a41d..cc5c9ae88c 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/Negate.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/Pacifism.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/Pacifism.java
index 64ef63f5d9..f655057181 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/ScaleguardSentinels.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/ScaleguardSentinels.java
index 9e69264bc5..0013e35b01 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/ScaleguardSentinels.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/ScaleguardSentinels.java
@@ -37,7 +37,7 @@ public class ScaleguardSentinels extends mage.sets.gameday.ScaleguardSentinels {
 
     public ScaleguardSentinels(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/SpidersilkNet.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/SpidersilkNet.java
index e856845d5c..37fd3db24c 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/SpidersilkNet.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/SpidersilkNet.java
@@ -37,7 +37,7 @@ public class SpidersilkNet extends mage.sets.zendikar.SpidersilkNet {
 
     public SpidersilkNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/SummitProwler.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/SummitProwler.java
index 8c6ea4bd33..fea5ad8bf6 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/SummitProwler.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/SummitProwler.java
@@ -37,7 +37,7 @@ public class SummitProwler extends mage.sets.khansoftarkir.SummitProwler {
 
     public SummitProwler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/ThunderbreakRegent.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/ThunderbreakRegent.java
index b1f4a34a5c..23865654c8 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/ThunderbreakRegent.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/ThunderbreakRegent.java
@@ -37,7 +37,7 @@ public class ThunderbreakRegent extends mage.sets.gameday.ThunderbreakRegent {
 
     public ThunderbreakRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/TormentingVoice.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/TormentingVoice.java
index 54ceeb9305..e709c90113 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/TormentingVoice.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/TormentingVoice.java
@@ -37,7 +37,7 @@ public class TormentingVoice extends mage.sets.khansoftarkir.TormentingVoice {
 
     public TormentingVoice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/UltimatePrice.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/UltimatePrice.java
index 1f727d6854..6942271e95 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/UltimatePrice.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/UltimatePrice.java
@@ -37,7 +37,7 @@ public class UltimatePrice extends mage.sets.returntoravnica.UltimatePrice {
 
     public UltimatePrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "DTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/duelsoftheplaneswalkers/TheRack.java b/Mage.Sets/src/mage/sets/duelsoftheplaneswalkers/TheRack.java
index 6001addd77..ba403dc2db 100644
--- a/Mage.Sets/src/mage/sets/duelsoftheplaneswalkers/TheRack.java
+++ b/Mage.Sets/src/mage/sets/duelsoftheplaneswalkers/TheRack.java
@@ -38,7 +38,7 @@ public class TheRack extends mage.sets.fourthedition.TheRack {
 
     public TheRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "DPA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/eighthedition/AbyssalSpecter.java
index 108077eb9e..a33cc5bf26 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AbyssalSpecter.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AbyssalSpecter.java
@@ -37,7 +37,7 @@ public class AbyssalSpecter extends mage.sets.fifthedition.AbyssalSpecter {
 
     public AbyssalSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AirElemental.java b/Mage.Sets/src/mage/sets/eighthedition/AirElemental.java
index ce1d983115..67990232ed 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/eighthedition/AladdinsRing.java
index c39087ff57..06c7ea0dff 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AnabaShaman.java b/Mage.Sets/src/mage/sets/eighthedition/AnabaShaman.java
index 09e2bb02d7..e0744516c5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AnabaShaman.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AnabaShaman.java
@@ -37,7 +37,7 @@ public class AnabaShaman extends mage.sets.ninthedition.AnabaShaman {
 
     public AnabaShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AngelOfMercy.java b/Mage.Sets/src/mage/sets/eighthedition/AngelOfMercy.java
index 24ad0fa3f1..49b27a5173 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AngelicPage.java b/Mage.Sets/src/mage/sets/eighthedition/AngelicPage.java
index 410ff8875b..5a6eed5a8a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AngelicPage.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AngelicPage.java
@@ -37,7 +37,7 @@ public class AngelicPage extends mage.sets.urzassaga.AngelicPage {
 
     public AngelicPage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Archivist.java b/Mage.Sets/src/mage/sets/eighthedition/Archivist.java
index 0828f9ee40..9da6ce9aa8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Archivist.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Archivist.java
@@ -37,7 +37,7 @@ public class Archivist extends mage.sets.urzaslegacy.Archivist {
 
     public Archivist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AvatarOfHope.java b/Mage.Sets/src/mage/sets/eighthedition/AvatarOfHope.java
index 1ec391c0de..05c4d0009d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AvatarOfHope.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AvatarOfHope.java
@@ -37,7 +37,7 @@ public class AvatarOfHope extends mage.sets.prophecy.AvatarOfHope {
 
     public AvatarOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/eighthedition/AvenCloudchaser.java
index cac84742da..4c39e48ae8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AvenCloudchaser.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AvenCloudchaser.java
@@ -37,7 +37,7 @@ public class AvenCloudchaser extends mage.sets.tenthedition.AvenCloudchaser {
 
     public AvenCloudchaser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AvenFisher.java b/Mage.Sets/src/mage/sets/eighthedition/AvenFisher.java
index ca044eb7c5..69e2f88847 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AvenFisher.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AvenFisher.java
@@ -37,7 +37,7 @@ public class AvenFisher extends mage.sets.tenthedition.AvenFisher {
 
     public AvenFisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/AvenFlock.java b/Mage.Sets/src/mage/sets/eighthedition/AvenFlock.java
index 8a8a37fd01..0c03178404 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/AvenFlock.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/AvenFlock.java
@@ -37,7 +37,7 @@ public class AvenFlock extends mage.sets.ninthedition.AvenFlock {
 
     public AvenFlock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/eighthedition/BalduvianBarbarians.java
index 6302d70a89..e086c36056 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BalduvianBarbarians.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BalduvianBarbarians.java
@@ -37,7 +37,7 @@ public class BalduvianBarbarians extends mage.sets.ninthedition.BalduvianBarbari
 
     public BalduvianBarbarians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BeastOfBurden.java b/Mage.Sets/src/mage/sets/eighthedition/BeastOfBurden.java
index af66eb6c18..a09dbd5e2e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BeastOfBurden.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BeastOfBurden.java
@@ -37,7 +37,7 @@ public class BeastOfBurden extends mage.sets.ninthedition.BeastOfBurden {
 
     public BeastOfBurden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/eighthedition/BirdsOfParadise.java
index 1fe50bd534..e1acb20bad 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/eighthedition/BlanchwoodArmor.java
index 6dad49dfd0..199eda8d29 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BlanchwoodArmor.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BlanchwoodArmor.java
@@ -37,7 +37,7 @@ public class BlanchwoodArmor extends mage.sets.tenthedition.BlanchwoodArmor {
 
     public BlanchwoodArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Blaze.java b/Mage.Sets/src/mage/sets/eighthedition/Blaze.java
index f84c2e5f9d..41be6e108d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Blaze.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BlessedReversal.java b/Mage.Sets/src/mage/sets/eighthedition/BlessedReversal.java
index 9aedd310f8..1c230ea8d2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BlessedReversal.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BlessedReversal.java
@@ -37,7 +37,7 @@ public class BlessedReversal extends mage.sets.urzaslegacy.BlessedReversal {
 
     public BlessedReversal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BlindingAngel.java b/Mage.Sets/src/mage/sets/eighthedition/BlindingAngel.java
index 020c3854d4..0c657eaab4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BlindingAngel.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BlindingAngel.java
@@ -37,7 +37,7 @@ public class BlindingAngel extends mage.sets.nemesis.BlindingAngel {
 
     public BlindingAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BloodMoon.java b/Mage.Sets/src/mage/sets/eighthedition/BloodMoon.java
index 40ba1ef9e5..ac33eedb31 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BloodMoon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BloodMoon.java
@@ -37,7 +37,7 @@ public class BloodMoon extends mage.sets.ninthedition.BloodMoon {
 
     public BloodMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BloodshotCyclops.java b/Mage.Sets/src/mage/sets/eighthedition/BloodshotCyclops.java
index 6aebd3228c..cb6b5af030 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BloodshotCyclops.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BloodshotCyclops.java
@@ -37,7 +37,7 @@ public class BloodshotCyclops extends mage.sets.urzasdestiny.BloodshotCyclops {
 
     public BloodshotCyclops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BogImp.java b/Mage.Sets/src/mage/sets/eighthedition/BogImp.java
index ed6f250cf5..7fc115ea51 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BogImp.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BogWraith.java b/Mage.Sets/src/mage/sets/eighthedition/BogWraith.java
index 0ec36ba76b..13e2e286b6 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Boil.java b/Mage.Sets/src/mage/sets/eighthedition/Boil.java
index 347a0c4eed..8ab0a38d48 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Boil.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Boil.java
@@ -37,7 +37,7 @@ public class Boil extends mage.sets.tempest.Boil {
 
     public Boil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Boomerang.java b/Mage.Sets/src/mage/sets/eighthedition/Boomerang.java
index dcf22dc3b8..7d5211b905 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/BrassHerald.java b/Mage.Sets/src/mage/sets/eighthedition/BrassHerald.java
index f691367892..4b5197383e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/BrassHerald.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/BrassHerald.java
@@ -38,7 +38,7 @@ public class BrassHerald extends mage.sets.apocalypse.BrassHerald {
 
     public BrassHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Bribery.java b/Mage.Sets/src/mage/sets/eighthedition/Bribery.java
index f906565f13..4ab918021b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Bribery.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Bribery.java
@@ -37,7 +37,7 @@ public class Bribery extends mage.sets.mercadianmasques.Bribery {
 
     public Bribery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CallOfTheWild.java b/Mage.Sets/src/mage/sets/eighthedition/CallOfTheWild.java
index feb93b5c44..4a5e7d7a9f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CallOfTheWild.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CallOfTheWild.java
@@ -37,7 +37,7 @@ public class CallOfTheWild extends mage.sets.weatherlight.CallOfTheWild {
 
     public CallOfTheWild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CanopySpider.java b/Mage.Sets/src/mage/sets/eighthedition/CanopySpider.java
index 8ae5fbf14c..92e6a6474b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CanopySpider.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CanopySpider.java
@@ -37,7 +37,7 @@ public class CanopySpider extends mage.sets.tempest.CanopySpider {
 
     public CanopySpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CanyonWildcat.java b/Mage.Sets/src/mage/sets/eighthedition/CanyonWildcat.java
index 767d36c3a6..b1e5cf9f10 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CanyonWildcat.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CanyonWildcat.java
@@ -37,7 +37,7 @@ public class CanyonWildcat extends mage.sets.tempest.CanyonWildcat {
 
     public CanyonWildcat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CarrionWall.java b/Mage.Sets/src/mage/sets/eighthedition/CarrionWall.java
index 1906e0a039..56def69b46 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CarrionWall.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CarrionWall.java
@@ -37,7 +37,7 @@ public class CarrionWall extends mage.sets.nemesis.CarrionWall {
 
     public CarrionWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Catalog.java b/Mage.Sets/src/mage/sets/eighthedition/Catalog.java
index 10c6c60d6f..bf397ccdb3 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Catalog.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Catalog.java
@@ -37,7 +37,7 @@ public class Catalog extends mage.sets.urzassaga.Catalog {
 
     public Catalog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Chastise.java b/Mage.Sets/src/mage/sets/eighthedition/Chastise.java
index ffe26e46f2..8b516e6e47 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Chastise.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Chastise.java
@@ -37,7 +37,7 @@ public class Chastise extends mage.sets.ninthedition.Chastise {
 
     public Chastise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Choke.java b/Mage.Sets/src/mage/sets/eighthedition/Choke.java
index 0c8a312290..758ad33b5b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Choke.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Choke.java
@@ -37,7 +37,7 @@ public class Choke extends mage.sets.tempest.Choke {
 
     public Choke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CinderWall.java b/Mage.Sets/src/mage/sets/eighthedition/CinderWall.java
index 1429919339..9c83c03dcd 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CinderWall.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CinderWall.java
@@ -37,7 +37,7 @@ public class CinderWall extends mage.sets.knightsvsdragons.CinderWall {
 
     public CinderWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java
index e8ca1d0af3..85a42f5d48 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java
index 086fa62f03..25a6977d0f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java
index ad80a260d8..18e213b59e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java
index 1790439b1d..65ac751060 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java
index ffb2ebbad1..afab365d23 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CityOfBrass.java b/Mage.Sets/src/mage/sets/eighthedition/CityOfBrass.java
index 1abb5206ca..ccf5807704 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CityOfBrass.java
@@ -37,7 +37,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CoastalHornclaw.java b/Mage.Sets/src/mage/sets/eighthedition/CoastalHornclaw.java
index c52dcdba66..7cc68125ea 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CoastalHornclaw.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CoastalHornclaw.java
@@ -37,7 +37,7 @@ public class CoastalHornclaw extends mage.sets.prophecy.CoastalHornclaw {
 
     public CoastalHornclaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CoastalPiracy.java b/Mage.Sets/src/mage/sets/eighthedition/CoastalPiracy.java
index 25ce5da873..b3bd32beb8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CoastalPiracy.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CoastalPiracy.java
@@ -38,7 +38,7 @@ public class CoastalPiracy extends mage.sets.mercadianmasques.CoastalPiracy {
 
     public CoastalPiracy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CoastalTower.java b/Mage.Sets/src/mage/sets/eighthedition/CoastalTower.java
index b829d7ae79..d2addf7bf6 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CoastalTower.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CoastalTower.java
@@ -37,7 +37,7 @@ public class CoastalTower extends mage.sets.invasion.CoastalTower {
 
     public CoastalTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CoatOfArms.java b/Mage.Sets/src/mage/sets/eighthedition/CoatOfArms.java
index 18e80556ad..e0dd1dee50 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Coercion.java b/Mage.Sets/src/mage/sets/eighthedition/Coercion.java
index d82b88c921..f213f03d29 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Coercion.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Coercion.java
@@ -37,7 +37,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CollectiveUnconscious.java b/Mage.Sets/src/mage/sets/eighthedition/CollectiveUnconscious.java
index 36fe9244f3..9d0f3544a5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CollectiveUnconscious.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CollectiveUnconscious.java
@@ -37,7 +37,7 @@ public class CollectiveUnconscious extends mage.sets.mercadianmasques.Collective
 
     public CollectiveUnconscious(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Concentrate.java b/Mage.Sets/src/mage/sets/eighthedition/Concentrate.java
index 796e81ac57..a708a3121f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Concentrate.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Concentrate.java
@@ -37,7 +37,7 @@ public class Concentrate extends mage.sets.odyssey.Concentrate {
 
     public Concentrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Confiscate.java b/Mage.Sets/src/mage/sets/eighthedition/Confiscate.java
index 697a8b500a..5082fd712d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Confiscate.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Confiscate.java
@@ -37,7 +37,7 @@ public class Confiscate extends mage.sets.urzassaga.Confiscate {
 
     public Confiscate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Cowardice.java b/Mage.Sets/src/mage/sets/eighthedition/Cowardice.java
index 56e1454c23..6de9be3d91 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Cowardice.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Cowardice.java
@@ -37,7 +37,7 @@ public class Cowardice extends mage.sets.ninthedition.Cowardice {
 
     public Cowardice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CrawWurm.java b/Mage.Sets/src/mage/sets/eighthedition/CrawWurm.java
index 852439fd32..3f794db989 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CreepingMold.java b/Mage.Sets/src/mage/sets/eighthedition/CreepingMold.java
index 71abc8e6c1..fe4e3c6f5a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CreepingMold.java
@@ -37,7 +37,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CrossbowInfantry.java b/Mage.Sets/src/mage/sets/eighthedition/CrossbowInfantry.java
index a7e9030c89..6c0f09bfad 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CrossbowInfantry.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CrossbowInfantry.java
@@ -37,7 +37,7 @@ public class CrossbowInfantry extends mage.sets.ninthedition.CrossbowInfantry {
 
     public CrossbowInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/CrystalRod.java b/Mage.Sets/src/mage/sets/eighthedition/CrystalRod.java
index 375771e2cb..1a47259d58 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Curiosity.java b/Mage.Sets/src/mage/sets/eighthedition/Curiosity.java
index aa93a3a72e..c7faf4a28c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Curiosity.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Curiosity.java
@@ -37,7 +37,7 @@ public class Curiosity extends mage.sets.innistrad.Curiosity {
 
     public Curiosity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DaringApprentice.java b/Mage.Sets/src/mage/sets/eighthedition/DaringApprentice.java
index e1ff0eabba..b7473bc531 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DaringApprentice.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DaringApprentice.java
@@ -37,7 +37,7 @@ public class DaringApprentice extends mage.sets.ninthedition.DaringApprentice {
 
     public DaringApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DarkBanishing.java b/Mage.Sets/src/mage/sets/eighthedition/DarkBanishing.java
index d8e59dfae0..eb6f14f967 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DeathPitOffering.java b/Mage.Sets/src/mage/sets/eighthedition/DeathPitOffering.java
index 9e11096f86..6cf34de9b3 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DeathPitOffering.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DeathPitOffering.java
@@ -37,7 +37,7 @@ public class DeathPitOffering extends mage.sets.nemesis.DeathPitOffering {
 
     public DeathPitOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DeathPitsOfRath.java b/Mage.Sets/src/mage/sets/eighthedition/DeathPitsOfRath.java
index 4dbbd8fb83..d4062da18b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DeathPitsOfRath.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DeathPitsOfRath.java
@@ -37,7 +37,7 @@ public class DeathPitsOfRath extends mage.sets.tempest.DeathPitsOfRath {
 
     public DeathPitsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Deathgazer.java b/Mage.Sets/src/mage/sets/eighthedition/Deathgazer.java
index 27da8a25cc..8c58490f87 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Deathgazer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Deathgazer.java
@@ -37,7 +37,7 @@ public class Deathgazer extends mage.sets.ninthedition.Deathgazer {
 
     public Deathgazer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DeepwoodGhoul.java b/Mage.Sets/src/mage/sets/eighthedition/DeepwoodGhoul.java
index 3176cb4d44..98b4c59935 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DeepwoodGhoul.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DeepwoodGhoul.java
@@ -37,7 +37,7 @@ public class DeepwoodGhoul extends mage.sets.mercadianmasques.DeepwoodGhoul {
 
     public DeepwoodGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DefenseGrid.java b/Mage.Sets/src/mage/sets/eighthedition/DefenseGrid.java
index d123b554f8..9d36316c8a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DefenseGrid.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DefenseGrid.java
@@ -37,7 +37,7 @@ public class DefenseGrid extends mage.sets.ninthedition.DefenseGrid {
 
     public DefenseGrid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Deflection.java b/Mage.Sets/src/mage/sets/eighthedition/Deflection.java
index 4321bb7a1f..d92e29cff4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Deflection.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Deflection.java
@@ -37,7 +37,7 @@ public class Deflection extends mage.sets.iceage.Deflection {
 
     public Deflection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Dehydration.java b/Mage.Sets/src/mage/sets/eighthedition/Dehydration.java
index c28f632e45..300ac33adf 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Dehydration.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Dehydration.java
@@ -37,7 +37,7 @@ public class Dehydration extends mage.sets.tenthedition.Dehydration {
 
     public Dehydration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Demolish.java b/Mage.Sets/src/mage/sets/eighthedition/Demolish.java
index 6ef95fce71..cee137d80b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Demolish.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Demolish.java
@@ -38,7 +38,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Demystify.java b/Mage.Sets/src/mage/sets/eighthedition/Demystify.java
index 109bbcf19e..3525bccdd3 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Demystify.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Demystify.java
@@ -37,7 +37,7 @@ public class Demystify extends mage.sets.tenthedition.Demystify {
 
     public Demystify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DiabolicTutor.java b/Mage.Sets/src/mage/sets/eighthedition/DiabolicTutor.java
index b8d5a3a171..14c7ecc2ca 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DiabolicTutor.java
@@ -37,7 +37,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DingusEgg.java b/Mage.Sets/src/mage/sets/eighthedition/DingusEgg.java
index 9a3881ba75..3f20edc105 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/eighthedition/DisruptingScepter.java
index 6553d583b2..d347e29d2c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/eighthedition/DrudgeSkeletons.java
index 361a3cad7a..3d8b551dfa 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DuskImp.java b/Mage.Sets/src/mage/sets/eighthedition/DuskImp.java
index 1a80a7d39d..8cdd710536 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DuskImp.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DuskImp.java
@@ -37,7 +37,7 @@ public class DuskImp extends mage.sets.tenthedition.DuskImp {
 
     public DuskImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EagerCadet.java b/Mage.Sets/src/mage/sets/eighthedition/EagerCadet.java
index edc5f1cfd9..2b620f3189 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EagerCadet.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EagerCadet.java
@@ -37,7 +37,7 @@ public class EagerCadet extends mage.sets.seventhedition.EagerCadet {
 
     public EagerCadet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EasternPaladin.java b/Mage.Sets/src/mage/sets/eighthedition/EasternPaladin.java
index 3da8dede9d..5aa1c719f5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EasternPaladin.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EasternPaladin.java
@@ -37,7 +37,7 @@ public class EasternPaladin extends mage.sets.urzassaga.EasternPaladin {
 
     public EasternPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElfhamePalace.java b/Mage.Sets/src/mage/sets/eighthedition/ElfhamePalace.java
index 91b39d84d6..cafe9fc02f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ElfhamePalace.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ElfhamePalace.java
@@ -37,7 +37,7 @@ public class ElfhamePalace extends mage.sets.invasion.ElfhamePalace {
 
     public ElfhamePalace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EliteArchers.java b/Mage.Sets/src/mage/sets/eighthedition/EliteArchers.java
index 95225f9c11..0ae0a17995 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EliteArchers.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EliteArchers.java
@@ -37,7 +37,7 @@ public class EliteArchers extends mage.sets.urzassaga.EliteArchers {
 
     public EliteArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java b/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java
index 9a0f4c9ade..83011269ed 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java
@@ -38,7 +38,7 @@ public class EliteJavelineer extends mage.sets.tempest.EliteJavelineer {
 
     public EliteJavelineer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElvishChampion.java b/Mage.Sets/src/mage/sets/eighthedition/ElvishChampion.java
index 90775fdf00..e9c96ce101 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ElvishChampion.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ElvishChampion.java
@@ -37,7 +37,7 @@ public class ElvishChampion extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java b/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java
index c04e4813c8..d0d7f90e1c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java
@@ -38,7 +38,7 @@ public class ElvishLyrist extends mage.sets.urzassaga.ElvishLyrist {
 
     public ElvishLyrist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElvishPioneer.java b/Mage.Sets/src/mage/sets/eighthedition/ElvishPioneer.java
index 994372afc5..5986473e28 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ElvishPioneer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ElvishPioneer.java
@@ -37,7 +37,7 @@ public class ElvishPioneer extends mage.sets.onslaught.ElvishPioneer {
 
     public ElvishPioneer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElvishPiper.java b/Mage.Sets/src/mage/sets/eighthedition/ElvishPiper.java
index c9a31522ea..b24a843ece 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ElvishPiper.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ElvishPiper.java
@@ -37,7 +37,7 @@ public class ElvishPiper extends mage.sets.magic2010.ElvishPiper {
 
     public ElvishPiper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElvishScrapper.java b/Mage.Sets/src/mage/sets/eighthedition/ElvishScrapper.java
index 46f07f2afa..7da9b051da 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ElvishScrapper.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ElvishScrapper.java
@@ -37,7 +37,7 @@ public class ElvishScrapper extends mage.sets.onslaught.ElvishScrapper {
 
     public ElvishScrapper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EmperorCrocodile.java b/Mage.Sets/src/mage/sets/eighthedition/EmperorCrocodile.java
index 4b5e3572ec..fffa2ce0ed 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EmperorCrocodile.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EmperorCrocodile.java
@@ -37,7 +37,7 @@ public class EmperorCrocodile extends mage.sets.ninthedition.EmperorCrocodile {
 
     public EmperorCrocodile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EnormousBaloth.java b/Mage.Sets/src/mage/sets/eighthedition/EnormousBaloth.java
index a145cdac39..e472fb49b4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EnormousBaloth.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EnormousBaloth.java
@@ -37,7 +37,7 @@ public class EnormousBaloth extends mage.sets.magic2010.EnormousBaloth {
 
     public EnormousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Enrage.java b/Mage.Sets/src/mage/sets/eighthedition/Enrage.java
index 0d590e88e8..000a2fd3d9 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Enrage.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Enrage.java
@@ -37,7 +37,7 @@ public class Enrage extends mage.sets.ninthedition.Enrage {
 
     public Enrage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/EnsnaringBridge.java b/Mage.Sets/src/mage/sets/eighthedition/EnsnaringBridge.java
index a5ed344779..9f7e8a457c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/EnsnaringBridge.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/EnsnaringBridge.java
@@ -37,7 +37,7 @@ public class EnsnaringBridge extends mage.sets.stronghold.EnsnaringBridge {
 
     public EnsnaringBridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Evacuation.java b/Mage.Sets/src/mage/sets/eighthedition/Evacuation.java
index 30399c053b..ad157ae471 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Evacuation.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Evacuation.java
@@ -37,7 +37,7 @@ public class Evacuation extends mage.sets.stronghold.Evacuation {
 
     public Evacuation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Execute.java b/Mage.Sets/src/mage/sets/eighthedition/Execute.java
index 754ea8a475..393b6257a6 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Execute.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Execute.java
@@ -37,7 +37,7 @@ public class Execute extends mage.sets.ninthedition.Execute {
 
     public Execute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FallenAngel.java b/Mage.Sets/src/mage/sets/eighthedition/FallenAngel.java
index e3cd7ed0fe..78304cf731 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FallenAngel.java
@@ -37,7 +37,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Fear.java b/Mage.Sets/src/mage/sets/eighthedition/Fear.java
index 3615147ab1..7871ad7484 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Fear.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Fecundity.java b/Mage.Sets/src/mage/sets/eighthedition/Fecundity.java
index 058f87688e..5a24389275 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Fecundity.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Fecundity.java
@@ -37,7 +37,7 @@ public class Fecundity extends mage.sets.urzassaga.Fecundity {
 
     public Fecundity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FertileGround.java b/Mage.Sets/src/mage/sets/eighthedition/FertileGround.java
index abcdd22c65..269923bbfc 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FertileGround.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FertileGround.java
@@ -37,7 +37,7 @@ public class FertileGround extends mage.sets.urzassaga.FertileGround {
 
     public FertileGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FightingDrake.java b/Mage.Sets/src/mage/sets/eighthedition/FightingDrake.java
index 50669ee8e4..30265a8f8f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FightingDrake.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FightingDrake.java
@@ -37,7 +37,7 @@ public class FightingDrake extends mage.sets.tempest.FightingDrake {
 
     public FightingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Flashfires.java b/Mage.Sets/src/mage/sets/eighthedition/Flashfires.java
index 0f33fcab49..4819f5d15a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FleetingImage.java b/Mage.Sets/src/mage/sets/eighthedition/FleetingImage.java
index d02732a7de..0c94629bb5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FleetingImage.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FleetingImage.java
@@ -37,7 +37,7 @@ public class FleetingImage extends mage.sets.ninthedition.FleetingImage {
 
     public FleetingImage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Flight.java b/Mage.Sets/src/mage/sets/eighthedition/Flight.java
index 233c8ffadb..9b9e44974b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Flight.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/eighthedition/FlyingCarpet.java
index 385110279e..b6474328a7 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FlyingCarpet.java
@@ -37,7 +37,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FodderCannon.java b/Mage.Sets/src/mage/sets/eighthedition/FodderCannon.java
index 37daa70766..51e077d354 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FodderCannon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FodderCannon.java
@@ -37,7 +37,7 @@ public class FodderCannon extends mage.sets.urzasdestiny.FodderCannon {
 
     public FodderCannon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Foratog.java b/Mage.Sets/src/mage/sets/eighthedition/Foratog.java
index 7093a24782..7d8edf4fac 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Foratog.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Foratog.java
@@ -37,7 +37,7 @@ public class Foratog extends mage.sets.mirage.Foratog {
 
     public Foratog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FugitiveWizard.java b/Mage.Sets/src/mage/sets/eighthedition/FugitiveWizard.java
index 0bb223341e..930b2d6b2b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FugitiveWizard.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FugitiveWizard.java
@@ -37,7 +37,7 @@ public class FugitiveWizard extends mage.sets.tenthedition.FugitiveWizard {
 
     public FugitiveWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Fungusaur.java b/Mage.Sets/src/mage/sets/eighthedition/Fungusaur.java
index b115079ab4..d1b181d14e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Fungusaur.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Fungusaur.java
@@ -37,7 +37,7 @@ public class Fungusaur extends mage.sets.limitedalpha.Fungusaur {
 
     public Fungusaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FurnaceOfRath.java b/Mage.Sets/src/mage/sets/eighthedition/FurnaceOfRath.java
index e8d6f77722..5bd006d36c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FurnaceOfRath.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FurnaceOfRath.java
@@ -37,7 +37,7 @@ public class FurnaceOfRath extends mage.sets.tempest.FurnaceOfRath {
 
     public FurnaceOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/FyndhornElder.java b/Mage.Sets/src/mage/sets/eighthedition/FyndhornElder.java
index 46a5711f39..e9bd871cdb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/FyndhornElder.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/FyndhornElder.java
@@ -37,7 +37,7 @@ public class FyndhornElder extends mage.sets.iceage.FyndhornElder {
 
     public FyndhornElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GaeasHerald.java b/Mage.Sets/src/mage/sets/eighthedition/GaeasHerald.java
index 26b339c3fa..8be2ccf009 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GaeasHerald.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GaeasHerald.java
@@ -37,7 +37,7 @@ public class GaeasHerald extends mage.sets.tenthedition.GaeasHerald {
 
     public GaeasHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GiantCockroach.java b/Mage.Sets/src/mage/sets/eighthedition/GiantCockroach.java
index eb57534c9d..80dd803dd0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GiantCockroach.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GiantCockroach.java
@@ -37,7 +37,7 @@ public class GiantCockroach extends mage.sets.ninthedition.GiantCockroach {
 
     public GiantCockroach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/eighthedition/GiantGrowth.java
index f38c1130ce..0c9a3a438d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/eighthedition/GiantSpider.java
index aa4b8f12c5..46ec6d0efa 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GloriousAnthem.java b/Mage.Sets/src/mage/sets/eighthedition/GloriousAnthem.java
index 783641d738..f8ccd90156 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GloriousAnthem.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GloriousAnthem.java
@@ -37,7 +37,7 @@ public class GloriousAnthem extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GlorySeeker.java b/Mage.Sets/src/mage/sets/eighthedition/GlorySeeker.java
index c764034af2..c581e187c5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GlorySeeker.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GlorySeeker.java
@@ -37,7 +37,7 @@ public class GlorySeeker extends mage.sets.riseoftheeldrazi.GlorySeeker {
 
     public GlorySeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GluttonousZombie.java b/Mage.Sets/src/mage/sets/eighthedition/GluttonousZombie.java
index b9b38452c7..a0157cb868 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GluttonousZombie.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GluttonousZombie.java
@@ -37,7 +37,7 @@ public class GluttonousZombie extends mage.sets.onslaught.GluttonousZombie {
 
     public GluttonousZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GoblinChariot.java b/Mage.Sets/src/mage/sets/eighthedition/GoblinChariot.java
index 5663a94a79..81aec87efb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GoblinChariot.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GoblinChariot.java
@@ -37,7 +37,7 @@ public class GoblinChariot extends mage.sets.ninthedition.GoblinChariot {
 
     public GoblinChariot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GoblinGlider.java b/Mage.Sets/src/mage/sets/eighthedition/GoblinGlider.java
index af8c70cd13..55436d1847 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GoblinGlider.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GoblinGlider.java
@@ -37,7 +37,7 @@ public class GoblinGlider extends mage.sets.seventhedition.GoblinGlider {
 
     public GoblinGlider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/eighthedition/GoblinKing.java
index 81af5c88b8..33e75b46cc 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GoblinRaider.java b/Mage.Sets/src/mage/sets/eighthedition/GoblinRaider.java
index 6a59a77b06..966c2cb3cd 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GoblinRaider.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GoblinRaider.java
@@ -37,7 +37,7 @@ public class GoblinRaider extends mage.sets.urzassaga.GoblinRaider {
 
     public GoblinRaider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GravePact.java b/Mage.Sets/src/mage/sets/eighthedition/GravePact.java
index ec6a73ed18..eeab1bfecd 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GravePact.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GravePact.java
@@ -37,7 +37,7 @@ public class GravePact extends mage.sets.ninthedition.GravePact {
 
     public GravePact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Gravedigger.java b/Mage.Sets/src/mage/sets/eighthedition/Gravedigger.java
index d9b6172e59..2e07e84172 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/eighthedition/GrizzlyBears.java
index 99c8e86892..eb4e87fd54 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/GuerrillaTactics.java b/Mage.Sets/src/mage/sets/eighthedition/GuerrillaTactics.java
index cd549cf6e7..591d31d7be 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/GuerrillaTactics.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/GuerrillaTactics.java
@@ -37,7 +37,7 @@ public class GuerrillaTactics extends mage.sets.ninthedition.GuerrillaTactics {
 
     public GuerrillaTactics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/eighthedition/HammerOfBogardan.java
index b51077eeb2..7c7be723eb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HammerOfBogardan.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HammerOfBogardan.java
@@ -37,7 +37,7 @@ public class HammerOfBogardan extends mage.sets.mirage.HammerOfBogardan {
 
     public HammerOfBogardan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HealingSalve.java b/Mage.Sets/src/mage/sets/eighthedition/HealingSalve.java
index a8433c360e..9d71115088 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Hibernation.java b/Mage.Sets/src/mage/sets/eighthedition/Hibernation.java
index 93ea68c341..9e6756f869 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Hibernation.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Hibernation.java
@@ -37,7 +37,7 @@ public class Hibernation extends mage.sets.urzassaga.Hibernation {
 
     public Hibernation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HillGiant.java b/Mage.Sets/src/mage/sets/eighthedition/HillGiant.java
index 6e1ae020f8..51d15794b4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HolyDay.java b/Mage.Sets/src/mage/sets/eighthedition/HolyDay.java
index 0ef6addedc..1316eee232 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HolyDay.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HolyDay.java
@@ -37,7 +37,7 @@ public class HolyDay extends mage.sets.invasion.HolyDay {
 
     public HolyDay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HolyStrength.java b/Mage.Sets/src/mage/sets/eighthedition/HolyStrength.java
index ee3efdfb56..52b13e332e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HonorGuard.java b/Mage.Sets/src/mage/sets/eighthedition/HonorGuard.java
index a5843c5318..14b23fc3e2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HonorGuard.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HonorGuard.java
@@ -37,7 +37,7 @@ public class HonorGuard extends mage.sets.tenthedition.HonorGuard {
 
     public HonorGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HornedTroll.java b/Mage.Sets/src/mage/sets/eighthedition/HornedTroll.java
index 5a82fd77e7..04b553ca08 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HornedTroll.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HornedTroll.java
@@ -37,7 +37,7 @@ public class HornedTroll extends mage.sets.mercadianmasques.HornedTroll {
 
     public HornedTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HornedTurtle.java b/Mage.Sets/src/mage/sets/eighthedition/HornedTurtle.java
index 9ad91af347..b5e8182759 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/eighthedition/HowlingMine.java
index 26aee99c7d..f04caf6309 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HulkingCyclops.java b/Mage.Sets/src/mage/sets/eighthedition/HulkingCyclops.java
index 7f0b39151a..d3ced06007 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HulkingCyclops.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HulkingCyclops.java
@@ -37,7 +37,7 @@ public class HulkingCyclops extends mage.sets.visions.HulkingCyclops {
 
     public HulkingCyclops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/HuntedWumpus.java b/Mage.Sets/src/mage/sets/eighthedition/HuntedWumpus.java
index 98739a583a..38fe9e142b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/HuntedWumpus.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/HuntedWumpus.java
@@ -37,7 +37,7 @@ public class HuntedWumpus extends mage.sets.ninthedition.HuntedWumpus {
 
     public HuntedWumpus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Index.java b/Mage.Sets/src/mage/sets/eighthedition/Index.java
index 97fbb32e6c..c4ce89e214 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Index.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Index.java
@@ -37,7 +37,7 @@ public class Index extends mage.sets.apocalypse.Index {
 
     public Index(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Inferno.java b/Mage.Sets/src/mage/sets/eighthedition/Inferno.java
index 2384aaf889..eda194d327 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Inferno.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Inferno.java
@@ -37,7 +37,7 @@ public class Inferno extends mage.sets.thedark.Inferno {
 
     public Inferno(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Inspiration.java b/Mage.Sets/src/mage/sets/eighthedition/Inspiration.java
index 23be1f854b..e81632cf69 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Inspiration.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Inspiration.java
@@ -37,7 +37,7 @@ public class Inspiration extends mage.sets.returntoravnica.Inspiration {
 
     public Inspiration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/IntrepidHero.java b/Mage.Sets/src/mage/sets/eighthedition/IntrepidHero.java
index b07da13bda..5f8bea0900 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/IntrepidHero.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/IntrepidHero.java
@@ -37,7 +37,7 @@ public class IntrepidHero extends mage.sets.urzassaga.IntrepidHero {
 
     public IntrepidHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/IntruderAlarm.java b/Mage.Sets/src/mage/sets/eighthedition/IntruderAlarm.java
index 4b21419480..5be22ae63f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/IntruderAlarm.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/IntruderAlarm.java
@@ -37,7 +37,7 @@ public class IntruderAlarm extends mage.sets.stronghold.IntruderAlarm {
 
     public IntruderAlarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Invisibility.java b/Mage.Sets/src/mage/sets/eighthedition/Invisibility.java
index 5d820fb7d0..7a62614169 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Invisibility.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Invisibility.java
@@ -38,7 +38,7 @@ public class Invisibility extends mage.sets.limitedalpha.Invisibility {
 
     public Invisibility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/IronStar.java b/Mage.Sets/src/mage/sets/eighthedition/IronStar.java
index f4b20b9594..811f028ab8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/IvoryCup.java b/Mage.Sets/src/mage/sets/eighthedition/IvoryCup.java
index 654e8edf5e..31a873ccfe 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/IvoryMask.java b/Mage.Sets/src/mage/sets/eighthedition/IvoryMask.java
index a268d85977..460a2d720b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/IvoryMask.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/IvoryMask.java
@@ -37,7 +37,7 @@ public class IvoryMask extends mage.sets.ninthedition.IvoryMask {
 
     public IvoryMask(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/eighthedition/JayemdaeTome.java
index 6063ff1138..47934ea1ee 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Karma.java b/Mage.Sets/src/mage/sets/eighthedition/Karma.java
index ad5377995e..1d9f351fde 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Karma.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Karma.java
@@ -37,7 +37,7 @@ public class Karma extends mage.sets.fifthedition.Karma {
 
     public Karma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Larceny.java b/Mage.Sets/src/mage/sets/eighthedition/Larceny.java
index e307cc6487..ddd617b7ac 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Larceny.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Larceny.java
@@ -38,7 +38,7 @@ public class Larceny extends mage.sets.mercadianmasques.Larceny {
 
     public Larceny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LavaAxe.java b/Mage.Sets/src/mage/sets/eighthedition/LavaAxe.java
index 963a8e408d..c7c5db6508 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java b/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java
index 6f8f9778d3..80981625f8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java
@@ -38,7 +38,7 @@ public class LavaHounds extends mage.sets.weatherlight.LavaHounds {
 
     public LavaHounds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LesserGargadon.java b/Mage.Sets/src/mage/sets/eighthedition/LesserGargadon.java
index 94ae5925f0..b0b965250f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LesserGargadon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LesserGargadon.java
@@ -37,7 +37,7 @@ public class LesserGargadon extends mage.sets.prophecy.LesserGargadon {
 
     public LesserGargadon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Lhurgoyf.java b/Mage.Sets/src/mage/sets/eighthedition/Lhurgoyf.java
index 8bb88b2a34..14226f2cef 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Lhurgoyf.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Lhurgoyf.java
@@ -37,7 +37,7 @@ public class Lhurgoyf extends mage.sets.iceage.Lhurgoyf {
 
     public Lhurgoyf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java b/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java
index 590a822c9e..a2ac73e46b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java
@@ -38,7 +38,7 @@ public class LightningBlast extends mage.sets.tempest.LightningBlast {
 
     public LightningBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LightningElemental.java b/Mage.Sets/src/mage/sets/eighthedition/LightningElemental.java
index 8092a51b7b..1f364ca53d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LightningElemental.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LightningElemental.java
@@ -37,7 +37,7 @@ public class LightningElemental extends mage.sets.tenthedition.LightningElementa
 
     public LightningElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LivingTerrain.java b/Mage.Sets/src/mage/sets/eighthedition/LivingTerrain.java
index 0bf9fe4c3e..8444befb69 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LivingTerrain.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LivingTerrain.java
@@ -37,7 +37,7 @@ public class LivingTerrain extends mage.sets.prophecy.LivingTerrain {
 
     public LivingTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LlanowarBehemoth.java b/Mage.Sets/src/mage/sets/eighthedition/LlanowarBehemoth.java
index c95729bb5a..d24501802b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LlanowarBehemoth.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LlanowarBehemoth.java
@@ -37,7 +37,7 @@ public class LlanowarBehemoth extends mage.sets.ninthedition.LlanowarBehemoth {
 
     public LlanowarBehemoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java b/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java
index ff8b8b3e61..6d28a766b9 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java
@@ -38,7 +38,7 @@ public class LoneWolf extends mage.sets.urzaslegacy.LoneWolf {
 
     public LoneWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LoomingShade.java b/Mage.Sets/src/mage/sets/eighthedition/LoomingShade.java
index 2457f78133..39ef3bbe5c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LoomingShade.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LoomingShade.java
@@ -37,7 +37,7 @@ public class LoomingShade extends mage.sets.magic2010.LoomingShade {
 
     public LoomingShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/LordOfTheUndead.java b/Mage.Sets/src/mage/sets/eighthedition/LordOfTheUndead.java
index 1e805ebdbf..8bf6af2d3f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/LordOfTheUndead.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/LordOfTheUndead.java
@@ -37,7 +37,7 @@ public class LordOfTheUndead extends mage.sets.tenthedition.LordOfTheUndead {
 
     public LordOfTheUndead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Lure.java b/Mage.Sets/src/mage/sets/eighthedition/Lure.java
index 460e5e1aed..f2a867aabb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Lure.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MaggotCarrier.java b/Mage.Sets/src/mage/sets/eighthedition/MaggotCarrier.java
index 7aa26a9f41..86ed7afcde 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MaggotCarrier.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MaggotCarrier.java
@@ -37,7 +37,7 @@ public class MaggotCarrier extends mage.sets.planeshift.MaggotCarrier {
 
     public MaggotCarrier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/eighthedition/MahamotiDjinn.java
index c06f885cbc..6f38951ab0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ManaClash.java b/Mage.Sets/src/mage/sets/eighthedition/ManaClash.java
index 8ed0860361..83470e618b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ManaClash.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ManaClash.java
@@ -37,7 +37,7 @@ public class ManaClash extends mage.sets.fourthedition.ManaClash {
 
     public ManaClash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ManaLeak.java b/Mage.Sets/src/mage/sets/eighthedition/ManaLeak.java
index ad23ce7d66..0878f8d623 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Maro.java b/Mage.Sets/src/mage/sets/eighthedition/Maro.java
index d8e2246e52..9b1cb6c3cf 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Maro.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Maro.java
@@ -37,7 +37,7 @@ public class Maro extends mage.sets.ninthedition.Maro {
 
     public Maro(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MasterDecoy.java b/Mage.Sets/src/mage/sets/eighthedition/MasterDecoy.java
index 85352d8b35..f0dae19c32 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MasterDecoy.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MasterDecoy.java
@@ -37,7 +37,7 @@ public class MasterDecoy extends mage.sets.tempest.MasterDecoy {
 
     public MasterDecoy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MasterHealer.java b/Mage.Sets/src/mage/sets/eighthedition/MasterHealer.java
index 34b99baeac..21e8cd0d25 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MasterHealer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MasterHealer.java
@@ -37,7 +37,7 @@ public class MasterHealer extends mage.sets.ninthedition.MasterHealer {
 
     public MasterHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Megrim.java b/Mage.Sets/src/mage/sets/eighthedition/Megrim.java
index d024c125a9..5893408a35 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Megrim.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Megrim.java
@@ -37,7 +37,7 @@ public class Megrim extends mage.sets.tenthedition.Megrim {
 
     public Megrim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MerchantOfSecrets.java b/Mage.Sets/src/mage/sets/eighthedition/MerchantOfSecrets.java
index 5bd8f0f045..1f2ae5a210 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MerchantOfSecrets.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MerchantOfSecrets.java
@@ -37,7 +37,7 @@ public class MerchantOfSecrets extends mage.sets.legions.MerchantOfSecrets {
 
     public MerchantOfSecrets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MightOfOaks.java b/Mage.Sets/src/mage/sets/eighthedition/MightOfOaks.java
index 0923c1b715..e9710ad2c2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MightOfOaks.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MightOfOaks.java
@@ -37,7 +37,7 @@ public class MightOfOaks extends mage.sets.magic2010.MightOfOaks {
 
     public MightOfOaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Millstone.java b/Mage.Sets/src/mage/sets/eighthedition/Millstone.java
index 3ae7ecbdf6..35ecc7e602 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MindRot.java b/Mage.Sets/src/mage/sets/eighthedition/MindRot.java
index 500d6636de..db9dea7ead 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MindRot.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MindSlash.java b/Mage.Sets/src/mage/sets/eighthedition/MindSlash.java
index 5be94624ae..59e56e1deb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MindSlash.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MindSlash.java
@@ -37,7 +37,7 @@ public class MindSlash extends mage.sets.nemesis.MindSlash {
 
     public MindSlash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MindSludge.java b/Mage.Sets/src/mage/sets/eighthedition/MindSludge.java
index 0aecd0d11c..c7bd180f09 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MindSludge.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MindSludge.java
@@ -37,7 +37,7 @@ public class MindSludge extends mage.sets.zendikar.MindSludge {
 
     public MindSludge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MoggSentry.java b/Mage.Sets/src/mage/sets/eighthedition/MoggSentry.java
index e8c90e252f..e149dbd9ad 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MoggSentry.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MoggSentry.java
@@ -38,7 +38,7 @@ public class MoggSentry extends mage.sets.ninthedition.MoggSentry {
 
     public MoggSentry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/eighthedition/MonstrousGrowth.java
index 587d8fd3f6..58bade2e07 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/MonstrousGrowth.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/MonstrousGrowth.java
@@ -37,7 +37,7 @@ public class MonstrousGrowth extends mage.sets.seventhedition.MonstrousGrowth {
 
     public MonstrousGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/NantukoDisciple.java b/Mage.Sets/src/mage/sets/eighthedition/NantukoDisciple.java
index 36697d6d1e..701f912acc 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/NantukoDisciple.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/NantukoDisciple.java
@@ -37,7 +37,7 @@ public class NantukoDisciple extends mage.sets.odyssey.NantukoDisciple {
 
     public NantukoDisciple(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/NaturalAffinity.java b/Mage.Sets/src/mage/sets/eighthedition/NaturalAffinity.java
index 4e0dbe967a..e0f384bc91 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/NaturalAffinity.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/NaturalAffinity.java
@@ -37,7 +37,7 @@ public class NaturalAffinity extends mage.sets.ninthedition.NaturalAffinity {
 
     public NaturalAffinity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Naturalize.java b/Mage.Sets/src/mage/sets/eighthedition/Naturalize.java
index 690f3f4460..24333d1a43 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Nausea.java b/Mage.Sets/src/mage/sets/eighthedition/Nausea.java
index 2c05c70372..d51fa698cd 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Nausea.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Nausea.java
@@ -37,7 +37,7 @@ public class Nausea extends mage.sets.seventhedition.Nausea {
 
     public Nausea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Nekrataal.java b/Mage.Sets/src/mage/sets/eighthedition/Nekrataal.java
index 9559b40392..e00ffce2e0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Nekrataal.java
@@ -38,7 +38,7 @@ public class Nekrataal extends mage.sets.ninthedition.Nekrataal {
 
     public Nekrataal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Nightmare.java b/Mage.Sets/src/mage/sets/eighthedition/Nightmare.java
index c1625ae614..c6b6222e85 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/NoblePurpose.java b/Mage.Sets/src/mage/sets/eighthedition/NoblePurpose.java
index f687eea246..15aad3b998 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/NoblePurpose.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/NoblePurpose.java
@@ -38,7 +38,7 @@ public class NoblePurpose extends mage.sets.mercadianmasques.NoblePurpose {
 
     public NoblePurpose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/NorwoodRanger.java b/Mage.Sets/src/mage/sets/eighthedition/NorwoodRanger.java
index 27f59ad59b..613d0eca93 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/NorwoodRanger.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/NorwoodRanger.java
@@ -37,7 +37,7 @@ public class NorwoodRanger extends mage.sets.ninthedition.NorwoodRanger {
 
     public NorwoodRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Obliterate.java b/Mage.Sets/src/mage/sets/eighthedition/Obliterate.java
index c4a34348ae..9c40de2afe 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Obliterate.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Obliterate.java
@@ -37,7 +37,7 @@ public class Obliterate extends mage.sets.invasion.Obliterate {
 
     public Obliterate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/eighthedition/OgreTaskmaster.java
index 3ca7da2845..51c02909a0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/OgreTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/OgreTaskmaster.java
@@ -37,7 +37,7 @@ public class OgreTaskmaster extends mage.sets.ninthedition.OgreTaskmaster {
 
     public OgreTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Okk.java b/Mage.Sets/src/mage/sets/eighthedition/Okk.java
index 52493596e4..b61447c15e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Okk.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Okk.java
@@ -37,7 +37,7 @@ public class Okk extends mage.sets.urzassaga.Okk {
 
     public Okk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/OraclesAttendants.java b/Mage.Sets/src/mage/sets/eighthedition/OraclesAttendants.java
index 2458e3ec78..bca73c0329 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/OraclesAttendants.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/OraclesAttendants.java
@@ -37,7 +37,7 @@ public class OraclesAttendants extends mage.sets.nemesis.OraclesAttendants {
 
     public OraclesAttendants(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/eighthedition/OrcishArtillery.java
index fcda532c29..506c1afb7a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/OrcishSpy.java b/Mage.Sets/src/mage/sets/eighthedition/OrcishSpy.java
index 20914435fb..115a677bd0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/OrcishSpy.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/OrcishSpy.java
@@ -37,7 +37,7 @@ public class OrcishSpy extends mage.sets.fallenempires.OrcishSpy1 {
 
     public OrcishSpy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Pacifism.java b/Mage.Sets/src/mage/sets/eighthedition/Pacifism.java
index 35b1859a98..c4b5e8e751 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PanicAttack.java b/Mage.Sets/src/mage/sets/eighthedition/PanicAttack.java
index 960e4660e9..554a7c7aeb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PanicAttack.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PanicAttack.java
@@ -37,7 +37,7 @@ public class PanicAttack extends mage.sets.magic2010.PanicAttack {
 
     public PanicAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PatagiaGolem.java b/Mage.Sets/src/mage/sets/eighthedition/PatagiaGolem.java
index 27074247a0..d1a8f72c62 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PatagiaGolem.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PatagiaGolem.java
@@ -37,7 +37,7 @@ public class PatagiaGolem extends mage.sets.seventhedition.PatagiaGolem {
 
     public PatagiaGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Persecute.java b/Mage.Sets/src/mage/sets/eighthedition/Persecute.java
index b91cc0e4fb..9909219269 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Persecute.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Persecute.java
@@ -37,7 +37,7 @@ public class Persecute extends mage.sets.urzassaga.Persecute {
 
     public Persecute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PhantomWarrior.java b/Mage.Sets/src/mage/sets/eighthedition/PhantomWarrior.java
index 70726d31c4..14b3ee7bad 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianArena.java b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianArena.java
index 73fa5f1617..b544a3f0df 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianArena.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianArena.java
@@ -37,7 +37,7 @@ public class PhyrexianArena extends mage.sets.apocalypse.PhyrexianArena {
 
     public PhyrexianArena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java
index 39865e4dfc..44a522c90a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianPlaguelord.java
index 7041e4fb2d..1fda51af2f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianPlaguelord.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianPlaguelord.java
@@ -37,7 +37,7 @@ public class PhyrexianPlaguelord extends mage.sets.urzaslegacy.PhyrexianPlaguelo
 
     public PhyrexianPlaguelord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PlagueBeetle.java b/Mage.Sets/src/mage/sets/eighthedition/PlagueBeetle.java
index 93d301161c..20f510ccdd 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PlagueBeetle.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PlagueBeetle.java
@@ -37,7 +37,7 @@ public class PlagueBeetle extends mage.sets.tenthedition.PlagueBeetle {
 
     public PlagueBeetle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PlagueWind.java b/Mage.Sets/src/mage/sets/eighthedition/PlagueWind.java
index 8241047337..cb24803f09 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PlagueWind.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PlagueWind.java
@@ -37,7 +37,7 @@ public class PlagueWind extends mage.sets.prophecy.PlagueWind {
 
     public PlagueWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PlanarPortal.java b/Mage.Sets/src/mage/sets/eighthedition/PlanarPortal.java
index dc658b16f2..43997b0975 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PlanarPortal.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PlanarPortal.java
@@ -37,7 +37,7 @@ public class PlanarPortal extends mage.sets.invasion.PlanarPortal {
 
     public PlanarPortal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PlowUnder.java b/Mage.Sets/src/mage/sets/eighthedition/PlowUnder.java
index c29b6d0d5f..502c3dfff4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PlowUnder.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PlowUnder.java
@@ -37,7 +37,7 @@ public class PlowUnder extends mage.sets.urzasdestiny.PlowUnder {
 
     public PlowUnder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/PrimevalShambler.java b/Mage.Sets/src/mage/sets/eighthedition/PrimevalShambler.java
index b04a28b1cd..e387a0f870 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/PrimevalShambler.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/PrimevalShambler.java
@@ -37,7 +37,7 @@ public class PrimevalShambler extends mage.sets.mercadianmasques.PrimevalShamble
 
     public PrimevalShambler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Puppeteer.java b/Mage.Sets/src/mage/sets/eighthedition/Puppeteer.java
index 4e5258562f..5f02d25401 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Puppeteer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Puppeteer.java
@@ -37,7 +37,7 @@ public class Puppeteer extends mage.sets.tenthedition.Puppeteer {
 
     public Puppeteer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Pyroclasm.java b/Mage.Sets/src/mage/sets/eighthedition/Pyroclasm.java
index 795248dfb8..87a7ea261f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Pyroclasm.java
@@ -37,7 +37,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Pyrotechnics.java b/Mage.Sets/src/mage/sets/eighthedition/Pyrotechnics.java
index 40fec80794..aa778c9af1 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Pyrotechnics.java
@@ -37,7 +37,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RagingGoblin.java b/Mage.Sets/src/mage/sets/eighthedition/RagingGoblin.java
index 1ababaf11a..a3d1b6d702 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RainOfBlades.java b/Mage.Sets/src/mage/sets/eighthedition/RainOfBlades.java
index 7d6c389314..115feb7c90 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RainOfBlades.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RainOfBlades.java
@@ -37,7 +37,7 @@ public class RainOfBlades extends mage.sets.magic2013.RainOfBlades {
 
     public RainOfBlades(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RaiseDead.java b/Mage.Sets/src/mage/sets/eighthedition/RaiseDead.java
index 40acaca0d0..bc2f22807d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RampantGrowth.java b/Mage.Sets/src/mage/sets/eighthedition/RampantGrowth.java
index 5d79dbcb21..e6434c1f66 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RavenousRats.java b/Mage.Sets/src/mage/sets/eighthedition/RavenousRats.java
index e101dbdb97..89a7cc0f66 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/eighthedition/RazorfootGriffin.java
index 725f7c453a..7e4f2153d4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RazorfootGriffin.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RazorfootGriffin.java
@@ -37,7 +37,7 @@ public class RazorfootGriffin extends mage.sets.magic2010.RazorfootGriffin {
 
     public RazorfootGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Redeem.java b/Mage.Sets/src/mage/sets/eighthedition/Redeem.java
index d3a1cf025e..85d1ba8dcb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Redeem.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Redeem.java
@@ -38,7 +38,7 @@ public class Redeem extends mage.sets.urzassaga.Redeem {
 
     public Redeem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Reflexes.java b/Mage.Sets/src/mage/sets/eighthedition/Reflexes.java
index df24f50615..cb3d6a3e85 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Reflexes.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Reflexes.java
@@ -37,7 +37,7 @@ public class Reflexes extends mage.sets.urzassaga.Reflexes {
 
     public Reflexes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Regeneration.java b/Mage.Sets/src/mage/sets/eighthedition/Regeneration.java
index 5eb3b06e11..6dc757f0ec 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/eighthedition/RelentlessAssault.java
index b91b629df5..f3df897ea1 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/eighthedition/RemoveSoul.java
index c84eb64c1b..b3149619bb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Revive.java b/Mage.Sets/src/mage/sets/eighthedition/Revive.java
index 7be2439461..df8ee6dc30 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Revive.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Revive.java
@@ -37,7 +37,7 @@ public class Revive extends mage.sets.magic2013.Revive {
 
     public Revive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Rewind.java b/Mage.Sets/src/mage/sets/eighthedition/Rewind.java
index 8805b35122..16998a19bb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Rewind.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Rewind.java
@@ -38,7 +38,7 @@ public class Rewind extends mage.sets.urzassaga.Rewind {
 
     public Rewind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Rhox.java b/Mage.Sets/src/mage/sets/eighthedition/Rhox.java
index 6c7f2f19b6..67c24ceea8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Rhox.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Rhox.java
@@ -37,7 +37,7 @@ public class Rhox extends mage.sets.tenthedition.Rhox {
 
     public Rhox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RidgelineRager.java b/Mage.Sets/src/mage/sets/eighthedition/RidgelineRager.java
index 2be072d052..1d4f79102a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RidgelineRager.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RidgelineRager.java
@@ -37,7 +37,7 @@ public class RidgelineRager extends mage.sets.prophecy.RidgelineRager {
 
     public RidgelineRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/eighthedition/RodOfRuin.java
index cf4901377c..c533af7f01 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RollingStones.java b/Mage.Sets/src/mage/sets/eighthedition/RollingStones.java
index b8487b443a..7de527a88d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RollingStones.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RollingStones.java
@@ -37,7 +37,7 @@ public class RollingStones extends mage.sets.stronghold.RollingStones {
 
     public RollingStones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RoyalAssassin.java b/Mage.Sets/src/mage/sets/eighthedition/RoyalAssassin.java
index d2c711bfa4..774c7e128f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RukhEgg.java b/Mage.Sets/src/mage/sets/eighthedition/RukhEgg.java
index 63122fceb5..123c492e0d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RukhEgg.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RukhEgg.java
@@ -38,7 +38,7 @@ public class RukhEgg extends mage.sets.arabiannights.RukhEgg1 {
 
     public RukhEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/RushwoodDryad.java b/Mage.Sets/src/mage/sets/eighthedition/RushwoodDryad.java
index 151110220c..c812910c78 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/RushwoodDryad.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/RushwoodDryad.java
@@ -37,7 +37,7 @@ public class RushwoodDryad extends mage.sets.tenthedition.RushwoodDryad {
 
     public RushwoodDryad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SabretoothTiger.java b/Mage.Sets/src/mage/sets/eighthedition/SabretoothTiger.java
index c0d84cd789..b3641a4ef7 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SabretoothTiger.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SabretoothTiger.java
@@ -37,7 +37,7 @@ public class SabretoothTiger extends mage.sets.fifthedition.SabretoothTiger {
 
     public SabretoothTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SacredGround.java b/Mage.Sets/src/mage/sets/eighthedition/SacredGround.java
index 6f426bc520..f874c66af9 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SacredGround.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SacredGround.java
@@ -37,7 +37,7 @@ public class SacredGround extends mage.sets.stronghold.SacredGround {
 
     public SacredGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SacredNectar.java b/Mage.Sets/src/mage/sets/eighthedition/SacredNectar.java
index b6521e24be..56b76326f6 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SacredNectar.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SacredNectar.java
@@ -37,7 +37,7 @@ public class SacredNectar extends mage.sets.ninthedition.SacredNectar {
 
     public SacredNectar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java b/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java
index 9078c5121f..d82fd32316 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java
@@ -38,7 +38,7 @@ public class SageOfLatNam extends mage.sets.antiquities.SageOfLatNam {
 
     public SageOfLatNam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SageOwl.java b/Mage.Sets/src/mage/sets/eighthedition/SageOwl.java
index 49ede165d4..9ecfe61284 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SageOwl.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SageOwl.java
@@ -37,7 +37,7 @@ public class SageOwl extends mage.sets.magic2010.SageOwl {
 
     public SageOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SaltMarsh.java b/Mage.Sets/src/mage/sets/eighthedition/SaltMarsh.java
index 314d35f5ea..e9debcd177 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SaltMarsh.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SaltMarsh.java
@@ -37,7 +37,7 @@ public class SaltMarsh extends mage.sets.invasion.SaltMarsh {
 
     public SaltMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/eighthedition/SamiteHealer.java
index d8bf5ad80b..f81f034f5e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Sanctimony.java b/Mage.Sets/src/mage/sets/eighthedition/Sanctimony.java
index e6c6369658..263f167f23 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Sanctimony.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Sanctimony.java
@@ -37,7 +37,7 @@ public class Sanctimony extends mage.sets.seventhedition.Sanctimony {
 
     public Sanctimony(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/eighthedition/ScatheZombies.java
index 9a9988a13d..a5cfa4e287 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SeaMonster.java b/Mage.Sets/src/mage/sets/eighthedition/SeaMonster.java
index d68f7755b0..e4a0e53853 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SeaMonster.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SeaMonster.java
@@ -37,7 +37,7 @@ public class SeaMonster extends mage.sets.tempest.SeaMonster {
 
     public SeaMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SearingWind.java b/Mage.Sets/src/mage/sets/eighthedition/SearingWind.java
index 1965301584..b66f1a7341 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SearingWind.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SearingWind.java
@@ -37,7 +37,7 @@ public class SearingWind extends mage.sets.prophecy.SearingWind {
 
     public SearingWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/eighthedition/SeasonedMarshal.java
index e860855126..9d0495d25d 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SeasonedMarshal.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SeasonedMarshal.java
@@ -37,7 +37,7 @@ public class SeasonedMarshal extends mage.sets.elspethvstezzeret.SeasonedMarshal
 
     public SeasonedMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SeismicAssault.java b/Mage.Sets/src/mage/sets/eighthedition/SeismicAssault.java
index 79e9ab5bfa..9d69ae1872 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SeismicAssault.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SeismicAssault.java
@@ -37,7 +37,7 @@ public class SeismicAssault extends mage.sets.seventhedition.SeismicAssault {
 
     public SeismicAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SerpentWarrior.java b/Mage.Sets/src/mage/sets/eighthedition/SerpentWarrior.java
index e51ee37d0a..e06d563416 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SerpentWarrior.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SerpentWarrior.java
@@ -37,7 +37,7 @@ public class SerpentWarrior extends mage.sets.stronghold.SerpentWarrior {
 
     public SerpentWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SerraAngel.java b/Mage.Sets/src/mage/sets/eighthedition/SerraAngel.java
index 7549cc71b0..d4903727d7 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SerraAngel.java
@@ -37,7 +37,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SeverSoul.java b/Mage.Sets/src/mage/sets/eighthedition/SeverSoul.java
index 282c6c05ea..b99989bb6f 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SeverSoul.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SeverSoul.java
@@ -38,7 +38,7 @@ public class SeverSoul extends mage.sets.mercadianmasques.SeverSoul {
 
     public SeverSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SeveredLegion.java b/Mage.Sets/src/mage/sets/eighthedition/SeveredLegion.java
index 01cf5f1b87..ba575e5682 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SeveredLegion.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SeveredLegion.java
@@ -37,7 +37,7 @@ public class SeveredLegion extends mage.sets.tenthedition.SeveredLegion {
 
     public SeveredLegion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Shatter.java b/Mage.Sets/src/mage/sets/eighthedition/Shatter.java
index 99ae064412..c0ad5dc334 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ShiftingSky.java b/Mage.Sets/src/mage/sets/eighthedition/ShiftingSky.java
index 5b94a6eadc..f8cf37225b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ShiftingSky.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ShiftingSky.java
@@ -38,7 +38,7 @@ public class ShiftingSky extends mage.sets.planeshift.ShiftingSky {
 
     public ShiftingSky(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ShivanDragon.java b/Mage.Sets/src/mage/sets/eighthedition/ShivanDragon.java
index f33dcb42cf..b5b4bb3660 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ShivanOasis.java b/Mage.Sets/src/mage/sets/eighthedition/ShivanOasis.java
index 7321d02abd..28203816b9 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ShivanOasis.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ShivanOasis.java
@@ -37,7 +37,7 @@ public class ShivanOasis extends mage.sets.planechase.ShivanOasis {
 
     public ShivanOasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 326;
+        this.cardNumber = "326";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Shock.java b/Mage.Sets/src/mage/sets/eighthedition/Shock.java
index edf8425d06..cd04ed8f41 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Shock.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ShockTroops.java b/Mage.Sets/src/mage/sets/eighthedition/ShockTroops.java
index ba72bc1e0d..67e87bba90 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ShockTroops.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ShockTroops.java
@@ -37,7 +37,7 @@ public class ShockTroops extends mage.sets.mercadianmasques.ShockTroops {
 
     public ShockTroops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Sizzle.java b/Mage.Sets/src/mage/sets/eighthedition/Sizzle.java
index 137fc2ba7e..fc651d9799 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Sizzle.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Sizzle.java
@@ -37,7 +37,7 @@ public class Sizzle extends mage.sets.mercadianmasques.Sizzle {
 
     public Sizzle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java b/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java
index 00fdc88d76..0d2e5532c0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java
@@ -38,7 +38,7 @@ public class SkullOfOrm extends mage.sets.thedark.SkullOfOrm {
 
     public SkullOfOrm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Slay.java b/Mage.Sets/src/mage/sets/eighthedition/Slay.java
index 6074e7dc97..79ed050845 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Slay.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Slay.java
@@ -37,7 +37,7 @@ public class Slay extends mage.sets.ninthedition.Slay {
 
     public Slay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SneakyHomunculus.java b/Mage.Sets/src/mage/sets/eighthedition/SneakyHomunculus.java
index c401fdaf02..b1db4344aa 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SneakyHomunculus.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SneakyHomunculus.java
@@ -37,7 +37,7 @@ public class SneakyHomunculus extends mage.sets.nemesis.SneakyHomunculus {
 
     public SneakyHomunculus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Solidarity.java b/Mage.Sets/src/mage/sets/eighthedition/Solidarity.java
index 9952676871..236ae065ac 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Solidarity.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Solidarity.java
@@ -37,7 +37,7 @@ public class Solidarity extends mage.sets.urzasdestiny.Solidarity {
 
     public Solidarity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SoulFeast.java b/Mage.Sets/src/mage/sets/eighthedition/SoulFeast.java
index 56d44508fa..3f39c56483 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SoulFeast.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SoulFeast.java
@@ -37,7 +37,7 @@ public class SoulFeast extends mage.sets.tenthedition.SoulFeast {
 
     public SoulFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Spellbook.java b/Mage.Sets/src/mage/sets/eighthedition/Spellbook.java
index 0fe6a2ac96..5a010f1c3c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Spellbook.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Spellbook.java
@@ -37,7 +37,7 @@ public class Spellbook extends mage.sets.magic2010.Spellbook {
 
     public Spellbook(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SpiketailHatchling.java b/Mage.Sets/src/mage/sets/eighthedition/SpiketailHatchling.java
index 306c633288..9eedb50f62 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SpiketailHatchling.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SpiketailHatchling.java
@@ -37,7 +37,7 @@ public class SpiketailHatchling extends mage.sets.tenthedition.SpiketailHatchlin
 
     public SpiketailHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SpinedWurm.java b/Mage.Sets/src/mage/sets/eighthedition/SpinedWurm.java
index 00d64d8c8b..94a89e7ad4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SpinelessThug.java b/Mage.Sets/src/mage/sets/eighthedition/SpinelessThug.java
index 423a20f95a..897a0cc583 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SpinelessThug.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SpinelessThug.java
@@ -37,7 +37,7 @@ public class SpinelessThug extends mage.sets.tenthedition.SpinelessThug {
 
     public SpinelessThug(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/eighthedition/SpiritLink.java
index 64dd50e696..bcae683f81 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SpittingSpider.java b/Mage.Sets/src/mage/sets/eighthedition/SpittingSpider.java
index 3c2cf544a2..ed79125be1 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SpittingSpider.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SpittingSpider.java
@@ -37,7 +37,7 @@ public class SpittingSpider extends mage.sets.prophecy.SpittingSpider {
 
     public SpittingSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SpreadingAlgae.java b/Mage.Sets/src/mage/sets/eighthedition/SpreadingAlgae.java
index 0a3b2d228d..5f7e9f3c4e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SpreadingAlgae.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SpreadingAlgae.java
@@ -37,7 +37,7 @@ public class SpreadingAlgae extends mage.sets.urzassaga.SpreadingAlgae {
 
     public SpreadingAlgae(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/StaunchDefenders.java b/Mage.Sets/src/mage/sets/eighthedition/StaunchDefenders.java
index f2744c8f62..55a980ba9b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/StaunchDefenders.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/StaunchDefenders.java
@@ -37,7 +37,7 @@ public class StaunchDefenders extends mage.sets.tempest.StaunchDefenders {
 
     public StaunchDefenders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/StealArtifact.java b/Mage.Sets/src/mage/sets/eighthedition/StealArtifact.java
index c535ac9422..0083eccb9e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/StoneRain.java b/Mage.Sets/src/mage/sets/eighthedition/StoneRain.java
index 0e700fcbc6..d2e1f020c7 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/StormCrow.java b/Mage.Sets/src/mage/sets/eighthedition/StormCrow.java
index 33eebb461e..4b1a4ebed5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/StormCrow.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/StormCrow.java
@@ -37,7 +37,7 @@ public class StormCrow extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/StoryCircle.java b/Mage.Sets/src/mage/sets/eighthedition/StoryCircle.java
index 94f0f05e02..7bb0690f39 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/StoryCircle.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/StoryCircle.java
@@ -39,7 +39,7 @@ public class StoryCircle extends mage.sets.mercadianmasques.StoryCircle {
 
     public StoryCircle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java
index 658f37cb6d..ee0f1a5435 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java
@@ -38,7 +38,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SuddenImpact.java b/Mage.Sets/src/mage/sets/eighthedition/SuddenImpact.java
index d4a88ce0d6..116bf265fe 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SuddenImpact.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SuddenImpact.java
@@ -37,7 +37,7 @@ public class SuddenImpact extends mage.sets.seventhedition.SuddenImpact {
 
     public SuddenImpact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SuntailHawk.java b/Mage.Sets/src/mage/sets/eighthedition/SuntailHawk.java
index a8b9475d40..679d47a32b 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SuntailHawk.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SuntailHawk.java
@@ -37,7 +37,7 @@ public class SuntailHawk extends mage.sets.tenthedition.SuntailHawk {
 
     public SuntailHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Sunweb.java b/Mage.Sets/src/mage/sets/eighthedition/Sunweb.java
index 2663ee4f4c..ce0a749341 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Sunweb.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Sunweb.java
@@ -37,7 +37,7 @@ public class Sunweb extends mage.sets.seventhedition.Sunweb {
 
     public Sunweb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SwarmOfRats.java b/Mage.Sets/src/mage/sets/eighthedition/SwarmOfRats.java
index 5af8a118b8..f839c686df 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SwarmOfRats.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SwarmOfRats.java
@@ -37,7 +37,7 @@ public class SwarmOfRats extends mage.sets.ninthedition.SwarmOfRats {
 
     public SwarmOfRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/SwordDancer.java b/Mage.Sets/src/mage/sets/eighthedition/SwordDancer.java
index 6da6ba1aa0..1bc80a51f8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/SwordDancer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/SwordDancer.java
@@ -37,7 +37,7 @@ public class SwordDancer extends mage.sets.prophecy.SwordDancer {
 
     public SwordDancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TeferisPuzzleBox.java b/Mage.Sets/src/mage/sets/eighthedition/TeferisPuzzleBox.java
index 97c467f414..3b43197e17 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TeferisPuzzleBox.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TeferisPuzzleBox.java
@@ -38,7 +38,7 @@ public class TeferisPuzzleBox extends mage.sets.ninthedition.TeferisPuzzleBox {
 
     public TeferisPuzzleBox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Telepathy.java b/Mage.Sets/src/mage/sets/eighthedition/Telepathy.java
index fbff5b6575..5a7306c183 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Telepathy.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Telepathy.java
@@ -36,7 +36,7 @@ public class Telepathy extends mage.sets.urzassaga.Telepathy {
 
     public Telepathy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TemporalAdept.java b/Mage.Sets/src/mage/sets/eighthedition/TemporalAdept.java
index 55fde2eea2..4acb1e42a5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TemporalAdept.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TemporalAdept.java
@@ -37,7 +37,7 @@ public class TemporalAdept extends mage.sets.ninthedition.TemporalAdept {
 
     public TemporalAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ThievesAuction.java b/Mage.Sets/src/mage/sets/eighthedition/ThievesAuction.java
index 9f5d2bd61a..672497f4d1 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ThievesAuction.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ThievesAuction.java
@@ -37,7 +37,7 @@ public class ThievesAuction extends mage.sets.mercadianmasques.ThievesAuction {
 
     public ThievesAuction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ThievingMagpie.java b/Mage.Sets/src/mage/sets/eighthedition/ThievingMagpie.java
index a3916f9d4d..f4a65dc6b9 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ThievingMagpie.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ThievingMagpie.java
@@ -37,7 +37,7 @@ public class ThievingMagpie extends mage.sets.ninthedition.ThievingMagpie {
 
     public ThievingMagpie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ThornElemental.java b/Mage.Sets/src/mage/sets/eighthedition/ThornElemental.java
index 2236137372..565a1f8756 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ThornElemental.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ThornElemental.java
@@ -37,7 +37,7 @@ public class ThornElemental extends mage.sets.urzasdestiny.ThornElemental {
 
     public ThornElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/eighthedition/ThroneOfBone.java
index baa91317f1..26c0c134fa 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TidalKraken.java b/Mage.Sets/src/mage/sets/eighthedition/TidalKraken.java
index d9fac10313..0073a159cd 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TidalKraken.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TidalKraken.java
@@ -37,7 +37,7 @@ public class TidalKraken extends mage.sets.ninthedition.TidalKraken {
 
     public TidalKraken(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TradeRoutes.java b/Mage.Sets/src/mage/sets/eighthedition/TradeRoutes.java
index 03ce489e81..e437cf4dc4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TradeRoutes.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TradeRoutes.java
@@ -37,7 +37,7 @@ public class TradeRoutes extends mage.sets.ninthedition.TradeRoutes {
 
     public TradeRoutes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TrainedArmodon.java b/Mage.Sets/src/mage/sets/eighthedition/TrainedArmodon.java
index 623d7b07d3..de101a5778 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TrainedArmodon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TrainedArmodon.java
@@ -37,7 +37,7 @@ public class TrainedArmodon extends mage.sets.tempest.TrainedArmodon {
 
     public TrainedArmodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TreasureTrove.java b/Mage.Sets/src/mage/sets/eighthedition/TreasureTrove.java
index 76c4ea757a..a93644b310 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TreasureTrove.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TreasureTrove.java
@@ -37,7 +37,7 @@ public class TreasureTrove extends mage.sets.ninthedition.TreasureTrove {
 
     public TreasureTrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Tremor.java b/Mage.Sets/src/mage/sets/eighthedition/Tremor.java
index cb76aa4145..ec12aaab79 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Tremor.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Tremor.java
@@ -37,7 +37,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor {
 
     public Tremor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TundraWolves.java b/Mage.Sets/src/mage/sets/eighthedition/TundraWolves.java
index 47707ebe2a..41c097d9c2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TundraWolves.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TundraWolves.java
@@ -37,7 +37,7 @@ public class TundraWolves extends mage.sets.tenthedition.TundraWolves {
 
     public TundraWolves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Twiddle.java b/Mage.Sets/src/mage/sets/eighthedition/Twiddle.java
index 9dbab90865..5718665b29 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Twiddle.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Twiddle.java
@@ -37,7 +37,7 @@ public class Twiddle extends mage.sets.unlimitededition.Twiddle {
 
     public Twiddle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/TwoHeadedDragon.java b/Mage.Sets/src/mage/sets/eighthedition/TwoHeadedDragon.java
index 1b938157fe..de38a6bcf5 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/TwoHeadedDragon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/TwoHeadedDragon.java
@@ -37,7 +37,7 @@ public class TwoHeadedDragon extends mage.sets.mercadianmasques.TwoHeadedDragon
 
     public TwoHeadedDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UnderworldDreams.java b/Mage.Sets/src/mage/sets/eighthedition/UnderworldDreams.java
index bbb51c80ef..8a7cb4a459 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UnderworldDreams.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UnderworldDreams.java
@@ -37,7 +37,7 @@ public class UnderworldDreams extends mage.sets.magic2010.UnderworldDreams {
 
     public UnderworldDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UnholyStrength.java b/Mage.Sets/src/mage/sets/eighthedition/UnholyStrength.java
index 47dce315b4..f37db60803 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Unsummon.java b/Mage.Sets/src/mage/sets/eighthedition/Unsummon.java
index 8e3241660d..ee1634b84e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UrborgVolcano.java b/Mage.Sets/src/mage/sets/eighthedition/UrborgVolcano.java
index 0ea2bc989d..f9fa9604fc 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UrborgVolcano.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UrborgVolcano.java
@@ -37,7 +37,7 @@ public class UrborgVolcano extends mage.sets.invasion.UrborgVolcano {
 
     public UrborgVolcano(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 327;
+        this.cardNumber = "327";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java b/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java
index 6806941ec6..787fbc2ae1 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java
@@ -38,7 +38,7 @@ public class UrzasArmor extends mage.sets.urzassaga.UrzasArmor {
 
     public UrzasArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UrzasMine.java b/Mage.Sets/src/mage/sets/eighthedition/UrzasMine.java
index 982d9c8745..17be795409 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UrzasMine.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UrzasMine.java
@@ -37,7 +37,7 @@ public class UrzasMine extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 328;
+        this.cardNumber = "328";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UrzasPowerPlant.java b/Mage.Sets/src/mage/sets/eighthedition/UrzasPowerPlant.java
index ac224b13c3..56a854aff2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UrzasPowerPlant.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UrzasPowerPlant.java
@@ -37,7 +37,7 @@ public class UrzasPowerPlant extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 329;
+        this.cardNumber = "329";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/UrzasTower.java b/Mage.Sets/src/mage/sets/eighthedition/UrzasTower.java
index d829bf9d24..9b1b1fd6e1 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/UrzasTower.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/UrzasTower.java
@@ -37,7 +37,7 @@ public class UrzasTower extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 330;
+        this.cardNumber = "330";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/VenerableMonk.java b/Mage.Sets/src/mage/sets/eighthedition/VenerableMonk.java
index 9753fb79fe..89cd696561 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Vengeance.java b/Mage.Sets/src/mage/sets/eighthedition/Vengeance.java
index 04b398cdf5..4836b9dfb4 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Vengeance.java
@@ -37,7 +37,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance {
 
     public Vengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/eighthedition/VerduranEnchantress.java
index fec0cdf666..97656749bf 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/VernalBloom.java b/Mage.Sets/src/mage/sets/eighthedition/VernalBloom.java
index 6558c8bb2d..381a8e9cf0 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/VernalBloom.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/VernalBloom.java
@@ -37,7 +37,7 @@ public class VernalBloom extends mage.sets.urzassaga.VernalBloom {
 
     public VernalBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ViashinoSandstalker.java b/Mage.Sets/src/mage/sets/eighthedition/ViashinoSandstalker.java
index 34eb0bfd32..312c29ddfb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ViashinoSandstalker.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ViashinoSandstalker.java
@@ -37,7 +37,7 @@ public class ViashinoSandstalker extends mage.sets.ninthedition.ViashinoSandstal
 
     public ViashinoSandstalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ViciousHunger.java b/Mage.Sets/src/mage/sets/eighthedition/ViciousHunger.java
index c208fcf29c..8862db87a3 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ViciousHunger.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ViciousHunger.java
@@ -37,7 +37,7 @@ public class ViciousHunger extends mage.sets.nemesis.ViciousHunger {
 
     public ViciousHunger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/VineTrellis.java b/Mage.Sets/src/mage/sets/eighthedition/VineTrellis.java
index 59a78d6458..70af745c51 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/VineTrellis.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/VineTrellis.java
@@ -37,7 +37,7 @@ public class VineTrellis extends mage.sets.mercadianmasques.VineTrellis {
 
     public VineTrellis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Vizzerdrix.java b/Mage.Sets/src/mage/sets/eighthedition/Vizzerdrix.java
index f3740d5a80..f1849bc74c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Vizzerdrix.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Vizzerdrix.java
@@ -37,7 +37,7 @@ public class Vizzerdrix extends mage.sets.seventhedition.Vizzerdrix {
 
     public Vizzerdrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java b/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java
index efc4cfc229..9eff41495e 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java
@@ -36,7 +36,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {
 
     public VolcanicHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WallOfAir.java b/Mage.Sets/src/mage/sets/eighthedition/WallOfAir.java
index e662950f04..7d56166c28 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java b/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java
index a49e7de35e..8260ff5624 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java
@@ -38,7 +38,7 @@ public class WallOfSpears extends mage.sets.fifthedition.WallOfSpears {
 
     public WallOfSpears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WallOfStone.java b/Mage.Sets/src/mage/sets/eighthedition/WallOfStone.java
index 5d5661f496..1c4a313930 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WallOfStone.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WallOfStone.java
@@ -37,7 +37,7 @@ public class WallOfStone extends mage.sets.fifthedition.WallOfStone {
 
     public WallOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/eighthedition/WallOfSwords.java
index 2614282143..80a77fd239 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WesternPaladin.java b/Mage.Sets/src/mage/sets/eighthedition/WesternPaladin.java
index a7fd53374a..cee97ba811 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WesternPaladin.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WesternPaladin.java
@@ -37,7 +37,7 @@ public class WesternPaladin extends mage.sets.urzassaga.WesternPaladin {
 
     public WesternPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WindDrake.java b/Mage.Sets/src/mage/sets/eighthedition/WindDrake.java
index d02b04bf0f..f04b784d8c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WingSnare.java b/Mage.Sets/src/mage/sets/eighthedition/WingSnare.java
index 0c9a4a0370..0b534b490a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WingSnare.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WingSnare.java
@@ -37,7 +37,7 @@ public class WingSnare extends mage.sets.urzaslegacy.WingSnare {
 
     public WingSnare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WoodElves.java b/Mage.Sets/src/mage/sets/eighthedition/WoodElves.java
index 0e18266e79..6091f49f3a 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WoodenSphere.java b/Mage.Sets/src/mage/sets/eighthedition/WoodenSphere.java
index 4deac2fb18..22111ff0a2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Worship.java b/Mage.Sets/src/mage/sets/eighthedition/Worship.java
index 57ed25be92..c53a892bcb 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Worship.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Worship.java
@@ -38,7 +38,7 @@ public class Worship extends mage.sets.urzassaga.Worship {
 
     public Worship(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/eighthedition/WrathOfGod.java
index 4ad3962d6c..40434bfc5c 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java b/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java
index 83678a9ffd..4b181b1a08 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java
@@ -38,7 +38,7 @@ public class WrathOfMaritLage extends mage.sets.iceage.WrathOfMaritLage {
 
     public WrathOfMaritLage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "8ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eighthedition/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/eighthedition/YavimayaEnchantress.java
index f13728e3ae..eed251a902 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/YavimayaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/YavimayaEnchantress.java
@@ -37,7 +37,7 @@ public class YavimayaEnchantress extends mage.sets.tenthedition.YavimayaEnchantr
 
     public YavimayaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/Zombify.java b/Mage.Sets/src/mage/sets/eighthedition/Zombify.java
index e24d9a861f..7961999ba2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/Zombify.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/Zombify.java
@@ -37,7 +37,7 @@ public class Zombify extends mage.sets.ninthedition.Zombify {
 
     public Zombify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eighthedition/ZursWeirding.java b/Mage.Sets/src/mage/sets/eighthedition/ZursWeirding.java
index ba81770403..ad4925a0a8 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/ZursWeirding.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/ZursWeirding.java
@@ -37,7 +37,7 @@ public class ZursWeirding extends mage.sets.iceage.ZursWeirding {
 
     public ZursWeirding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "8ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/Convolute.java b/Mage.Sets/src/mage/sets/eldritchmoon/Convolute.java
index d764098916..b0d28df413 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/Convolute.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/Convolute.java
@@ -37,7 +37,7 @@ public class Convolute extends mage.sets.ravnica.Convolute {
 
     public Convolute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/HamletCaptain.java b/Mage.Sets/src/mage/sets/eldritchmoon/HamletCaptain.java
index 3c5391375a..f4bd1538ef 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/HamletCaptain.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/HamletCaptain.java
@@ -37,7 +37,7 @@ public class HamletCaptain extends mage.sets.innistrad.HamletCaptain {
 
     public HamletCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/Murder.java b/Mage.Sets/src/mage/sets/eldritchmoon/Murder.java
index 6ac17032fa..e6382a8e7b 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/Murder.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/Murder.java
@@ -38,7 +38,7 @@ public class Murder extends mage.sets.magic2013.Murder {
 
     public Murder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "EMN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/PeaceOfMind.java b/Mage.Sets/src/mage/sets/eldritchmoon/PeaceOfMind.java
index d4fbd576a0..90e1c5ce7e 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/PeaceOfMind.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/PeaceOfMind.java
@@ -37,7 +37,7 @@ public class PeaceOfMind extends mage.sets.ninthedition.PeaceOfMind {
 
     public PeaceOfMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/PreyUpon.java b/Mage.Sets/src/mage/sets/eldritchmoon/PreyUpon.java
index caf215f140..b6e0228e30 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/PreyUpon.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/PreyUpon.java
@@ -37,7 +37,7 @@ public class PreyUpon extends mage.sets.innistrad.PreyUpon {
 
     public PreyUpon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/RideDown.java b/Mage.Sets/src/mage/sets/eldritchmoon/RideDown.java
index bd1c9dba00..fabce419d1 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/RideDown.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/RideDown.java
@@ -37,7 +37,7 @@ public class RideDown extends mage.sets.khansoftarkir.RideDown {
 
     public RideDown(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/eldritchmoon/RiseFromTheGrave.java
index 3045f0687e..94f8879583 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/RiseFromTheGrave.java
@@ -37,7 +37,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/Terrarion.java b/Mage.Sets/src/mage/sets/eldritchmoon/Terrarion.java
index 6536e840b2..267bcc1d9e 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/Terrarion.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/Terrarion.java
@@ -37,7 +37,7 @@ public class Terrarion extends mage.sets.ravnica.Terrarion {
 
     public Terrarion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/ThaliaHereticCathar.java b/Mage.Sets/src/mage/sets/eldritchmoon/ThaliaHereticCathar.java
index 9e2aea5cfe..d55fb5e309 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/ThaliaHereticCathar.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/ThaliaHereticCathar.java
@@ -37,7 +37,7 @@ public class ThaliaHereticCathar extends mage.sets.mediainserts.ThaliaHereticCat
 
     public ThaliaHereticCathar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/TurnAside.java b/Mage.Sets/src/mage/sets/eldritchmoon/TurnAside.java
index d109f9335b..6b6cd8f0a6 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/TurnAside.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/TurnAside.java
@@ -37,7 +37,7 @@ public class TurnAside extends mage.sets.scarsofmirrodin.TurnAside {
 
     public TurnAside(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "EMN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java b/Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java
index 17f763e675..709c5c3ea9 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java
@@ -37,7 +37,7 @@ public class AEtherize extends mage.sets.gatecrash.AEtherize {
 
     public AEtherize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/AccumulatedKnowledge.java b/Mage.Sets/src/mage/sets/elspethvskiora/AccumulatedKnowledge.java
index c074756b81..eb80f93229 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/AccumulatedKnowledge.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/AccumulatedKnowledge.java
@@ -37,7 +37,7 @@ public class AccumulatedKnowledge extends mage.sets.nemesis.AccumulatedKnowledge
 
     public AccumulatedKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/BanisherPriest.java b/Mage.Sets/src/mage/sets/elspethvskiora/BanisherPriest.java
index b259cf95d2..95586923e0 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/BanisherPriest.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/BanisherPriest.java
@@ -37,7 +37,7 @@ public class BanisherPriest extends mage.sets.magic2014.BanisherPriest {
 
     public BanisherPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/CaptainOfTheWatch.java b/Mage.Sets/src/mage/sets/elspethvskiora/CaptainOfTheWatch.java
index 705637ec14..fd95c55e8c 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/CaptainOfTheWatch.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/CaptainOfTheWatch.java
@@ -37,7 +37,7 @@ public class CaptainOfTheWatch extends mage.sets.magic2010.CaptainOfTheWatch {
 
     public CaptainOfTheWatch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/CelestialFlare.java b/Mage.Sets/src/mage/sets/elspethvskiora/CelestialFlare.java
index 09dca20818..a9edaca1c1 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/CelestialFlare.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/CelestialFlare.java
@@ -37,7 +37,7 @@ public class CelestialFlare extends mage.sets.magic2014.CelestialFlare {
 
     public CelestialFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/CoilingOracle.java b/Mage.Sets/src/mage/sets/elspethvskiora/CoilingOracle.java
index 83fa44e1d9..e7771ee600 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/CoilingOracle.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/CoilingOracle.java
@@ -37,7 +37,7 @@ public class CoilingOracle extends mage.sets.dissension.CoilingOracle {
 
     public CoilingOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/CourtStreetDenizen.java b/Mage.Sets/src/mage/sets/elspethvskiora/CourtStreetDenizen.java
index fb87f854b0..03290f8d90 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/CourtStreetDenizen.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/CourtStreetDenizen.java
@@ -37,7 +37,7 @@ public class CourtStreetDenizen extends mage.sets.gatecrash.CourtStreetDenizen {
 
     public CourtStreetDenizen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/DauntlessOnslaught.java b/Mage.Sets/src/mage/sets/elspethvskiora/DauntlessOnslaught.java
index 5cea948ffc..0cae12ee4e 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/DauntlessOnslaught.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/DauntlessOnslaught.java
@@ -37,7 +37,7 @@ public class DauntlessOnslaught extends mage.sets.theros.DauntlessOnslaught {
 
     public DauntlessOnslaught(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/DecreeOfJustice.java b/Mage.Sets/src/mage/sets/elspethvskiora/DecreeOfJustice.java
index 2007f5a4e2..6d84eb6e3b 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/DecreeOfJustice.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/DecreeOfJustice.java
@@ -37,7 +37,7 @@ public class DecreeOfJustice extends mage.sets.vintagemasters.DecreeOfJustice {
 
     public DecreeOfJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/DictateOfHeliod.java b/Mage.Sets/src/mage/sets/elspethvskiora/DictateOfHeliod.java
index 47fb85ff65..1da0c98770 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/DictateOfHeliod.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/DictateOfHeliod.java
@@ -37,7 +37,7 @@ public class DictateOfHeliod extends mage.sets.journeyintonyx.DictateOfHeliod {
 
     public DictateOfHeliod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/ElspethSunsChampion.java b/Mage.Sets/src/mage/sets/elspethvskiora/ElspethSunsChampion.java
index ae2b129529..3b3baf84b1 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/ElspethSunsChampion.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/ElspethSunsChampion.java
@@ -37,7 +37,7 @@ public class ElspethSunsChampion extends mage.sets.theros.ElspethSunsChampion {
 
     public ElspethSunsChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/EvolvingWilds.java b/Mage.Sets/src/mage/sets/elspethvskiora/EvolvingWilds.java
index 2b4a8f2258..956ec1dc62 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/Explore.java b/Mage.Sets/src/mage/sets/elspethvskiora/Explore.java
index 1f36938a45..8346a9dde2 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/Explore.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/Explore.java
@@ -37,7 +37,7 @@ public class Explore extends mage.sets.worldwake.Explore {
 
     public Explore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/elspethvskiora/ExplosiveVegetation.java
index fc9494d556..c36452b37a 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/ExplosiveVegetation.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/ExplosiveVegetation.java
@@ -37,7 +37,7 @@ public class ExplosiveVegetation extends mage.sets.planechase.ExplosiveVegetatio
 
     public ExplosiveVegetation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/GempalmAvenger.java b/Mage.Sets/src/mage/sets/elspethvskiora/GempalmAvenger.java
index ebfd39e6dc..7d9f513277 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/GempalmAvenger.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/GempalmAvenger.java
@@ -37,7 +37,7 @@ public class GempalmAvenger extends mage.sets.legions.GempalmAvenger {
 
     public GempalmAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/GrazingGladehart.java b/Mage.Sets/src/mage/sets/elspethvskiora/GrazingGladehart.java
index 50e3e8a99a..d6f4f204fa 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/GrazingGladehart.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/GrazingGladehart.java
@@ -37,7 +37,7 @@ public class GrazingGladehart extends mage.sets.zendikar.GrazingGladehart {
 
     public GrazingGladehart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakHarrier.java b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakHarrier.java
index c27c461a19..d6377854e5 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakHarrier.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakHarrier.java
@@ -37,7 +37,7 @@ public class GustcloakHarrier extends mage.sets.vintagemasters.GustcloakHarrier
 
     public GustcloakHarrier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSavior.java b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSavior.java
index 3820457be6..364f8c22d2 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSavior.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSavior.java
@@ -37,7 +37,7 @@ public class GustcloakSavior extends mage.sets.onslaught.GustcloakSavior {
 
     public GustcloakSavior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSentinel.java b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSentinel.java
index c0efb7f81b..78cc21b5e9 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSentinel.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSentinel.java
@@ -37,7 +37,7 @@ public class GustcloakSentinel extends mage.sets.onslaught.GustcloakSentinel {
 
     public GustcloakSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSkirmisher.java b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSkirmisher.java
index fa11d173ec..74046306a5 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/GustcloakSkirmisher.java
@@ -37,7 +37,7 @@ public class GustcloakSkirmisher extends mage.sets.onslaught.GustcloakSkirmisher
 
     public GustcloakSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java
index bbde1977f5..b2d102bada 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java
@@ -37,7 +37,7 @@ public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelinee
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/elspethvskiora/InkwellLeviathan.java
index 94d839f201..c3e3a74a5c 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/InkwellLeviathan.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/InkwellLeviathan.java
@@ -37,7 +37,7 @@ public class InkwellLeviathan extends mage.sets.conflux.InkwellLeviathan {
 
     public InkwellLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/elspethvskiora/KinsbaileSkirmisher.java
index b61832e076..4cd531c4c8 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/KinsbaileSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/KinsbaileSkirmisher.java
@@ -37,7 +37,7 @@ public class KinsbaileSkirmisher extends mage.sets.lorwyn.KinsbaileSkirmisher {
 
     public KinsbaileSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/KioraTheCrashingWave.java b/Mage.Sets/src/mage/sets/elspethvskiora/KioraTheCrashingWave.java
index 4f6e6e21ea..68842c7555 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/KioraTheCrashingWave.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/KioraTheCrashingWave.java
@@ -37,7 +37,7 @@ public class KioraTheCrashingWave extends mage.sets.bornofthegods.KioraTheCrashi
 
     public KioraTheCrashingWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/KiorasFollower.java b/Mage.Sets/src/mage/sets/elspethvskiora/KiorasFollower.java
index 1f8b1eb524..337c3333be 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/KiorasFollower.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/KiorasFollower.java
@@ -37,7 +37,7 @@ public class KiorasFollower extends mage.sets.bornofthegods.KiorasFollower {
 
     public KiorasFollower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/KorSkyfisher.java b/Mage.Sets/src/mage/sets/elspethvskiora/KorSkyfisher.java
index 5dd5e4554c..c774acd0fd 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/KorSkyfisher.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/KorSkyfisher.java
@@ -37,7 +37,7 @@ public class KorSkyfisher extends mage.sets.zendikar.KorSkyfisher {
 
     public KorSkyfisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/LorescaleCoatl.java b/Mage.Sets/src/mage/sets/elspethvskiora/LorescaleCoatl.java
index 14bb7a8a9b..bd411cb9d0 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/LorescaleCoatl.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/LorescaleCoatl.java
@@ -37,7 +37,7 @@ public class LorescaleCoatl extends mage.sets.alarareborn.LorescaleCoatl {
 
     public LorescaleCoatl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/LoxodonPartisan.java b/Mage.Sets/src/mage/sets/elspethvskiora/LoxodonPartisan.java
index 507a951034..472d9ae4fb 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/LoxodonPartisan.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/LoxodonPartisan.java
@@ -37,7 +37,7 @@ public class LoxodonPartisan extends mage.sets.mirrodinbesieged.LoxodonPartisan
 
     public LoxodonPartisan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/ManOWar.java b/Mage.Sets/src/mage/sets/elspethvskiora/ManOWar.java
index 387c118fd3..696aec7716 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/ManOWar.java
@@ -37,7 +37,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/MightyLeap.java b/Mage.Sets/src/mage/sets/elspethvskiora/MightyLeap.java
index bbe6997383..57aee6c4ff 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/MightyLeap.java
@@ -37,7 +37,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/MortalsArdor.java b/Mage.Sets/src/mage/sets/elspethvskiora/MortalsArdor.java
index 6cccb5ed5c..5971524f5a 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/MortalsArdor.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/MortalsArdor.java
@@ -37,7 +37,7 @@ public class MortalsArdor extends mage.sets.bornofthegods.MortalsArdor {
 
     public MortalsArdor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/MotherOfRunes.java b/Mage.Sets/src/mage/sets/elspethvskiora/MotherOfRunes.java
index f686ecd2a8..ab3879aa18 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/MotherOfRunes.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/MotherOfRunes.java
@@ -37,7 +37,7 @@ public class MotherOfRunes extends mage.sets.urzaslegacy.MotherOfRunes {
 
     public MotherOfRunes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/NessianAsp.java b/Mage.Sets/src/mage/sets/elspethvskiora/NessianAsp.java
index 9cc1e283e8..48ccf15d60 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/NessianAsp.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/NessianAsp.java
@@ -37,7 +37,7 @@ public class NessianAsp extends mage.sets.theros.NessianAsp {
 
     public NessianAsp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/NetcasterSpider.java b/Mage.Sets/src/mage/sets/elspethvskiora/NetcasterSpider.java
index 397af69722..0682ef3256 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/NetcasterSpider.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/NetcasterSpider.java
@@ -37,7 +37,7 @@ public class NetcasterSpider extends mage.sets.magic2015.NetcasterSpider {
 
     public NetcasterSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/NimbusSwimmer.java b/Mage.Sets/src/mage/sets/elspethvskiora/NimbusSwimmer.java
index 87e8e2507a..bc7669c3c5 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/NimbusSwimmer.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/NimbusSwimmer.java
@@ -37,7 +37,7 @@ public class NimbusSwimmer extends mage.sets.gatecrash.NimbusSwimmer {
 
     public NimbusSwimmer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/NobleTemplar.java b/Mage.Sets/src/mage/sets/elspethvskiora/NobleTemplar.java
index f54e424821..93449d41d3 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/NobleTemplar.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/NobleTemplar.java
@@ -37,7 +37,7 @@ public class NobleTemplar extends mage.sets.scourge.NobleTemplar {
 
     public NobleTemplar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/Omenspeaker.java b/Mage.Sets/src/mage/sets/elspethvskiora/Omenspeaker.java
index 746167f70b..f10bdadeff 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/Omenspeaker.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/Omenspeaker.java
@@ -37,7 +37,7 @@ public class Omenspeaker extends mage.sets.theros.Omenspeaker {
 
     public Omenspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/PeelFromReality.java b/Mage.Sets/src/mage/sets/elspethvskiora/PeelFromReality.java
index b82f1a0b64..c1ca796bce 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/PeelFromReality.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/PeelFromReality.java
@@ -37,7 +37,7 @@ public class PeelFromReality extends mage.sets.avacynrestored.PeelFromReality {
 
     public PeelFromReality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/PlasmCapture.java b/Mage.Sets/src/mage/sets/elspethvskiora/PlasmCapture.java
index 3a77abcf29..974329f296 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/PlasmCapture.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/PlasmCapture.java
@@ -37,7 +37,7 @@ public class PlasmCapture extends mage.sets.dragonsmaze.PlasmCapture {
 
     public PlasmCapture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/PrecinctCaptain.java b/Mage.Sets/src/mage/sets/elspethvskiora/PrecinctCaptain.java
index a46f08196a..910ab3e2f8 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/PrecinctCaptain.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/PrecinctCaptain.java
@@ -37,7 +37,7 @@ public class PrecinctCaptain extends mage.sets.returntoravnica.PrecinctCaptain {
 
     public PrecinctCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/elspethvskiora/RaiseTheAlarm.java
index c93f6a7aab..fbaa644675 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/RaiseTheAlarm.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/RaiseTheAlarm.java
@@ -37,7 +37,7 @@ public class RaiseTheAlarm extends mage.sets.mirrodin.RaiseTheAlarm {
 
     public RaiseTheAlarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/ScourgeOfFleets.java b/Mage.Sets/src/mage/sets/elspethvskiora/ScourgeOfFleets.java
index 4d99bd8ecc..39550c5f73 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/ScourgeOfFleets.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/ScourgeOfFleets.java
@@ -37,7 +37,7 @@ public class ScourgeOfFleets extends mage.sets.journeyintonyx.ScourgeOfFleets {
 
     public ScourgeOfFleets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/SealockMonster.java b/Mage.Sets/src/mage/sets/elspethvskiora/SealockMonster.java
index a8d2d41a13..1d719ead51 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/SealockMonster.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/SealockMonster.java
@@ -37,7 +37,7 @@ public class SealockMonster extends mage.sets.theros.SealockMonster {
 
     public SealockMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/SecludedSteppe.java b/Mage.Sets/src/mage/sets/elspethvskiora/SecludedSteppe.java
index ccd252f1ea..45e8e35f25 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/SimicSkySwallower.java b/Mage.Sets/src/mage/sets/elspethvskiora/SimicSkySwallower.java
index 8a256866fc..44c434b691 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/SimicSkySwallower.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/SimicSkySwallower.java
@@ -37,7 +37,7 @@ public class SimicSkySwallower extends mage.sets.dissension.SimicSkySwallower {
 
     public SimicSkySwallower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/SoulParry.java b/Mage.Sets/src/mage/sets/elspethvskiora/SoulParry.java
index f0b6360223..927a8912ec 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/SoulParry.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/SoulParry.java
@@ -37,7 +37,7 @@ public class SoulParry extends mage.sets.scarsofmirrodin.SoulParry {
 
     public SoulParry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/StandingTroops.java b/Mage.Sets/src/mage/sets/elspethvskiora/StandingTroops.java
index e2197a730e..16be8468e8 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/StandingTroops.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/StandingTroops.java
@@ -37,7 +37,7 @@ public class StandingTroops extends mage.sets.eighthedition.StandingTroops {
 
     public StandingTroops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/Sunlance.java b/Mage.Sets/src/mage/sets/elspethvskiora/Sunlance.java
index ddfdfe42c9..e3f83612fa 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/Sunlance.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/Sunlance.java
@@ -37,7 +37,7 @@ public class Sunlance extends mage.sets.planarchaos.Sunlance {
 
     public Sunlance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/SurrakarBanisher.java b/Mage.Sets/src/mage/sets/elspethvskiora/SurrakarBanisher.java
index 13a190a72f..975ae44564 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/SurrakarBanisher.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/SurrakarBanisher.java
@@ -37,7 +37,7 @@ public class SurrakarBanisher extends mage.sets.worldwake.SurrakarBanisher {
 
     public SurrakarBanisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/TempleOfTheFalseGod.java b/Mage.Sets/src/mage/sets/elspethvskiora/TempleOfTheFalseGod.java
index d2f4e96ec2..afb6381f2f 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/TempleOfTheFalseGod.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/TempleOfTheFalseGod.java
@@ -37,7 +37,7 @@ public class TempleOfTheFalseGod extends mage.sets.commander2013.TempleOfTheFals
 
     public TempleOfTheFalseGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/TimeToFeed.java b/Mage.Sets/src/mage/sets/elspethvskiora/TimeToFeed.java
index a55c0e1f27..710e8c943e 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/TimeToFeed.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/TimeToFeed.java
@@ -37,7 +37,7 @@ public class TimeToFeed extends mage.sets.theros.TimeToFeed {
 
     public TimeToFeed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/UrbanEvolution.java b/Mage.Sets/src/mage/sets/elspethvskiora/UrbanEvolution.java
index 0316f5c840..1498b910bb 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/UrbanEvolution.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/UrbanEvolution.java
@@ -37,7 +37,7 @@ public class UrbanEvolution extends mage.sets.gatecrash.UrbanEvolution {
 
     public UrbanEvolution(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/VeteranArmorsmith.java b/Mage.Sets/src/mage/sets/elspethvskiora/VeteranArmorsmith.java
index 2f9585c566..3267cb8fea 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/VeteranArmorsmith.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/VeteranArmorsmith.java
@@ -37,7 +37,7 @@ public class VeteranArmorsmith extends mage.sets.magic2010.VeteranArmorsmith {
 
     public VeteranArmorsmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/VeteranSwordsmith.java b/Mage.Sets/src/mage/sets/elspethvskiora/VeteranSwordsmith.java
index b462e91524..8c921bd79f 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/VeteranSwordsmith.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/VeteranSwordsmith.java
@@ -37,7 +37,7 @@ public class VeteranSwordsmith extends mage.sets.magic2010.VeteranSwordsmith {
 
     public VeteranSwordsmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/WhelmingWave.java b/Mage.Sets/src/mage/sets/elspethvskiora/WhelmingWave.java
index 967cb00102..f80333a82b 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/WhelmingWave.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/WhelmingWave.java
@@ -37,7 +37,7 @@ public class WhelmingWave extends mage.sets.bornofthegods.WhelmingWave {
 
     public WhelmingWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Abolish.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Abolish.java
index 3228052946..39d8b97ed2 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Abolish.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Abolish.java
@@ -38,7 +38,7 @@ public class Abolish extends mage.sets.prophecy.Abolish {
 
     public Abolish (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ArcboundWorker.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ArcboundWorker.java
index 478c72052c..a6c9669300 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ArcboundWorker.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ArcboundWorker.java
@@ -37,7 +37,7 @@ public class ArcboundWorker extends mage.sets.darksteel.ArcboundWorker {
 
     public ArcboundWorker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/AssemblyWorker.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/AssemblyWorker.java
index 08fa5d7051..71612c35a7 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/AssemblyWorker.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/AssemblyWorker.java
@@ -37,7 +37,7 @@ public class AssemblyWorker extends mage.sets.timespiral.AssemblyWorker {
 
     public AssemblyWorker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/CatapultMaster.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/CatapultMaster.java
index 3de42d7c0b..7e840e6deb 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/CatapultMaster.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/CatapultMaster.java
@@ -38,7 +38,7 @@ public class CatapultMaster extends mage.sets.onslaught.CatapultMaster {
 
     public CatapultMaster (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkCondor.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkCondor.java
index a504970e5f..536d3d6378 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkCondor.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkCondor.java
@@ -38,7 +38,7 @@ public class ClockworkCondor extends mage.sets.mirrodin.ClockworkCondor {
 
     public ClockworkCondor (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkHydra.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkHydra.java
index e8b3d3d57b..ecd5e317d4 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkHydra.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ClockworkHydra.java
@@ -37,7 +37,7 @@ public class ClockworkHydra extends mage.sets.timespiral.ClockworkHydra {
 
     public ClockworkHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java
index ec3e96d91e..b30c21800c 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java
@@ -38,7 +38,7 @@ public class ContagionClasp extends mage.sets.scarsofmirrodin.ContagionClasp {
 
     public ContagionClasp (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/DarksteelCitadel.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/DarksteelCitadel.java
index 2b379408cf..8a79d89234 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/DarksteelCitadel.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/DarksteelCitadel.java
@@ -38,7 +38,7 @@ public class DarksteelCitadel extends mage.sets.darksteel.DarksteelCitadel {
 
     public DarksteelCitadel (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/EliteVanguard.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/EliteVanguard.java
index 33f6fa7114..f3e9092afc 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/EliteVanguard.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/EliteVanguard.java
@@ -39,7 +39,7 @@ public class EliteVanguard extends mage.sets.magic2010.EliteVanguard {
     public EliteVanguard (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "DDF";
-        this.cardNumber = 2;
+        this.cardNumber = "2";
     }
 
     public EliteVanguard (final EliteVanguard card) {
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality.java
index f76ed87675..8ba36e9918 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality.java
@@ -38,7 +38,7 @@ public class ElixirOfImmortality extends mage.sets.magic2011.ElixirOfImmortality
 
     public ElixirOfImmortality (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElspethKnightErrant.java
index 9e7ac41d2d..4572053fe5 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElspethKnightErrant.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElspethKnightErrant.java
@@ -39,7 +39,7 @@ public class ElspethKnightErrant extends mage.sets.shardsofalara.ElspethKnightEr
     public ElspethKnightErrant (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "DDF";
-        this.cardNumber = 1;
+        this.cardNumber = "1";
     }
 
     public ElspethKnightErrant (final ElspethKnightErrant card) {
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Esperzoa.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Esperzoa.java
index 633cdcc67d..0a82d8f348 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Esperzoa.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Esperzoa.java
@@ -38,7 +38,7 @@ public class Esperzoa extends mage.sets.conflux.Esperzoa {
 
     public Esperzoa (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/EverflowingChalice.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/EverflowingChalice.java
index d7afcfba09..351383a499 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/EverflowingChalice.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/EverflowingChalice.java
@@ -38,7 +38,7 @@ public class EverflowingChalice extends mage.sets.worldwake.EverflowingChalice {
 
     public EverflowingChalice (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/FaerieMechanist.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/FaerieMechanist.java
index f26033cf19..90d42e1abb 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/FaerieMechanist.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/FaerieMechanist.java
@@ -37,7 +37,7 @@ public class FaerieMechanist extends mage.sets.conflux.FaerieMechanist {
 
     public FaerieMechanist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Foil.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Foil.java
index 661a626ddf..2f709d5117 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Foil.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Foil.java
@@ -37,7 +37,7 @@ public class Foil extends mage.sets.prophecy.Foil {
 
     public Foil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java
index f3542be63c..6585bbfeb5 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java
@@ -38,7 +38,7 @@ public class GlorySeeker extends mage.sets.riseoftheeldrazi.GlorySeeker {
 
     public GlorySeeker (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java
index 028d2ee7f6..a98b71bbb4 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java
@@ -38,7 +38,7 @@ public class InfantryVeteran extends mage.sets.magic2011.InfantryVeteran {
 
     public InfantryVeteran (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere.java
index b7d2117447..194be69a13 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere.java
@@ -38,7 +38,7 @@ public class JourneyToNowhere extends mage.sets.zendikar.JourneyToNowhere {
 
     public JourneyToNowhere (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Juggernaut.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Juggernaut.java
index 9aa1e2c156..47460b1e03 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Juggernaut.java
@@ -38,7 +38,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/KabiraCrossroads.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/KabiraCrossroads.java
index 881821f831..4da161ca79 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/KabiraCrossroads.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/KabiraCrossroads.java
@@ -38,7 +38,7 @@ public class KabiraCrossroads extends mage.sets.zendikar.KabiraCrossroads {
 
     public KabiraCrossroads (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/KembasSkyguard.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/KembasSkyguard.java
index 044984c40a..8c688bb8ba 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/KembasSkyguard.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/KembasSkyguard.java
@@ -38,7 +38,7 @@ public class KembasSkyguard extends mage.sets.scarsofmirrodin.KembasSkyguard {
 
     public KembasSkyguard (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorAeronaut.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorAeronaut.java
index 89de4366df..2b703cff9e 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorAeronaut.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorAeronaut.java
@@ -37,7 +37,7 @@ public class KorAeronaut extends mage.sets.zendikar.KorAeronaut {
 
     public KorAeronaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorHookmaster.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorHookmaster.java
index 920b250b75..2b47ceb27f 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorHookmaster.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorHookmaster.java
@@ -37,7 +37,7 @@ public class KorHookmaster extends mage.sets.zendikar.KorHookmaster {
 
     public KorHookmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java
index 901a0bd629..12628506c8 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java
@@ -38,7 +38,7 @@ public class KorSkyfisher extends mage.sets.zendikar.KorSkyfisher {
 
     public KorSkyfisher (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/LoyalSentry.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/LoyalSentry.java
index a162306cf4..0841a0092f 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/LoyalSentry.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/LoyalSentry.java
@@ -38,7 +38,7 @@ public class LoyalSentry extends mage.sets.tenthedition.LoyalSentry {
 
     public LoyalSentry (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MasterOfEtherium.java
index 48d8bf7eb2..0a322acf86 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MasterOfEtherium.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MasterOfEtherium.java
@@ -37,7 +37,7 @@ public class MasterOfEtherium extends mage.sets.shardsofalara.MasterOfEtherium {
 
     public MasterOfEtherium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MightyLeap.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MightyLeap.java
index 506dc49d7e..d46905c197 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MightyLeap.java
@@ -38,7 +38,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm.java
index 908349719d..2ebdb0e93f 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm.java
@@ -39,7 +39,7 @@ public class RaiseTheAlarm extends mage.sets.mirrodin.RaiseTheAlarm {
     public RaiseTheAlarm (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "DDF";
-        this.cardNumber = 25;
+        this.cardNumber = "25";
     }
 
     public RaiseTheAlarm (final RaiseTheAlarm card) {
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RazormaneMasticore.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RazormaneMasticore.java
index 4e3bf02005..571dc7089c 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/RazormaneMasticore.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/RazormaneMasticore.java
@@ -37,7 +37,7 @@ public class RazormaneMasticore extends mage.sets.tenthedition.RazormaneMasticor
 
     public RazormaneMasticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RunedServitor.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RunedServitor.java
index 16dcb23a50..c0a1db4477 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/RunedServitor.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/RunedServitor.java
@@ -37,7 +37,7 @@ public class RunedServitor extends mage.sets.riseoftheeldrazi.RunedServitor {
 
     public RunedServitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Saltblast.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Saltblast.java
index 4e9d985c00..243e463658 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Saltblast.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Saltblast.java
@@ -38,7 +38,7 @@ public class Saltblast extends mage.sets.planarchaos.Saltblast {
 
     public Saltblast (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod.java
index d5459988c9..710e6237e8 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod.java
@@ -38,7 +38,7 @@ public class SeatOfTheSynod extends mage.sets.mirrodin.SeatOfTheSynod {
 
     public SeatOfTheSynod (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java
index dc8d50a43c..d394b26c1a 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java
@@ -38,7 +38,7 @@ public class SilverMyr extends mage.sets.mirrodin.SilverMyr {
 
     public SilverMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/StalkingStones.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/StalkingStones.java
index 72221410c0..f8dc50e2c6 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/StalkingStones.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/StalkingStones.java
@@ -37,7 +37,7 @@ public class StalkingStones extends mage.sets.tempest.StalkingStones {
 
     public StalkingStones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java
index 78868c6e60..7385caa1fa 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java
@@ -38,7 +38,7 @@ public class SteelOverseer extends mage.sets.magic2011.SteelOverseer {
 
     public SteelOverseer (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java
index f69e3e7f76..80880caacd 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java
@@ -38,7 +38,7 @@ public class SteelWall extends mage.sets.mirrodin.SteelWall {
 
     public SteelWall (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/StormfrontRiders.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/StormfrontRiders.java
index 462b016ec9..195558b4e4 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/StormfrontRiders.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/StormfrontRiders.java
@@ -37,7 +37,7 @@ public class StormfrontRiders extends mage.sets.planarchaos.StormfrontRiders {
 
     public StormfrontRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Sunlance.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Sunlance.java
index fa32acfa6c..50a2a2c771 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Sunlance.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Sunlance.java
@@ -38,7 +38,7 @@ public class Sunlance extends mage.sets.planarchaos.Sunlance {
 
     public Sunlance (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SwordsToPlowshares.java
index 89df4a5346..42db297cc0 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TezzeretTheSeeker.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TezzeretTheSeeker.java
index 25196d88d1..074578077d 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TezzeretTheSeeker.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TezzeretTheSeeker.java
@@ -37,7 +37,7 @@ public class TezzeretTheSeeker extends mage.sets.shardsofalara.TezzeretTheSeeker
 
     public TezzeretTheSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ThirstForKnowledge.java
index 5a66b4f085..d7748150e3 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ThirstForKnowledge.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ThirstForKnowledge.java
@@ -37,7 +37,7 @@ public class ThirstForKnowledge extends mage.sets.planechase.ThirstForKnowledge
 
     public ThirstForKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java
index 5d66a8b8be..a5ebd4c918 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java
@@ -40,7 +40,7 @@ public class TrinketMage extends mage.sets.scarsofmirrodin.TrinketMage {
     public TrinketMage (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "DDF";
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.rarity = Rarity.COMMON;
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Triskelion.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Triskelion.java
index 2200466615..db27d6e619 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Triskelion.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Triskelion.java
@@ -37,7 +37,7 @@ public class Triskelion extends mage.sets.magic2011.Triskelion {
 
     public Triskelion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/AkkiCoalflinger.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/AkkiCoalflinger.java
index 4ccc80441f..20ce3c2026 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/AkkiCoalflinger.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/AkkiCoalflinger.java
@@ -37,7 +37,7 @@ public class AkkiCoalflinger extends mage.sets.championsofkamigawa.AkkiCoalfling
 
     public AkkiCoalflinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishEulogist.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishEulogist.java
index 76367d2049..3f9982c988 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishEulogist.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishEulogist.java
@@ -37,7 +37,7 @@ public class ElvishEulogist extends mage.sets.lorwyn.ElvishEulogist {
 
     public ElvishEulogist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishHarbinger.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishHarbinger.java
index 4e0e8e88cc..8f2be97a57 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishHarbinger.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishHarbinger.java
@@ -37,7 +37,7 @@ public class ElvishHarbinger extends mage.sets.lorwyn.ElvishHarbinger {
 
     public ElvishHarbinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishPromenade.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishPromenade.java
index e20958801d..bcb74c4ea3 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishPromenade.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishPromenade.java
@@ -37,7 +37,7 @@ public class ElvishPromenade extends mage.sets.lorwyn.ElvishPromenade {
 
     public ElvishPromenade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishWarrior.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishWarrior.java
index 0a4db12623..045643d8ea 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishWarrior.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/ElvishWarrior.java
@@ -37,7 +37,7 @@ public class ElvishWarrior extends mage.sets.morningtide.ElvishWarrior {
 
     public ElvishWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/FlamewaveInvoker.java
index e0bf762c09..4d1e614d0e 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/FlamewaveInvoker.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/FlamewaveInvoker.java
@@ -37,7 +37,7 @@ public class FlamewaveInvoker extends mage.sets.tenthedition.FlamewaveInvoker {
 
     public FlamewaveInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/ForgottenCave.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/ForgottenCave.java
index 5877029935..7a58ae3e27 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GempalmIncinerator.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GempalmIncinerator.java
index ff05acb214..8a044f8690 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GempalmIncinerator.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GempalmIncinerator.java
@@ -37,7 +37,7 @@ public class GempalmIncinerator extends mage.sets.legions.GempalmIncinerator {
 
     public GempalmIncinerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GiantGrowth.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GiantGrowth.java
index 72d774543f..c23e547f0d 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinBurrows.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinBurrows.java
index 8e48c3dced..b00c165a4a 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinBurrows.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinBurrows.java
@@ -37,7 +37,7 @@ public class GoblinBurrows extends mage.sets.onslaught.GoblinBurrows {
 
     public GoblinBurrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinCohort.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinCohort.java
index 3318bbadde..be49e12310 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinCohort.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinCohort.java
@@ -37,7 +37,7 @@ public class GoblinCohort extends mage.sets.betrayersofkamigawa.GoblinCohort {
 
     public GoblinCohort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinMatron.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinMatron.java
index 1e9655f1f8..b9521dfc82 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinMatron.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinMatron.java
@@ -38,7 +38,7 @@ public class GoblinMatron extends mage.sets.urzassaga.GoblinMatron {
 
     public GoblinMatron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "EVG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinRingleader.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinRingleader.java
index 55c93fbdc3..072d3294b5 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinRingleader.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinRingleader.java
@@ -37,7 +37,7 @@ public class GoblinRingleader extends mage.sets.apocalypse.GoblinRingleader {
 
     public GoblinRingleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinSledder.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinSledder.java
index 74d2e15be2..d6177f10b1 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinSledder.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinSledder.java
@@ -37,7 +37,7 @@ public class GoblinSledder extends mage.sets.onslaught.GoblinSledder {
 
     public GoblinSledder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinWarchief.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinWarchief.java
index 63e7a55bfe..ea7a1fa22f 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinWarchief.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/GoblinWarchief.java
@@ -37,7 +37,7 @@ public class GoblinWarchief extends mage.sets.scourge.GoblinWarchief {
 
     public GoblinWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/Harmonize.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/Harmonize.java
index cfe7d19894..cd98671877 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/HeedlessOne.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/HeedlessOne.java
index a7222cff5e..ef2c06c3f0 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/HeedlessOne.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/HeedlessOne.java
@@ -37,7 +37,7 @@ public class HeedlessOne extends mage.sets.onslaught.HeedlessOne {
 
     public HeedlessOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/ImperiousPerfect.java
index e3e3acd914..614cefb632 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/ImperiousPerfect.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/ImperiousPerfect.java
@@ -37,7 +37,7 @@ public class ImperiousPerfect extends mage.sets.lorwyn.ImperiousPerfect {
 
     public ImperiousPerfect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/LlanowarElves.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/LlanowarElves.java
index 09fec37a17..d620efc9c7 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/LysAlanaHuntmaster.java
index e38e39cde4..2b3e867589 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/LysAlanaHuntmaster.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/LysAlanaHuntmaster.java
@@ -37,7 +37,7 @@ public class LysAlanaHuntmaster extends mage.sets.lorwyn.LysAlanaHuntmaster {
 
     public LysAlanaHuntmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggFanatic.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggFanatic.java
index 7b1b44dd2a..cd497cae44 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "EVG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggWarMarshal.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggWarMarshal.java
index f75af47796..1dd93edc95 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggWarMarshal.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/MoggWarMarshal.java
@@ -37,7 +37,7 @@ public class MoggWarMarshal extends mage.sets.timespiral.MoggWarMarshal {
 
     public MoggWarMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/MoongloveExtract.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/MoongloveExtract.java
index d0a83283f2..7597327c6b 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/MoongloveExtract.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/MoongloveExtract.java
@@ -37,7 +37,7 @@ public class MoongloveExtract extends mage.sets.elspethvstezzeret.MoongloveExtra
 
     public MoongloveExtract(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/MudbuttonTorchrunner.java
index d0e696e7a1..d78ae2463e 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/MudbuttonTorchrunner.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/MudbuttonTorchrunner.java
@@ -37,7 +37,7 @@ public class MudbuttonTorchrunner extends mage.sets.lorwyn.MudbuttonTorchrunner
 
     public MudbuttonTorchrunner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/RagingGoblin.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/RagingGoblin.java
index 731d8d3f0c..e65e5439ae 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/RecklessOne.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/RecklessOne.java
index 52aaaa8767..17cf7f3acc 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/RecklessOne.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/RecklessOne.java
@@ -37,7 +37,7 @@ public class RecklessOne extends mage.sets.onslaught.RecklessOne {
 
     public RecklessOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SiegeGangCommander.java
index 5b1e22519c..1f54ac8d2e 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SiegeGangCommander.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SiegeGangCommander.java
@@ -37,7 +37,7 @@ public class SiegeGangCommander extends mage.sets.magic2010.SiegeGangCommander {
 
     public SiegeGangCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkFireMarshal.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkFireMarshal.java
index 359c28e99a..ef4ccc85c0 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkFireMarshal.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkFireMarshal.java
@@ -37,7 +37,7 @@ public class SkirkFireMarshal extends mage.sets.onslaught.SkirkFireMarshal {
 
     public SkirkFireMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkProspector.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkProspector.java
index 25f705fbc9..a5700a0656 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkProspector.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SkirkProspector.java
@@ -37,7 +37,7 @@ public class SkirkProspector extends mage.sets.onslaught.SkirkProspector {
 
     public SkirkProspector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SlateOfAncestry.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SlateOfAncestry.java
index 31e1be33e1..96e3ce9bdd 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SlateOfAncestry.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SlateOfAncestry.java
@@ -37,7 +37,7 @@ public class SlateOfAncestry extends mage.sets.onslaught.SlateOfAncestry {
 
     public SlateOfAncestry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SpittingEarth.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SpittingEarth.java
index 57a5344978..1bd6222025 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/SylvanMessenger.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/SylvanMessenger.java
index d70bf133b3..85eb83fb0f 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/SylvanMessenger.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/SylvanMessenger.java
@@ -37,7 +37,7 @@ public class SylvanMessenger extends mage.sets.apocalypse.SylvanMessenger {
 
     public SylvanMessenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/TarPitcher.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/TarPitcher.java
index 6d84f1b56d..a3e751cdc0 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/TarPitcher.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/TarPitcher.java
@@ -37,7 +37,7 @@ public class TarPitcher extends mage.sets.lorwyn.TarPitcher {
 
     public TarPitcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/Tarfire.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/Tarfire.java
index 5b9024ef74..08fc567825 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/Tarfire.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/Tarfire.java
@@ -37,7 +37,7 @@ public class Tarfire extends mage.sets.lorwyn.Tarfire {
 
     public Tarfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/TranquilThicket.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/TranquilThicket.java
index b7349a1d66..f3d18a4c02 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/VoiceOfTheWoods.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/VoiceOfTheWoods.java
index e03ef617a2..aa38021a4c 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/VoiceOfTheWoods.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/VoiceOfTheWoods.java
@@ -37,7 +37,7 @@ public class VoiceOfTheWoods extends mage.sets.onslaught.VoiceOfTheWoods {
 
     public VoiceOfTheWoods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/Wellwisher.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/Wellwisher.java
index a9aaf63967..c16b98746e 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/Wellwisher.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/Wellwisher.java
@@ -37,7 +37,7 @@ public class Wellwisher extends mage.sets.onslaught.Wellwisher {
 
     public Wellwisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/Wildsize.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/Wildsize.java
index 791f30a8f6..b97c001c11 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/Wildsize.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/Wildsize.java
@@ -37,7 +37,7 @@ public class Wildsize extends mage.sets.guildpact.Wildsize {
 
     public Wildsize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodHerald.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodHerald.java
index c53a8d1cb7..e558cb8129 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodHerald.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodHerald.java
@@ -37,7 +37,7 @@ public class WirewoodHerald extends mage.sets.onslaught.WirewoodHerald {
 
     public WirewoodHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodLodge.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodLodge.java
index c23996bf16..9c116b6b90 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodLodge.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodLodge.java
@@ -37,7 +37,7 @@ public class WirewoodLodge extends mage.sets.onslaught.WirewoodLodge {
 
     public WirewoodLodge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodSymbiote.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodSymbiote.java
index 2d40c7dec5..6fe30edf8f 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodSymbiote.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/WirewoodSymbiote.java
@@ -37,7 +37,7 @@ public class WirewoodSymbiote extends mage.sets.scourge.WirewoodSymbiote {
 
     public WirewoodSymbiote(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/WoodElves.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/WoodElves.java
index b7e1c7a78b..2814843151 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/WrensRunVanquisher.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/WrensRunVanquisher.java
index 3badfdb147..751fedb8cf 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/WrensRunVanquisher.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/WrensRunVanquisher.java
@@ -37,7 +37,7 @@ public class WrensRunVanquisher extends mage.sets.lorwyn.WrensRunVanquisher {
 
     public WrensRunVanquisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "EVG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/AbundantGrowth.java b/Mage.Sets/src/mage/sets/eternalmasters/AbundantGrowth.java
index fa344f0189..4fd1a517e3 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/AbundantGrowth.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/AbundantGrowth.java
@@ -38,7 +38,7 @@ public class AbundantGrowth extends mage.sets.avacynrestored.AbundantGrowth {
 
     public AbundantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/AncestralMask.java b/Mage.Sets/src/mage/sets/eternalmasters/AncestralMask.java
index 19c2021fb4..4b88ba5f54 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/AncestralMask.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/AncestralMask.java
@@ -38,7 +38,7 @@ public class AncestralMask extends mage.sets.mercadianmasques.AncestralMask {
 
     public AncestralMask(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/AnimateDead.java b/Mage.Sets/src/mage/sets/eternalmasters/AnimateDead.java
index 625b527e0b..0a94b136a2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Annihilate.java b/Mage.Sets/src/mage/sets/eternalmasters/Annihilate.java
index c00adc1ec2..eb7833ffc8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Annihilate.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Annihilate.java
@@ -38,7 +38,7 @@ public class Annihilate extends mage.sets.invasion.Annihilate {
 
     public Annihilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/sets/eternalmasters/ArcanisTheOmnipotent.java
index a8317cf588..9aeeff9183 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ArcanisTheOmnipotent.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ArcanisTheOmnipotent.java
@@ -38,7 +38,7 @@ public class ArcanisTheOmnipotent extends mage.sets.tenthedition.ArcanisTheOmnip
 
     public ArcanisTheOmnipotent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ArgothianEnchantress.java b/Mage.Sets/src/mage/sets/eternalmasters/ArgothianEnchantress.java
index 4a1d750a12..3d24406b0b 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ArgothianEnchantress.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ArgothianEnchantress.java
@@ -38,7 +38,7 @@ public class ArgothianEnchantress extends mage.sets.urzassaga.ArgothianEnchantre
 
     public ArgothianEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/eternalmasters/ArmadilloCloak.java
index 4747ef3a4d..e910873640 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ArmadilloCloak.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ArmadilloCloak.java
@@ -39,7 +39,7 @@ public class ArmadilloCloak extends mage.sets.invasion.ArmadilloCloak {
 
     public ArmadilloCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/AshnodsAltar.java b/Mage.Sets/src/mage/sets/eternalmasters/AshnodsAltar.java
index 74a2ef8ac7..c3bc960b6c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/AshnodsAltar.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/AshnodsAltar.java
@@ -37,7 +37,7 @@ public class AshnodsAltar extends mage.sets.fifthedition.AshnodsAltar {
 
     public AshnodsAltar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Avarax.java b/Mage.Sets/src/mage/sets/eternalmasters/Avarax.java
index 98758f2296..db5d679d70 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Avarax.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Avarax.java
@@ -39,7 +39,7 @@ public class Avarax extends mage.sets.onslaught.Avarax {
 
     public Avarax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/AvenRiftwatcher.java b/Mage.Sets/src/mage/sets/eternalmasters/AvenRiftwatcher.java
index ca8c170d43..09bf64e51d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/AvenRiftwatcher.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/AvenRiftwatcher.java
@@ -38,7 +38,7 @@ public class AvenRiftwatcher extends mage.sets.planarchaos.AvenRiftwatcher {
 
     public AvenRiftwatcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Balance.java b/Mage.Sets/src/mage/sets/eternalmasters/Balance.java
index bb7c865eb3..968c7d6e54 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Balance.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Balance.java
@@ -38,7 +38,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BalefulStrix.java b/Mage.Sets/src/mage/sets/eternalmasters/BalefulStrix.java
index 0c8e05dea8..7d82441f0e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BalefulStrix.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BalefulStrix.java
@@ -38,7 +38,7 @@ public class BalefulStrix extends mage.sets.planechase2012.BalefulStrix {
 
     public BalefulStrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BallynockCohort.java b/Mage.Sets/src/mage/sets/eternalmasters/BallynockCohort.java
index 35ad94eba4..72e57262e7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BallynockCohort.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BallynockCohort.java
@@ -38,7 +38,7 @@ public class BallynockCohort extends mage.sets.shadowmoor.BallynockCohort {
 
     public BallynockCohort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BattleSquadron.java b/Mage.Sets/src/mage/sets/eternalmasters/BattleSquadron.java
index be269e7697..d8d797d0fb 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BattleSquadron.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BattleSquadron.java
@@ -39,7 +39,7 @@ public class BattleSquadron extends mage.sets.mercadianmasques.BattleSquadron {
 
     public BattleSquadron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BeetlebackChief.java b/Mage.Sets/src/mage/sets/eternalmasters/BeetlebackChief.java
index 081dcbc20e..a23163cd7f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BeetlebackChief.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BeetlebackChief.java
@@ -38,7 +38,7 @@ public class BeetlebackChief extends mage.sets.planechase2012.BeetlebackChief {
 
     public BeetlebackChief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BenevolentBodyguard.java b/Mage.Sets/src/mage/sets/eternalmasters/BenevolentBodyguard.java
index 9df6768f59..e0cc19b24d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BenevolentBodyguard.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BenevolentBodyguard.java
@@ -38,7 +38,7 @@ public class BenevolentBodyguard extends mage.sets.vintagemasters.BenevolentBody
 
     public BenevolentBodyguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BlightsoilDruid.java b/Mage.Sets/src/mage/sets/eternalmasters/BlightsoilDruid.java
index d21595f8eb..0dba1b73f8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BlightsoilDruid.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BlightsoilDruid.java
@@ -38,7 +38,7 @@ public class BlightsoilDruid extends mage.sets.morningtide.BlightsoilDruid {
 
     public BlightsoilDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BloodArtist.java b/Mage.Sets/src/mage/sets/eternalmasters/BloodArtist.java
index c6fa436d28..0bfeb03fc6 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BloodArtist.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BloodArtist.java
@@ -38,7 +38,7 @@ public class BloodArtist extends mage.sets.avacynrestored.BloodArtist {
 
     public BloodArtist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BloodbraidElf.java b/Mage.Sets/src/mage/sets/eternalmasters/BloodbraidElf.java
index 3ab2e61251..c0915611f9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BloodbraidElf.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BloodbraidElf.java
@@ -37,7 +37,7 @@ public class BloodbraidElf extends mage.sets.alarareborn.BloodbraidElf {
 
     public BloodbraidElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BloodfellCaves.java b/Mage.Sets/src/mage/sets/eternalmasters/BloodfellCaves.java
index ed0f4eb405..785c74acd1 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BloodfellCaves.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BloodfellCaves.java
@@ -38,7 +38,7 @@ public class BloodfellCaves extends mage.sets.khansoftarkir.BloodfellCaves {
 
     public BloodfellCaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BlossomingSands.java b/Mage.Sets/src/mage/sets/eternalmasters/BlossomingSands.java
index 2f37338977..87f440c10d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BlossomingSands.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BlossomingSands.java
@@ -38,7 +38,7 @@ public class BlossomingSands extends mage.sets.khansoftarkir.BlossomingSands {
 
     public BlossomingSands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BorderlandMarauder.java b/Mage.Sets/src/mage/sets/eternalmasters/BorderlandMarauder.java
index e52c94cf34..14cb9c7206 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BorderlandMarauder.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BorderlandMarauder.java
@@ -38,7 +38,7 @@ public class BorderlandMarauder extends mage.sets.magic2015.BorderlandMarauder {
 
     public BorderlandMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BragoKingEternal.java b/Mage.Sets/src/mage/sets/eternalmasters/BragoKingEternal.java
index 100d74650a..6e3efd0b6f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BragoKingEternal.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BragoKingEternal.java
@@ -38,7 +38,7 @@ public class BragoKingEternal extends mage.sets.vintagemasters.BragoKingEternal
 
     public BragoKingEternal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BraidsCabalMinion.java b/Mage.Sets/src/mage/sets/eternalmasters/BraidsCabalMinion.java
index 66a124e992..17c8014caf 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BraidsCabalMinion.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BraidsCabalMinion.java
@@ -38,7 +38,7 @@ public class BraidsCabalMinion extends mage.sets.odyssey.BraidsCabalMinion {
 
     public BraidsCabalMinion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Brainstorm.java b/Mage.Sets/src/mage/sets/eternalmasters/Brainstorm.java
index 2bdd689e18..440cc44dd9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Brainstorm.java
@@ -38,7 +38,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Brawn.java b/Mage.Sets/src/mage/sets/eternalmasters/Brawn.java
index 6aca7185ba..4748186501 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Brawn.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Brawn.java
@@ -38,7 +38,7 @@ public class Brawn extends mage.sets.judgment.Brawn {
 
     public Brawn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/BurningVengeance.java b/Mage.Sets/src/mage/sets/eternalmasters/BurningVengeance.java
index f1468ab2b3..31b2c03796 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/BurningVengeance.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/BurningVengeance.java
@@ -37,7 +37,7 @@ public class BurningVengeance extends mage.sets.innistrad.BurningVengeance {
 
     public BurningVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CabalTherapy.java b/Mage.Sets/src/mage/sets/eternalmasters/CabalTherapy.java
index d4e832c8d4..581b1d606c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CabalTherapy.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CabalTherapy.java
@@ -37,7 +37,7 @@ public class CabalTherapy extends mage.sets.judgment.CabalTherapy {
 
     public CabalTherapy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Calciderm.java b/Mage.Sets/src/mage/sets/eternalmasters/Calciderm.java
index 714c8d3925..297c6ce5e0 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Calciderm.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Calciderm.java
@@ -38,7 +38,7 @@ public class Calciderm extends mage.sets.planarchaos.Calciderm {
 
     public Calciderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CallTheSkybreaker.java b/Mage.Sets/src/mage/sets/eternalmasters/CallTheSkybreaker.java
index c115068606..d84bd72076 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CallTheSkybreaker.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CallTheSkybreaker.java
@@ -37,7 +37,7 @@ public class CallTheSkybreaker extends mage.sets.commander.CallTheSkybreaker {
 
     public CallTheSkybreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Carbonize.java b/Mage.Sets/src/mage/sets/eternalmasters/Carbonize.java
index 99f0418827..6cd17598e4 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Carbonize.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Carbonize.java
@@ -39,7 +39,7 @@ public class Carbonize extends mage.sets.scourge.Carbonize {
 
     public Carbonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CarrionFeeder.java b/Mage.Sets/src/mage/sets/eternalmasters/CarrionFeeder.java
index 01b275feaa..7e7ae03551 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CarrionFeeder.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CarrionFeeder.java
@@ -38,7 +38,7 @@ public class CarrionFeeder extends mage.sets.scourge.CarrionFeeder {
 
     public CarrionFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CentaurChieftain.java b/Mage.Sets/src/mage/sets/eternalmasters/CentaurChieftain.java
index 23fa34603a..37cf0179f0 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CentaurChieftain.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CentaurChieftain.java
@@ -38,7 +38,7 @@ public class CentaurChieftain extends mage.sets.torment.CentaurChieftain {
 
     public CentaurChieftain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CephalidSage.java b/Mage.Sets/src/mage/sets/eternalmasters/CephalidSage.java
index bc75cb44f9..d1222190dd 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CephalidSage.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CephalidSage.java
@@ -39,7 +39,7 @@ public class CephalidSage extends mage.sets.torment.CephalidSage {
 
     public CephalidSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ChainLightning.java b/Mage.Sets/src/mage/sets/eternalmasters/ChainLightning.java
index 116c674daf..ba73af7931 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ChainLightning.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ChainLightning.java
@@ -38,7 +38,7 @@ public class ChainLightning extends mage.sets.legends.ChainLightning {
 
     public ChainLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ChromeMox.java b/Mage.Sets/src/mage/sets/eternalmasters/ChromeMox.java
index b78ec7287a..f1fde9638e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ChromeMox.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ChromeMox.java
@@ -38,7 +38,7 @@ public class ChromeMox extends mage.sets.mirrodin.ChromeMox {
 
     public ChromeMox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CivicWayfinder.java b/Mage.Sets/src/mage/sets/eternalmasters/CivicWayfinder.java
index 5e987b27be..53081f6a62 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CivicWayfinder.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CivicWayfinder.java
@@ -38,7 +38,7 @@ public class CivicWayfinder extends mage.sets.tenthedition.CivicWayfinder {
 
     public CivicWayfinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CommuneWithTheGods.java b/Mage.Sets/src/mage/sets/eternalmasters/CommuneWithTheGods.java
index 3c06381fb7..3dcdee3b0c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CommuneWithTheGods.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CommuneWithTheGods.java
@@ -38,7 +38,7 @@ public class CommuneWithTheGods extends mage.sets.theros.CommuneWithTheGods {
 
     public CommuneWithTheGods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ControlMagic.java b/Mage.Sets/src/mage/sets/eternalmasters/ControlMagic.java
index da274c48ca..71c415d859 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Counterspell.java b/Mage.Sets/src/mage/sets/eternalmasters/Counterspell.java
index e875c54e44..90c08db81b 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/CraterHellion.java b/Mage.Sets/src/mage/sets/eternalmasters/CraterHellion.java
index b80b37f298..34e2c6f1e8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/CraterHellion.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/CraterHellion.java
@@ -37,7 +37,7 @@ public class CraterHellion extends mage.sets.urzassaga.CraterHellion {
 
     public CraterHellion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DackFayden.java b/Mage.Sets/src/mage/sets/eternalmasters/DackFayden.java
index 4a3553aba8..5f4601b280 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DackFayden.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DackFayden.java
@@ -37,7 +37,7 @@ public class DackFayden extends mage.sets.conspiracy.DackFayden {
 
     public DackFayden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Daze.java b/Mage.Sets/src/mage/sets/eternalmasters/Daze.java
index f34236a25e..128dd9a0e4 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Daze.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Daze.java
@@ -38,7 +38,7 @@ public class Daze extends mage.sets.nemesis.Daze {
 
     public Daze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DeadbridgeShaman.java b/Mage.Sets/src/mage/sets/eternalmasters/DeadbridgeShaman.java
index d375653374..2e1ac9d266 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DeadbridgeShaman.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DeadbridgeShaman.java
@@ -38,7 +38,7 @@ public class DeadbridgeShaman extends mage.sets.magicorigins.DeadbridgeShaman {
 
     public DeadbridgeShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DeathriteShaman.java b/Mage.Sets/src/mage/sets/eternalmasters/DeathriteShaman.java
index f9f01192c9..751517e4bf 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DeathriteShaman.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DeathriteShaman.java
@@ -37,7 +37,7 @@ public class DeathriteShaman extends mage.sets.returntoravnica.DeathriteShaman {
 
     public DeathriteShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DeepAnalysis.java b/Mage.Sets/src/mage/sets/eternalmasters/DeepAnalysis.java
index 109110e860..af6fd54652 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DeepAnalysis.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DeepAnalysis.java
@@ -38,7 +38,7 @@ public class DeepAnalysis extends mage.sets.torment.DeepAnalysis {
 
     public DeepAnalysis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DesperateRavings.java b/Mage.Sets/src/mage/sets/eternalmasters/DesperateRavings.java
index 2a224357fb..f2d77b2276 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DesperateRavings.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DesperateRavings.java
@@ -39,7 +39,7 @@ public class DesperateRavings extends mage.sets.innistrad.DesperateRavings {
 
     public DesperateRavings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DiminishingReturns.java b/Mage.Sets/src/mage/sets/eternalmasters/DiminishingReturns.java
index d1513e5893..27f6024b04 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DiminishingReturns.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DiminishingReturns.java
@@ -37,7 +37,7 @@ public class DiminishingReturns extends mage.sets.alliances.DiminishingReturns {
 
     public DiminishingReturns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DismalBackwater.java b/Mage.Sets/src/mage/sets/eternalmasters/DismalBackwater.java
index 60a02cf8c7..6b5cb77e62 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DismalBackwater.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DismalBackwater.java
@@ -38,7 +38,7 @@ public class DismalBackwater extends mage.sets.khansoftarkir.DismalBackwater {
 
     public DismalBackwater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DragonEgg.java b/Mage.Sets/src/mage/sets/eternalmasters/DragonEgg.java
index c14ebdb5fb..3161675c3d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DragonEgg.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DragonEgg.java
@@ -39,7 +39,7 @@ public class DragonEgg extends mage.sets.magic2014.DragonEgg {
 
     public DragonEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DreamTwist.java b/Mage.Sets/src/mage/sets/eternalmasters/DreamTwist.java
index aa577446fa..289972ad9c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DreamTwist.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DreamTwist.java
@@ -38,7 +38,7 @@ public class DreamTwist extends mage.sets.innistrad.DreamTwist {
 
     public DreamTwist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/DualcasterMage.java b/Mage.Sets/src/mage/sets/eternalmasters/DualcasterMage.java
index 78c1eaf552..65104f5cd8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/DualcasterMage.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/DualcasterMage.java
@@ -37,7 +37,7 @@ public class DualcasterMage extends mage.sets.commander2014.DualcasterMage {
 
     public DualcasterMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Duplicant.java b/Mage.Sets/src/mage/sets/eternalmasters/Duplicant.java
index e7b8fb4566..43782463ec 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Duplicant.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Duplicant.java
@@ -38,7 +38,7 @@ public class Duplicant extends mage.sets.mirrodin.Duplicant {
 
     public Duplicant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Duress.java b/Mage.Sets/src/mage/sets/eternalmasters/Duress.java
index b8ae4c640e..5047b32524 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Duress.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Duress.java
@@ -38,7 +38,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/EightAndAHalfTails.java b/Mage.Sets/src/mage/sets/eternalmasters/EightAndAHalfTails.java
index b3c21eaf9e..c3544c1bf1 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/EightAndAHalfTails.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/EightAndAHalfTails.java
@@ -38,7 +38,7 @@ public class EightAndAHalfTails extends mage.sets.championsofkamigawa.EightAndAH
 
     public EightAndAHalfTails(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ElephantGuide.java b/Mage.Sets/src/mage/sets/eternalmasters/ElephantGuide.java
index 208ebf5f8b..1be3053fb6 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ElephantGuide.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ElephantGuide.java
@@ -39,7 +39,7 @@ public class ElephantGuide extends mage.sets.judgment.ElephantGuide {
 
     public ElephantGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/EliteVanguard.java b/Mage.Sets/src/mage/sets/eternalmasters/EliteVanguard.java
index a13173a65a..b220347502 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/EliteVanguard.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/EliteVanguard.java
@@ -39,7 +39,7 @@ public class EliteVanguard extends mage.sets.magic2010.EliteVanguard {
 
     public EliteVanguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ElvishVanguard.java b/Mage.Sets/src/mage/sets/eternalmasters/ElvishVanguard.java
index cd0844fc02..45b812b5f8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ElvishVanguard.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ElvishVanguard.java
@@ -39,7 +39,7 @@ public class ElvishVanguard extends mage.sets.onslaught.ElvishVanguard {
 
     public ElvishVanguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/EmmessiTome.java b/Mage.Sets/src/mage/sets/eternalmasters/EmmessiTome.java
index a2a3d216a3..281b543255 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/EmmessiTome.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/EmmessiTome.java
@@ -39,7 +39,7 @@ public class EmmessiTome extends mage.sets.tempest.EmmessiTome {
 
     public EmmessiTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/EmperorCrocodile.java b/Mage.Sets/src/mage/sets/eternalmasters/EmperorCrocodile.java
index b7e33b3c66..3c7ce5a4c6 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/EmperorCrocodile.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/EmperorCrocodile.java
@@ -38,7 +38,7 @@ public class EmperorCrocodile extends mage.sets.ninthedition.EmperorCrocodile {
 
     public EmperorCrocodile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/EnlightenedTutor.java b/Mage.Sets/src/mage/sets/eternalmasters/EnlightenedTutor.java
index b6ba58f693..718a6a6ed2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/EnlightenedTutor.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/EnlightenedTutor.java
@@ -38,7 +38,7 @@ public class EnlightenedTutor extends mage.sets.mirage.EnlightenedTutor {
 
     public EnlightenedTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Entomb.java b/Mage.Sets/src/mage/sets/eternalmasters/Entomb.java
index d6e4775f01..1f8cbd41c8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Entomb.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Entomb.java
@@ -37,7 +37,7 @@ public class Entomb extends mage.sets.odyssey.Entomb {
 
     public Entomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ExtractFromDarkness.java b/Mage.Sets/src/mage/sets/eternalmasters/ExtractFromDarkness.java
index 8577ab280a..b65154f113 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ExtractFromDarkness.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ExtractFromDarkness.java
@@ -38,7 +38,7 @@ public class ExtractFromDarkness extends mage.sets.conspiracy.ExtractFromDarknes
 
     public ExtractFromDarkness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/eternalmasters/EyeblightsEnding.java
index 2bcb2dcb2d..65c6164a9e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/EyeblightsEnding.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/EyeblightsEnding.java
@@ -38,7 +38,7 @@ public class EyeblightsEnding extends mage.sets.lorwyn.EyeblightsEnding {
 
     public EyeblightsEnding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FactOrFiction.java b/Mage.Sets/src/mage/sets/eternalmasters/FactOrFiction.java
index 6fc13d8c5e..408b7f321f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FactOrFiction.java
@@ -38,7 +38,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FaithlessLooting.java b/Mage.Sets/src/mage/sets/eternalmasters/FaithlessLooting.java
index c09f91ec86..d8d60e6659 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FaithlessLooting.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FaithlessLooting.java
@@ -38,7 +38,7 @@ public class FaithlessLooting extends mage.sets.darkascension.FaithlessLooting {
 
     public FaithlessLooting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FaithsFetters.java b/Mage.Sets/src/mage/sets/eternalmasters/FaithsFetters.java
index c6074ecbb2..1097300b63 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FaithsFetters.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FaithsFetters.java
@@ -39,7 +39,7 @@ public class FaithsFetters extends mage.sets.divinevsdemonic.FaithsFetters {
 
     public FaithsFetters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FerventCathar.java b/Mage.Sets/src/mage/sets/eternalmasters/FerventCathar.java
index 134b4b4d84..4312b65787 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FerventCathar.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FerventCathar.java
@@ -38,7 +38,7 @@ public class FerventCathar extends mage.sets.avacynrestored.FerventCathar {
 
     public FerventCathar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FieldOfSouls.java b/Mage.Sets/src/mage/sets/eternalmasters/FieldOfSouls.java
index 4e5234ffe3..9b9897404a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FieldOfSouls.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FieldOfSouls.java
@@ -39,7 +39,7 @@ public class FieldOfSouls extends mage.sets.tempestremastered.FieldOfSouls {
 
     public FieldOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Firebolt.java b/Mage.Sets/src/mage/sets/eternalmasters/Firebolt.java
index 87d2f77133..6b8dac978c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Firebolt.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Firebolt.java
@@ -37,7 +37,7 @@ public class Firebolt extends mage.sets.odyssey.Firebolt {
 
     public Firebolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FlameJab.java b/Mage.Sets/src/mage/sets/eternalmasters/FlameJab.java
index 93e5e61a57..687ab21bab 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FlameJab.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FlameJab.java
@@ -39,7 +39,7 @@ public class FlameJab extends mage.sets.eventide.FlameJab {
 
     public FlameJab(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FlameKinZealot.java b/Mage.Sets/src/mage/sets/eternalmasters/FlameKinZealot.java
index 33bd4d8c3d..1744630e19 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FlameKinZealot.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FlameKinZealot.java
@@ -38,7 +38,7 @@ public class FlameKinZealot extends mage.sets.ravnica.FlameKinZealot {
 
     public FlameKinZealot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FlinthoofBoar.java b/Mage.Sets/src/mage/sets/eternalmasters/FlinthoofBoar.java
index 050f3845da..404065339d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FlinthoofBoar.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FlinthoofBoar.java
@@ -38,7 +38,7 @@ public class FlinthoofBoar extends mage.sets.magic2013.FlinthoofBoar {
 
     public FlinthoofBoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Fog.java b/Mage.Sets/src/mage/sets/eternalmasters/Fog.java
index 1ac290fc4e..4592be5fbb 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Fog.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Fog.java
@@ -38,7 +38,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ForceOfWill.java b/Mage.Sets/src/mage/sets/eternalmasters/ForceOfWill.java
index ac82f33a0c..15525ed6aa 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ForceOfWill.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ForceOfWill.java
@@ -38,7 +38,7 @@ public class ForceOfWill extends mage.sets.alliances.ForceOfWill {
 
     public ForceOfWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/FutureSight.java b/Mage.Sets/src/mage/sets/eternalmasters/FutureSight.java
index 4ff5a186cf..91513bb707 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/FutureSight.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/FutureSight.java
@@ -38,7 +38,7 @@ public class FutureSight extends mage.sets.onslaught.FutureSight {
 
     public FutureSight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GaeasBlessing.java b/Mage.Sets/src/mage/sets/eternalmasters/GaeasBlessing.java
index 239fdb08e7..d65c782507 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GaeasBlessing.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GaeasBlessing.java
@@ -38,7 +38,7 @@ public class GaeasBlessing extends mage.sets.timeshifted.GaeasBlessing {
 
     public GaeasBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Gamble.java b/Mage.Sets/src/mage/sets/eternalmasters/Gamble.java
index c1240000fa..4457a808ca 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Gamble.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Gamble.java
@@ -37,7 +37,7 @@ public class Gamble extends mage.sets.urzassaga.Gamble {
 
     public Gamble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GaseousForm.java b/Mage.Sets/src/mage/sets/eternalmasters/GaseousForm.java
index 0791ffecc2..463151c63e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GaseousForm.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GaseousForm.java
@@ -38,7 +38,7 @@ public class GaseousForm extends mage.sets.tempest.GaseousForm {
 
     public GaseousForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GhituSlinger.java b/Mage.Sets/src/mage/sets/eternalmasters/GhituSlinger.java
index 0f2c5e892f..487989f454 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GhituSlinger.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GhituSlinger.java
@@ -39,7 +39,7 @@ public class GhituSlinger extends mage.sets.urzaslegacy.GhituSlinger {
 
     public GhituSlinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GiantSolifuge.java b/Mage.Sets/src/mage/sets/eternalmasters/GiantSolifuge.java
index 2fe1e28696..7e00c649ae 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GiantSolifuge.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GiantSolifuge.java
@@ -37,7 +37,7 @@ public class GiantSolifuge extends mage.sets.guildpact.GiantSolifuge {
 
     public GiantSolifuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GiantTortoise.java b/Mage.Sets/src/mage/sets/eternalmasters/GiantTortoise.java
index 237b2595b6..5149b19ce8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GiantTortoise.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GiantTortoise.java
@@ -37,7 +37,7 @@ public class GiantTortoise extends mage.sets.fourthedition.GiantTortoise {
 
     public GiantTortoise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GlacialWall.java b/Mage.Sets/src/mage/sets/eternalmasters/GlacialWall.java
index b9a85b1292..d4ba0deaac 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GlacialWall.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GlacialWall.java
@@ -39,7 +39,7 @@ public class GlacialWall extends mage.sets.fifthedition.GlacialWall {
 
     public GlacialWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GlareOfSubdual.java b/Mage.Sets/src/mage/sets/eternalmasters/GlareOfSubdual.java
index afe6ca0928..65063ec1dd 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GlareOfSubdual.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GlareOfSubdual.java
@@ -38,7 +38,7 @@ public class GlareOfSubdual extends mage.sets.ravnica.GlareOfSubdual {
 
     public GlareOfSubdual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GlimmerpointStag.java b/Mage.Sets/src/mage/sets/eternalmasters/GlimmerpointStag.java
index 70403385e6..69e0bf02c4 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GlimmerpointStag.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GlimmerpointStag.java
@@ -38,7 +38,7 @@ public class GlimmerpointStag extends mage.sets.scarsofmirrodin.GlimmerpointStag
 
     public GlimmerpointStag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GoblinCharbelcher.java b/Mage.Sets/src/mage/sets/eternalmasters/GoblinCharbelcher.java
index c075a24b8c..8162acdd30 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GoblinCharbelcher.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GoblinCharbelcher.java
@@ -37,7 +37,7 @@ public class GoblinCharbelcher extends mage.sets.mirrodin.GoblinCharbelcher {
 
     public GoblinCharbelcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GoblinTrenches.java b/Mage.Sets/src/mage/sets/eternalmasters/GoblinTrenches.java
index 83eb0de275..965a2cd991 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GoblinTrenches.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GoblinTrenches.java
@@ -37,7 +37,7 @@ public class GoblinTrenches extends mage.sets.apocalypse.GoblinTrenches {
 
     public GoblinTrenches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Gravedigger.java b/Mage.Sets/src/mage/sets/eternalmasters/Gravedigger.java
index 9738b99612..a2eaf0286b 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/GreenSunsZenith.java b/Mage.Sets/src/mage/sets/eternalmasters/GreenSunsZenith.java
index 6578534ce3..38204d1178 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/GreenSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/GreenSunsZenith.java
@@ -37,7 +37,7 @@ public class GreenSunsZenith extends mage.sets.mirrodinbesieged.GreenSunsZenith
 
     public GreenSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Harmonize.java b/Mage.Sets/src/mage/sets/eternalmasters/Harmonize.java
index 07425bbba4..26d0545fa5 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Harmonize.java
@@ -38,7 +38,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HavocDemon.java b/Mage.Sets/src/mage/sets/eternalmasters/HavocDemon.java
index 0400ffcc24..3ba71301ad 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HavocDemon.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HavocDemon.java
@@ -39,7 +39,7 @@ public class HavocDemon extends mage.sets.legions.HavocDemon {
 
     public HavocDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HeritageDruid.java b/Mage.Sets/src/mage/sets/eternalmasters/HeritageDruid.java
index e1a8df3361..c777c93908 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HeritageDruid.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HeritageDruid.java
@@ -39,7 +39,7 @@ public class HeritageDruid extends mage.sets.morningtide.HeritageDruid {
 
     public HeritageDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfCleansingFire.java b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfCleansingFire.java
index fe23d6b2ef..cd48ee905c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfCleansingFire.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfCleansingFire.java
@@ -38,7 +38,7 @@ public class HondenOfCleansingFire extends mage.sets.championsofkamigawa.HondenO
 
     public HondenOfCleansingFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfInfiniteRage.java
index 619ad647ea..5ee0a93895 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfInfiniteRage.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfInfiniteRage.java
@@ -38,7 +38,7 @@ public class HondenOfInfiniteRage extends mage.sets.championsofkamigawa.HondenOf
 
     public HondenOfInfiniteRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfLifesWeb.java b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfLifesWeb.java
index 79b323cfcb..52ceec995c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfLifesWeb.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfLifesWeb.java
@@ -38,7 +38,7 @@ public class HondenOfLifesWeb extends mage.sets.championsofkamigawa.HondenOfLife
 
     public HondenOfLifesWeb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfNightsReach.java b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfNightsReach.java
index be47e26773..36fa5dfb78 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfNightsReach.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfNightsReach.java
@@ -38,7 +38,7 @@ public class HondenOfNightsReach extends mage.sets.championsofkamigawa.HondenOfN
 
     public HondenOfNightsReach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfSeeingWinds.java b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfSeeingWinds.java
index b2b5f6a66b..e7bd163d56 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HondenOfSeeingWinds.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HondenOfSeeingWinds.java
@@ -38,7 +38,7 @@ public class HondenOfSeeingWinds extends mage.sets.championsofkamigawa.HondenOfS
 
     public HondenOfSeeingWinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Humble.java b/Mage.Sets/src/mage/sets/eternalmasters/Humble.java
index c25c78ed6f..d31a0badd2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Humble.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Humble.java
@@ -39,7 +39,7 @@ public class Humble extends mage.sets.urzassaga.Humble {
 
     public Humble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Hydroblast.java b/Mage.Sets/src/mage/sets/eternalmasters/Hydroblast.java
index 0d802b127b..91ca723056 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Hydroblast.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Hydroblast.java
@@ -37,7 +37,7 @@ public class Hydroblast extends mage.sets.fifthedition.Hydroblast {
 
     public Hydroblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/HymnToTourach.java b/Mage.Sets/src/mage/sets/eternalmasters/HymnToTourach.java
index 377d43d5be..e791aaae17 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/HymnToTourach.java
@@ -38,7 +38,7 @@ public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Ichorid.java b/Mage.Sets/src/mage/sets/eternalmasters/Ichorid.java
index 840855e031..b0ba30657f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Ichorid.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Ichorid.java
@@ -37,7 +37,7 @@ public class Ichorid extends mage.sets.torment.Ichorid {
 
     public Ichorid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/eternalmasters/ImperiousPerfect.java
index 6c6d0668b8..228a79949f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ImperiousPerfect.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ImperiousPerfect.java
@@ -39,7 +39,7 @@ public class ImperiousPerfect extends mage.sets.lorwyn.ImperiousPerfect {
 
     public ImperiousPerfect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/eternalmasters/InkwellLeviathan.java
index 1c9e1872b9..e0a85756fe 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/InkwellLeviathan.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/InkwellLeviathan.java
@@ -38,7 +38,7 @@ public class InkwellLeviathan extends mage.sets.conflux.InkwellLeviathan {
 
     public InkwellLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/InnocentBlood.java b/Mage.Sets/src/mage/sets/eternalmasters/InnocentBlood.java
index 65ff62309f..4891d06706 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/InnocentBlood.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/InnocentBlood.java
@@ -37,7 +37,7 @@ public class InnocentBlood extends mage.sets.planechase.InnocentBlood {
 
     public InnocentBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/IntangibleVirtue.java b/Mage.Sets/src/mage/sets/eternalmasters/IntangibleVirtue.java
index 6aad5f5302..561482e3f2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/IntangibleVirtue.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/IntangibleVirtue.java
@@ -38,7 +38,7 @@ public class IntangibleVirtue extends mage.sets.innistrad.IntangibleVirtue {
 
     public IntangibleVirtue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Invigorate.java b/Mage.Sets/src/mage/sets/eternalmasters/Invigorate.java
index e0f7e3ab1c..1ced2ab08b 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Invigorate.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Invigorate.java
@@ -39,7 +39,7 @@ public class Invigorate extends mage.sets.commander.Invigorate {
 
     public Invigorate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/IsochronScepter.java b/Mage.Sets/src/mage/sets/eternalmasters/IsochronScepter.java
index 47830e95cc..4e9f135871 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/IsochronScepter.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/IsochronScepter.java
@@ -38,7 +38,7 @@ public class IsochronScepter extends mage.sets.mirrodin.IsochronScepter {
 
     public IsochronScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/eternalmasters/JaceTheMindSculptor.java
index 0f753aed10..d8f5995307 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/JaceTheMindSculptor.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/JaceTheMindSculptor.java
@@ -37,7 +37,7 @@ public class JaceTheMindSculptor extends mage.sets.worldwake.JaceTheMindSculptor
 
     public JaceTheMindSculptor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/JarethLeonineTitan.java b/Mage.Sets/src/mage/sets/eternalmasters/JarethLeonineTitan.java
index 2aff73a274..c172387735 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/JarethLeonineTitan.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/JarethLeonineTitan.java
@@ -38,7 +38,7 @@ public class JarethLeonineTitan extends mage.sets.onslaught.JarethLeonineTitan {
 
     public JarethLeonineTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/JettingGlasskite.java b/Mage.Sets/src/mage/sets/eternalmasters/JettingGlasskite.java
index d5307f6c0d..9f2996db76 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/JettingGlasskite.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/JettingGlasskite.java
@@ -38,7 +38,7 @@ public class JettingGlasskite extends mage.sets.betrayersofkamigawa.JettingGlass
 
     public JettingGlasskite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Juggernaut.java b/Mage.Sets/src/mage/sets/eternalmasters/Juggernaut.java
index 87d9695b37..17105ca768 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Juggernaut.java
@@ -38,7 +38,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/JungleHollow.java b/Mage.Sets/src/mage/sets/eternalmasters/JungleHollow.java
index 34df101272..4ac0509677 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/JungleHollow.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/JungleHollow.java
@@ -38,7 +38,7 @@ public class JungleHollow extends mage.sets.khansoftarkir.JungleHollow {
 
     public JungleHollow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Karakas.java b/Mage.Sets/src/mage/sets/eternalmasters/Karakas.java
index 343f0a8fcf..9ac16b0b5e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Karakas.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Karakas.java
@@ -38,7 +38,7 @@ public class Karakas extends mage.sets.legends.Karakas {
 
     public Karakas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/KarmicGuide.java b/Mage.Sets/src/mage/sets/eternalmasters/KarmicGuide.java
index 8034e11cb9..ec7fc68c89 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/KarmicGuide.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/KarmicGuide.java
@@ -37,7 +37,7 @@ public class KarmicGuide extends mage.sets.urzaslegacy.KarmicGuide {
 
     public KarmicGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/KeldonChampion.java b/Mage.Sets/src/mage/sets/eternalmasters/KeldonChampion.java
index d018d6cd71..af7bb51804 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/KeldonChampion.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/KeldonChampion.java
@@ -38,7 +38,7 @@ public class KeldonChampion extends mage.sets.planechase.KeldonChampion {
 
     public KeldonChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/KeldonMarauders.java b/Mage.Sets/src/mage/sets/eternalmasters/KeldonMarauders.java
index ee0f376141..14a2f85dc5 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/KeldonMarauders.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/KeldonMarauders.java
@@ -38,7 +38,7 @@ public class KeldonMarauders extends mage.sets.planarchaos.KeldonMarauders {
 
     public KeldonMarauders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/KirdApe.java b/Mage.Sets/src/mage/sets/eternalmasters/KirdApe.java
index df011878d3..bdcf391dcc 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/KirdApe.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/KirdApe.java
@@ -39,7 +39,7 @@ public class KirdApe extends mage.sets.ninthedition.KirdApe {
 
     public KirdApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/KorHookmaster.java b/Mage.Sets/src/mage/sets/eternalmasters/KorHookmaster.java
index 920458f3aa..cc57cbf98f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/KorHookmaster.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/KorHookmaster.java
@@ -38,7 +38,7 @@ public class KorHookmaster extends mage.sets.zendikar.KorHookmaster {
 
     public KorHookmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/LlanowarElves.java b/Mage.Sets/src/mage/sets/eternalmasters/LlanowarElves.java
index 0eebb531d3..a4479d8850 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/LlanowarElves.java
@@ -38,7 +38,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaHuntmaster.java
index d571d124e9..c428116be9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaHuntmaster.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaHuntmaster.java
@@ -38,7 +38,7 @@ public class LysAlanaHuntmaster extends mage.sets.lorwyn.LysAlanaHuntmaster {
 
     public LysAlanaHuntmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaScarblade.java b/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaScarblade.java
index f3f622f8d9..4deb409edb 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaScarblade.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/LysAlanaScarblade.java
@@ -38,7 +38,7 @@ public class LysAlanaScarblade extends mage.sets.lorwyn.LysAlanaScarblade {
 
     public LysAlanaScarblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MaelstromWanderer.java b/Mage.Sets/src/mage/sets/eternalmasters/MaelstromWanderer.java
index e217d50e68..03ce7ef7e7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MaelstromWanderer.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MaelstromWanderer.java
@@ -37,7 +37,7 @@ public class MaelstromWanderer extends mage.sets.planechase2012.MaelstromWandere
 
     public MaelstromWanderer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MaliciousAffliction.java b/Mage.Sets/src/mage/sets/eternalmasters/MaliciousAffliction.java
index 0774952e20..5a87bc8f05 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MaliciousAffliction.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MaliciousAffliction.java
@@ -38,7 +38,7 @@ public class MaliciousAffliction extends mage.sets.commander2014.MaliciousAfflic
 
     public MaliciousAffliction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ManOWar.java b/Mage.Sets/src/mage/sets/eternalmasters/ManOWar.java
index 63aec93e3b..e591e4cdd0 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ManOWar.java
@@ -37,7 +37,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ManaCrypt.java b/Mage.Sets/src/mage/sets/eternalmasters/ManaCrypt.java
index a8f5985d15..59c8a519cf 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ManaCrypt.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ManaCrypt.java
@@ -37,7 +37,7 @@ public class ManaCrypt extends mage.sets.vintagemasters.ManaCrypt {
 
     public ManaCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MazeOfIth.java b/Mage.Sets/src/mage/sets/eternalmasters/MazeOfIth.java
index b008291d4e..9770e49e37 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MazeOfIth.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MazeOfIth.java
@@ -38,7 +38,7 @@ public class MazeOfIth extends mage.sets.thedark.MazeOfIth {
 
     public MazeOfIth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MemoryLapse.java b/Mage.Sets/src/mage/sets/eternalmasters/MemoryLapse.java
index 7971cd1ce7..049f98cc23 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MemoryLapse.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MemoryLapse.java
@@ -38,7 +38,7 @@ public class MemoryLapse extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MerfolkLooter.java b/Mage.Sets/src/mage/sets/eternalmasters/MerfolkLooter.java
index 9378bffc84..d0f5422652 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MerfolkLooter.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MerfolkLooter.java
@@ -39,7 +39,7 @@ public class MerfolkLooter extends mage.sets.magic2012.MerfolkLooter {
 
     public MerfolkLooter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MesaEnchantress.java b/Mage.Sets/src/mage/sets/eternalmasters/MesaEnchantress.java
index 9752464196..0ffb19e7b0 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MesaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MesaEnchantress.java
@@ -38,7 +38,7 @@ public class MesaEnchantress extends mage.sets.magic2010.MesaEnchantress {
 
     public MesaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Millikin.java b/Mage.Sets/src/mage/sets/eternalmasters/Millikin.java
index 5aa60f49bd..3db0f419fc 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Millikin.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Millikin.java
@@ -38,7 +38,7 @@ public class Millikin extends mage.sets.odyssey.Millikin {
 
     public Millikin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MindlessAutomaton.java b/Mage.Sets/src/mage/sets/eternalmasters/MindlessAutomaton.java
index cce0020ba8..9a8d7188c4 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MindlessAutomaton.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MindlessAutomaton.java
@@ -39,7 +39,7 @@ public class MindlessAutomaton extends mage.sets.exodus.MindlessAutomaton {
 
     public MindlessAutomaton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MishrasFactory.java b/Mage.Sets/src/mage/sets/eternalmasters/MishrasFactory.java
index 97673fbe93..42d62f6a67 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MishrasFactory.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MishrasFactory.java
@@ -37,7 +37,7 @@ public class MishrasFactory extends mage.sets.elspethvstezzeret.MishrasFactory {
 
     public MishrasFactory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MistralCharger.java b/Mage.Sets/src/mage/sets/eternalmasters/MistralCharger.java
index f9fabddc7c..9248125bc2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MistralCharger.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MistralCharger.java
@@ -39,7 +39,7 @@ public class MistralCharger extends mage.sets.dissension.MistralCharger {
 
     public MistralCharger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MoggFanatic.java b/Mage.Sets/src/mage/sets/eternalmasters/MoggFanatic.java
index 6592960966..4ab1f4d990 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MoggWarMarshal.java b/Mage.Sets/src/mage/sets/eternalmasters/MoggWarMarshal.java
index 4af0c9729b..adaefbe6e2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MoggWarMarshal.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MoggWarMarshal.java
@@ -38,7 +38,7 @@ public class MoggWarMarshal extends mage.sets.timespiral.MoggWarMarshal {
 
     public MoggWarMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MonkIdealist.java b/Mage.Sets/src/mage/sets/eternalmasters/MonkIdealist.java
index 3d2fe86738..c6db543d28 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MonkIdealist.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MonkIdealist.java
@@ -39,7 +39,7 @@ public class MonkIdealist extends mage.sets.urzassaga.MonkIdealist {
 
     public MonkIdealist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MotherOfRunes.java b/Mage.Sets/src/mage/sets/eternalmasters/MotherOfRunes.java
index 80fcd6c8aa..1c3a021a4d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MotherOfRunes.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MotherOfRunes.java
@@ -38,7 +38,7 @@ public class MotherOfRunes extends mage.sets.urzaslegacy.MotherOfRunes {
 
     public MotherOfRunes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/MysticalTutor.java b/Mage.Sets/src/mage/sets/eternalmasters/MysticalTutor.java
index 72b853c328..75b071a874 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/MysticalTutor.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/MysticalTutor.java
@@ -38,7 +38,7 @@ public class MysticalTutor extends mage.sets.mirage.MysticalTutor {
 
     public MysticalTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/NaturalOrder.java b/Mage.Sets/src/mage/sets/eternalmasters/NaturalOrder.java
index 7a7086e0df..322b9ce9f8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/NaturalOrder.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/NaturalOrder.java
@@ -38,7 +38,7 @@ public class NaturalOrder extends mage.sets.visions.NaturalOrder {
 
     public NaturalOrder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/NaturesClaim.java b/Mage.Sets/src/mage/sets/eternalmasters/NaturesClaim.java
index a1e18dcd97..91adf4e374 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/NaturesClaim.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/NaturesClaim.java
@@ -38,7 +38,7 @@ public class NaturesClaim extends mage.sets.worldwake.NaturesClaim {
 
     public NaturesClaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Nausea.java b/Mage.Sets/src/mage/sets/eternalmasters/Nausea.java
index aa10c182db..4538aa1139 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Nausea.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Nausea.java
@@ -37,7 +37,7 @@ public class Nausea extends mage.sets.seventhedition.Nausea {
 
     public Nausea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Necropotence.java b/Mage.Sets/src/mage/sets/eternalmasters/Necropotence.java
index e3a814eee3..79ebbda2e5 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Necropotence.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Necropotence.java
@@ -38,7 +38,7 @@ public class Necropotence extends mage.sets.iceage.Necropotence {
 
     public Necropotence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Nekrataal.java b/Mage.Sets/src/mage/sets/eternalmasters/Nekrataal.java
index a74d284763..5241a89eea 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Nekrataal.java
@@ -38,7 +38,7 @@ public class Nekrataal extends mage.sets.ninthedition.Nekrataal {
 
     public Nekrataal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/eternalmasters/NevinyrralsDisk.java
index c3fc119c03..b4c62f6a54 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/NightsWhisper.java b/Mage.Sets/src/mage/sets/eternalmasters/NightsWhisper.java
index 2b2e4972a7..3e7520d959 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/NightsWhisper.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/NightsWhisper.java
@@ -39,7 +39,7 @@ public class NightsWhisper extends mage.sets.fifthdawn.NightsWhisper {
 
     public NightsWhisper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/NimbleMongoose.java b/Mage.Sets/src/mage/sets/eternalmasters/NimbleMongoose.java
index 715a4ec678..aecda97f45 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/NimbleMongoose.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/NimbleMongoose.java
@@ -38,7 +38,7 @@ public class NimbleMongoose extends mage.sets.odyssey.NimbleMongoose {
 
     public NimbleMongoose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/OonasGrace.java b/Mage.Sets/src/mage/sets/eternalmasters/OonasGrace.java
index d11d0b973f..c00216e795 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/OonasGrace.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/OonasGrace.java
@@ -37,7 +37,7 @@ public class OonasGrace extends mage.sets.eventide.OonasGrace {
 
     public OonasGrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/eternalmasters/OrcishOriflamme.java
index 9cb6ca9312..d043e97a4a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/OrcishOriflamme.java
@@ -39,7 +39,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Pacifism.java b/Mage.Sets/src/mage/sets/eternalmasters/Pacifism.java
index c333d2760e..dc1b4be18e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Pacifism.java
@@ -38,7 +38,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PeregrineDrake.java b/Mage.Sets/src/mage/sets/eternalmasters/PeregrineDrake.java
index ba96f50d14..1fa0f35e82 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PeregrineDrake.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PeregrineDrake.java
@@ -39,7 +39,7 @@ public class PeregrineDrake extends mage.sets.urzassaga.PeregrineDrake {
 
     public PeregrineDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PhantomMonster.java b/Mage.Sets/src/mage/sets/eternalmasters/PhantomMonster.java
index c2205468e1..dec1fffc74 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PhantomMonster.java
@@ -39,7 +39,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianGargantua.java
index 8749d223c2..05c7c11ee9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianGargantua.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianGargantua.java
@@ -38,7 +38,7 @@ public class PhyrexianGargantua extends mage.sets.apocalypse.PhyrexianGargantua
 
     public PhyrexianGargantua(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianIngester.java b/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianIngester.java
index e3e7b1e943..56c740d844 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianIngester.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianIngester.java
@@ -39,7 +39,7 @@ public class PhyrexianIngester extends mage.sets.newphyrexia.PhyrexianIngester {
 
     public PhyrexianIngester(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianRager.java b/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianRager.java
index b252f8e594..3fcc5db011 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PhyrexianRager.java
@@ -38,7 +38,7 @@ public class PhyrexianRager extends mage.sets.tenthedition.PhyrexianRager {
 
     public PhyrexianRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PilgrimsEye.java b/Mage.Sets/src/mage/sets/eternalmasters/PilgrimsEye.java
index 4dfad9abbe..0c10eb12ff 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PilgrimsEye.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PilgrimsEye.java
@@ -38,7 +38,7 @@ public class PilgrimsEye extends mage.sets.worldwake.PilgrimsEye {
 
     public PilgrimsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PlagueWitch.java b/Mage.Sets/src/mage/sets/eternalmasters/PlagueWitch.java
index 78cd7430bc..f1037f4a69 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PlagueWitch.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PlagueWitch.java
@@ -38,7 +38,7 @@ public class PlagueWitch extends mage.sets.nemesis.PlagueWitch {
 
     public PlagueWitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PriceOfProgress.java b/Mage.Sets/src/mage/sets/eternalmasters/PriceOfProgress.java
index 6550e78892..303a0c37c7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PriceOfProgress.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PriceOfProgress.java
@@ -37,7 +37,7 @@ public class PriceOfProgress extends mage.sets.exodus.PriceOfProgress {
 
     public PriceOfProgress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/PrismaticLens.java b/Mage.Sets/src/mage/sets/eternalmasters/PrismaticLens.java
index 2c5ba686fd..2e9265b9e3 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/PrismaticLens.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/PrismaticLens.java
@@ -39,7 +39,7 @@ public class PrismaticLens extends mage.sets.timespiral.PrismaticLens {
 
     public PrismaticLens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/eternalmasters/ProdigalSorcerer.java
index 638a48c337..ad838fff0a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ProwlingPangolin.java b/Mage.Sets/src/mage/sets/eternalmasters/ProwlingPangolin.java
index d61ff43cf6..4c9864f6a5 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ProwlingPangolin.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ProwlingPangolin.java
@@ -38,7 +38,7 @@ public class ProwlingPangolin extends mage.sets.onslaught.ProwlingPangolin {
 
     public ProwlingPangolin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Pyroblast.java b/Mage.Sets/src/mage/sets/eternalmasters/Pyroblast.java
index 0c0cb8ffb3..4eadc90f40 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Pyroblast.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Pyroblast.java
@@ -38,7 +38,7 @@ public class Pyroblast extends mage.sets.iceage.Pyroblast {
 
     public Pyroblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Pyrokinesis.java b/Mage.Sets/src/mage/sets/eternalmasters/Pyrokinesis.java
index 0a5775228c..bdd98187cf 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Pyrokinesis.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Pyrokinesis.java
@@ -39,7 +39,7 @@ public class Pyrokinesis extends mage.sets.alliances.Pyrokinesis {
 
     public Pyrokinesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/QuietSpeculation.java b/Mage.Sets/src/mage/sets/eternalmasters/QuietSpeculation.java
index b5170a0b8b..af5cef015c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/QuietSpeculation.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/QuietSpeculation.java
@@ -37,7 +37,7 @@ public class QuietSpeculation extends mage.sets.judgment.QuietSpeculation {
 
     public QuietSpeculation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/eternalmasters/RaiseTheAlarm.java
index adc240b8c9..f994f3e4e1 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RaiseTheAlarm.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RaiseTheAlarm.java
@@ -38,7 +38,7 @@ public class RaiseTheAlarm extends mage.sets.mirrodin.RaiseTheAlarm {
 
     public RaiseTheAlarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RallyThePeasants.java b/Mage.Sets/src/mage/sets/eternalmasters/RallyThePeasants.java
index 2cb3fcfb53..b551ec29a9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RallyThePeasants.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RallyThePeasants.java
@@ -39,7 +39,7 @@ public class RallyThePeasants extends mage.sets.innistrad.RallyThePeasants {
 
     public RallyThePeasants(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Rancor.java b/Mage.Sets/src/mage/sets/eternalmasters/Rancor.java
index aebad662b4..6ecdda9536 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Rancor.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Rancor.java
@@ -39,7 +39,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RecklessCharge.java b/Mage.Sets/src/mage/sets/eternalmasters/RecklessCharge.java
index f025153d5f..28821de455 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RecklessCharge.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RecklessCharge.java
@@ -38,7 +38,7 @@ public class RecklessCharge extends mage.sets.planechase.RecklessCharge {
 
     public RecklessCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RegalForce.java b/Mage.Sets/src/mage/sets/eternalmasters/RegalForce.java
index 8edcfdec19..d45e003954 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RegalForce.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RegalForce.java
@@ -37,7 +37,7 @@ public class RegalForce extends mage.sets.eventide.RegalForce {
 
     public RegalForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/eternalmasters/RelicOfProgenitus.java
index 6b08c1279f..3b7494d2f7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RelicOfProgenitus.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RelicOfProgenitus.java
@@ -39,7 +39,7 @@ public class RelicOfProgenitus extends mage.sets.shardsofalara.RelicOfProgenitus
 
     public RelicOfProgenitus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RoarOfTheWurm.java b/Mage.Sets/src/mage/sets/eternalmasters/RoarOfTheWurm.java
index 3e3c9503fb..dc4000830a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RoarOfTheWurm.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RoarOfTheWurm.java
@@ -38,7 +38,7 @@ public class RoarOfTheWurm extends mage.sets.odyssey.RoarOfTheWurm {
 
     public RoarOfTheWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Roots.java b/Mage.Sets/src/mage/sets/eternalmasters/Roots.java
index f50065ea13..7249966f4f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Roots.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Roots.java
@@ -39,7 +39,7 @@ public class Roots extends mage.sets.homelands.Roots {
 
     public Roots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RorixBladewing.java b/Mage.Sets/src/mage/sets/eternalmasters/RorixBladewing.java
index a86a333cd6..c8588f614c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RorixBladewing.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RorixBladewing.java
@@ -37,7 +37,7 @@ public class RorixBladewing extends mage.sets.planechase.RorixBladewing {
 
     public RorixBladewing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/RuggedHighlands.java b/Mage.Sets/src/mage/sets/eternalmasters/RuggedHighlands.java
index 127f8b0bf4..8cb94907dd 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/RuggedHighlands.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/RuggedHighlands.java
@@ -38,7 +38,7 @@ public class RuggedHighlands extends mage.sets.khansoftarkir.RuggedHighlands {
 
     public RuggedHighlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ScouredBarrens.java b/Mage.Sets/src/mage/sets/eternalmasters/ScouredBarrens.java
index b426c3f741..00d235cf61 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ScouredBarrens.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ScouredBarrens.java
@@ -38,7 +38,7 @@ public class ScouredBarrens extends mage.sets.khansoftarkir.ScouredBarrens {
 
     public ScouredBarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ScreechingSkaab.java b/Mage.Sets/src/mage/sets/eternalmasters/ScreechingSkaab.java
index 53e134cce2..62dc4a9e98 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ScreechingSkaab.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ScreechingSkaab.java
@@ -38,7 +38,7 @@ public class ScreechingSkaab extends mage.sets.darkascension.ScreechingSkaab {
 
     public ScreechingSkaab(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SealOfCleansing.java b/Mage.Sets/src/mage/sets/eternalmasters/SealOfCleansing.java
index 37e84161a4..48abd33f27 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SealOfCleansing.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SealOfCleansing.java
@@ -38,7 +38,7 @@ public class SealOfCleansing extends mage.sets.nemesis.SealOfCleansing {
 
     public SealOfCleansing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SealOfStrength.java b/Mage.Sets/src/mage/sets/eternalmasters/SealOfStrength.java
index 1a01fe6a72..04f2782cdc 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SealOfStrength.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SealOfStrength.java
@@ -38,7 +38,7 @@ public class SealOfStrength extends mage.sets.nemesis.SealOfStrength {
 
     public SealOfStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SecondThoughts.java b/Mage.Sets/src/mage/sets/eternalmasters/SecondThoughts.java
index 92a4d0ed16..719fea746d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SecondThoughts.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SecondThoughts.java
@@ -38,7 +38,7 @@ public class SecondThoughts extends mage.sets.odyssey.SecondThoughts {
 
     public SecondThoughts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SeismicStomp.java b/Mage.Sets/src/mage/sets/eternalmasters/SeismicStomp.java
index 372b96476b..036aa70794 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SeismicStomp.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SeismicStomp.java
@@ -38,7 +38,7 @@ public class SeismicStomp extends mage.sets.magic2014.SeismicStomp {
 
     public SeismicStomp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SengirAutocrat.java b/Mage.Sets/src/mage/sets/eternalmasters/SengirAutocrat.java
index fd8d38d953..fae10d101e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SengirAutocrat.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SengirAutocrat.java
@@ -37,7 +37,7 @@ public class SengirAutocrat extends mage.sets.homelands.SengirAutocrat {
 
     public SengirAutocrat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SenseisDiviningTop.java b/Mage.Sets/src/mage/sets/eternalmasters/SenseisDiviningTop.java
index a88a809d4f..f3fba5bb4f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SenseisDiviningTop.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SenseisDiviningTop.java
@@ -38,7 +38,7 @@ public class SenseisDiviningTop extends mage.sets.championsofkamigawa.SenseisDiv
 
     public SenseisDiviningTop(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SentinelSpider.java b/Mage.Sets/src/mage/sets/eternalmasters/SentinelSpider.java
index 589665c43d..bc52e7b142 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SentinelSpider.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SentinelSpider.java
@@ -38,7 +38,7 @@ public class SentinelSpider extends mage.sets.magic2013.SentinelSpider {
 
     public SentinelSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SerendibEfreet.java b/Mage.Sets/src/mage/sets/eternalmasters/SerendibEfreet.java
index 8ca915ed21..a4c3cb5f80 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SerendibEfreet.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SerendibEfreet.java
@@ -39,7 +39,7 @@ public class SerendibEfreet extends mage.sets.vintagemasters.SerendibEfreet {
 
     public SerendibEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SerraAngel.java b/Mage.Sets/src/mage/sets/eternalmasters/SerraAngel.java
index 97e02b6c17..81c06ab81f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SerraAngel.java
@@ -39,7 +39,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ShamanOfThePack.java b/Mage.Sets/src/mage/sets/eternalmasters/ShamanOfThePack.java
index 4e8395e8c5..3d6617017a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ShamanOfThePack.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ShamanOfThePack.java
@@ -37,7 +37,7 @@ public class ShamanOfThePack extends mage.sets.magicorigins.ShamanOfThePack {
 
     public ShamanOfThePack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ShardlessAgent.java b/Mage.Sets/src/mage/sets/eternalmasters/ShardlessAgent.java
index 8d16a3cd1b..551841b098 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ShardlessAgent.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ShardlessAgent.java
@@ -38,7 +38,7 @@ public class ShardlessAgent extends mage.sets.planechase2012.ShardlessAgent {
 
     public ShardlessAgent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Shelter.java b/Mage.Sets/src/mage/sets/eternalmasters/Shelter.java
index 824717930d..dfac841d06 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Shelter.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Shelter.java
@@ -38,7 +38,7 @@ public class Shelter extends mage.sets.odyssey.Shelter {
 
     public Shelter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ShorelineRanger.java b/Mage.Sets/src/mage/sets/eternalmasters/ShorelineRanger.java
index 308bcc5e90..b817b9ed5e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ShorelineRanger.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ShorelineRanger.java
@@ -38,7 +38,7 @@ public class ShorelineRanger extends mage.sets.scourge.ShorelineRanger {
 
     public ShorelineRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/eternalmasters/SiegeGangCommander.java
index a421b65284..8e67a99952 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SiegeGangCommander.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SiegeGangCommander.java
@@ -38,7 +38,7 @@ public class SiegeGangCommander extends mage.sets.magic2010.SiegeGangCommander {
 
     public SiegeGangCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SilentDeparture.java b/Mage.Sets/src/mage/sets/eternalmasters/SilentDeparture.java
index 5cea5b09ba..514606cb26 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SilentDeparture.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SilentDeparture.java
@@ -38,7 +38,7 @@ public class SilentDeparture extends mage.sets.innistrad.SilentDeparture {
 
     public SilentDeparture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SilvosRogueElemental.java b/Mage.Sets/src/mage/sets/eternalmasters/SilvosRogueElemental.java
index 9beae6788c..7ddd76fbd8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SilvosRogueElemental.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SilvosRogueElemental.java
@@ -38,7 +38,7 @@ public class SilvosRogueElemental extends mage.sets.onslaught.SilvosRogueElement
 
     public SilvosRogueElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Sinkhole.java b/Mage.Sets/src/mage/sets/eternalmasters/Sinkhole.java
index 3847fb7298..333151df5b 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Sinkhole.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Sinkhole.java
@@ -38,7 +38,7 @@ public class Sinkhole extends mage.sets.limitedalpha.Sinkhole {
 
     public Sinkhole(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SkulkingGhost.java b/Mage.Sets/src/mage/sets/eternalmasters/SkulkingGhost.java
index c846f5b963..c09809cf7d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SkulkingGhost.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SkulkingGhost.java
@@ -38,7 +38,7 @@ public class SkulkingGhost extends mage.sets.mirage.SkulkingGhost {
 
     public SkulkingGhost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SneakAttack.java b/Mage.Sets/src/mage/sets/eternalmasters/SneakAttack.java
index 424c1d3396..1db589e88c 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SneakAttack.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SneakAttack.java
@@ -38,7 +38,7 @@ public class SneakAttack extends mage.sets.urzassaga.SneakAttack {
 
     public SneakAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Soulcatcher.java b/Mage.Sets/src/mage/sets/eternalmasters/Soulcatcher.java
index 7ed0287851..df8c4d94c6 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Soulcatcher.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Soulcatcher.java
@@ -38,7 +38,7 @@ public class Soulcatcher extends mage.sets.odyssey.Soulcatcher {
 
     public Soulcatcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SphinxOfTheSteelWind.java b/Mage.Sets/src/mage/sets/eternalmasters/SphinxOfTheSteelWind.java
index 5276c6204c..be3a076a40 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SphinxOfTheSteelWind.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SphinxOfTheSteelWind.java
@@ -38,7 +38,7 @@ public class SphinxOfTheSteelWind extends mage.sets.alarareborn.SphinxOfTheSteel
 
     public SphinxOfTheSteelWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SpriteNoble.java b/Mage.Sets/src/mage/sets/eternalmasters/SpriteNoble.java
index 4156550c2f..1af70b8116 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SpriteNoble.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SpriteNoble.java
@@ -39,7 +39,7 @@ public class SpriteNoble extends mage.sets.timespiral.SpriteNoble {
 
     public SpriteNoble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SquadronHawk.java b/Mage.Sets/src/mage/sets/eternalmasters/SquadronHawk.java
index 7da082f708..345704fe3a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SquadronHawk.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SquadronHawk.java
@@ -37,7 +37,7 @@ public class SquadronHawk extends mage.sets.magic2011.SquadronHawk {
 
     public SquadronHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Stingscourger.java b/Mage.Sets/src/mage/sets/eternalmasters/Stingscourger.java
index c088134b60..ef1109b0f7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Stingscourger.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Stingscourger.java
@@ -38,7 +38,7 @@ public class Stingscourger extends mage.sets.planarchaos.Stingscourger {
 
     public Stingscourger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/StupefyingTouch.java b/Mage.Sets/src/mage/sets/eternalmasters/StupefyingTouch.java
index 6b83392785..3203260f13 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/StupefyingTouch.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/StupefyingTouch.java
@@ -39,7 +39,7 @@ public class StupefyingTouch extends mage.sets.torment.StupefyingTouch {
 
     public StupefyingTouch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SulfuricVortex.java b/Mage.Sets/src/mage/sets/eternalmasters/SulfuricVortex.java
index 8b764f8dc4..84b57d34dd 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SulfuricVortex.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SulfuricVortex.java
@@ -37,7 +37,7 @@ public class SulfuricVortex extends mage.sets.scourge.SulfuricVortex {
 
     public SulfuricVortex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SwiftwaterCliffs.java b/Mage.Sets/src/mage/sets/eternalmasters/SwiftwaterCliffs.java
index 6a6deb2980..ec249f0ad9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SwiftwaterCliffs.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SwiftwaterCliffs.java
@@ -38,7 +38,7 @@ public class SwiftwaterCliffs extends mage.sets.khansoftarkir.SwiftwaterCliffs {
 
     public SwiftwaterCliffs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/eternalmasters/SwordsToPlowshares.java
index 71b9c919c3..edd9e208a1 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SylvanLibrary.java b/Mage.Sets/src/mage/sets/eternalmasters/SylvanLibrary.java
index 88fb6a9cbc..e021d821dc 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SylvanLibrary.java
@@ -37,7 +37,7 @@ public class SylvanLibrary extends mage.sets.fifthedition.SylvanLibrary {
 
     public SylvanLibrary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/SylvanMight.java b/Mage.Sets/src/mage/sets/eternalmasters/SylvanMight.java
index 9eb2e456f2..8cf33962a6 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/SylvanMight.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/SylvanMight.java
@@ -39,7 +39,7 @@ public class SylvanMight extends mage.sets.odyssey.SylvanMight {
 
     public SylvanMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ThornwealdArcher.java b/Mage.Sets/src/mage/sets/eternalmasters/ThornwealdArcher.java
index 6b29860513..1cce9d57ca 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ThornwealdArcher.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ThornwealdArcher.java
@@ -38,7 +38,7 @@ public class ThornwealdArcher extends mage.sets.futuresight.ThornwealdArcher {
 
     public ThornwealdArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ThornwoodFalls.java b/Mage.Sets/src/mage/sets/eternalmasters/ThornwoodFalls.java
index 7f156bbc5c..0252c7efde 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ThornwoodFalls.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ThornwoodFalls.java
@@ -38,7 +38,7 @@ public class ThornwoodFalls extends mage.sets.khansoftarkir.ThornwoodFalls {
 
     public ThornwoodFalls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ThunderclapWyvern.java b/Mage.Sets/src/mage/sets/eternalmasters/ThunderclapWyvern.java
index 4fbf6bbcba..07ecb394d9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ThunderclapWyvern.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ThunderclapWyvern.java
@@ -38,7 +38,7 @@ public class ThunderclapWyvern extends mage.sets.magicorigins.ThunderclapWyvern
 
     public ThunderclapWyvern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TickingGnomes.java b/Mage.Sets/src/mage/sets/eternalmasters/TickingGnomes.java
index 8c98a70064..2f2d1e021a 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TickingGnomes.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TickingGnomes.java
@@ -38,7 +38,7 @@ public class TickingGnomes extends mage.sets.urzaslegacy.TickingGnomes {
 
     public TickingGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TidalWave.java b/Mage.Sets/src/mage/sets/eternalmasters/TidalWave.java
index 3b63240324..577526b645 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TidalWave.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TidalWave.java
@@ -39,7 +39,7 @@ public class TidalWave extends mage.sets.mirage.TidalWave {
 
     public TidalWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TimberwatchElf.java b/Mage.Sets/src/mage/sets/eternalmasters/TimberwatchElf.java
index 174102da0e..2e8cc27979 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TimberwatchElf.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TimberwatchElf.java
@@ -38,7 +38,7 @@ public class TimberwatchElf extends mage.sets.elvesvsgoblins.TimberwatchElf {
 
     public TimberwatchElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ToothAndClaw.java b/Mage.Sets/src/mage/sets/eternalmasters/ToothAndClaw.java
index 6afc390209..e0ee385595 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ToothAndClaw.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ToothAndClaw.java
@@ -39,7 +39,7 @@ public class ToothAndClaw extends mage.sets.tempest.ToothAndClaw {
 
     public ToothAndClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TorrentOfSouls.java b/Mage.Sets/src/mage/sets/eternalmasters/TorrentOfSouls.java
index c05338ea3f..07f072caf5 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TorrentOfSouls.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TorrentOfSouls.java
@@ -38,7 +38,7 @@ public class TorrentOfSouls extends mage.sets.sorinvstibalt.TorrentOfSouls {
 
     public TorrentOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ToxicDeluge.java b/Mage.Sets/src/mage/sets/eternalmasters/ToxicDeluge.java
index 18472ecba6..67bf3ecae9 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ToxicDeluge.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ToxicDeluge.java
@@ -37,7 +37,7 @@ public class ToxicDeluge extends mage.sets.commander2013.ToxicDeluge {
 
     public ToxicDeluge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TragicSlip.java b/Mage.Sets/src/mage/sets/eternalmasters/TragicSlip.java
index 2f6679e226..600febf350 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TragicSlip.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TragicSlip.java
@@ -38,7 +38,7 @@ public class TragicSlip extends mage.sets.darkascension.TragicSlip {
 
     public TragicSlip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TranquilCove.java b/Mage.Sets/src/mage/sets/eternalmasters/TranquilCove.java
index 514348d1d5..497df05ae7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TranquilCove.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TranquilCove.java
@@ -38,7 +38,7 @@ public class TranquilCove extends mage.sets.khansoftarkir.TranquilCove {
 
     public TranquilCove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TrygonPredator.java b/Mage.Sets/src/mage/sets/eternalmasters/TrygonPredator.java
index 3c1fa757f7..f922669dd2 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TrygonPredator.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TrygonPredator.java
@@ -38,7 +38,7 @@ public class TrygonPredator extends mage.sets.modernmasters.TrygonPredator {
 
     public TrygonPredator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/TwistedAbomination.java b/Mage.Sets/src/mage/sets/eternalmasters/TwistedAbomination.java
index 2ccb3b8078..92040c73ad 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/TwistedAbomination.java
@@ -39,7 +39,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/UndyingRage.java b/Mage.Sets/src/mage/sets/eternalmasters/UndyingRage.java
index 025485a836..c31f17fb18 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/UndyingRage.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/UndyingRage.java
@@ -39,7 +39,7 @@ public class UndyingRage extends mage.sets.heroesvsmonsters.UndyingRage {
 
     public UndyingRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/UnexpectedlyAbsent.java b/Mage.Sets/src/mage/sets/eternalmasters/UnexpectedlyAbsent.java
index c366d45ded..88a2160068 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/UnexpectedlyAbsent.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/UnexpectedlyAbsent.java
@@ -37,7 +37,7 @@ public class UnexpectedlyAbsent extends mage.sets.commander2013.UnexpectedlyAbse
 
     public UnexpectedlyAbsent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/UrborgUprising.java b/Mage.Sets/src/mage/sets/eternalmasters/UrborgUprising.java
index 1bd955d03c..c2c642b33d 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/UrborgUprising.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/UrborgUprising.java
@@ -38,7 +38,7 @@ public class UrborgUprising extends mage.sets.apocalypse.UrborgUprising {
 
     public UrborgUprising(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/VampiricTutor.java b/Mage.Sets/src/mage/sets/eternalmasters/VampiricTutor.java
index 0d0c88db64..29df5c4db7 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/VampiricTutor.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/VampiricTutor.java
@@ -38,7 +38,7 @@ public class VampiricTutor extends mage.sets.visions.VampiricTutor {
 
     public VampiricTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Victimize.java b/Mage.Sets/src/mage/sets/eternalmasters/Victimize.java
index b3f42c53fa..186889c629 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Victimize.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Victimize.java
@@ -38,7 +38,7 @@ public class Victimize extends mage.sets.conspiracy.Victimize {
 
     public Victimize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Vindicate.java b/Mage.Sets/src/mage/sets/eternalmasters/Vindicate.java
index 3c86ec016e..ebfe996969 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Vindicate.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Vindicate.java
@@ -37,7 +37,7 @@ public class Vindicate extends mage.sets.apocalypse.Vindicate {
 
     public Vindicate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/VisaraTheDreadful.java b/Mage.Sets/src/mage/sets/eternalmasters/VisaraTheDreadful.java
index bf2b7de10e..d530df5007 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/VisaraTheDreadful.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/VisaraTheDreadful.java
@@ -38,7 +38,7 @@ public class VisaraTheDreadful extends mage.sets.onslaught.VisaraTheDreadful {
 
     public VisaraTheDreadful(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Void.java b/Mage.Sets/src/mage/sets/eternalmasters/Void.java
index 3cd564ce0e..5dd4141a7f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Void.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Void.java
@@ -37,7 +37,7 @@ public class Void extends mage.sets.invasion.Void {
 
     public Void(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WakeOfVultures.java b/Mage.Sets/src/mage/sets/eternalmasters/WakeOfVultures.java
index 30e31e5297..7c275a503e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WakeOfVultures.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WakeOfVultures.java
@@ -38,7 +38,7 @@ public class WakeOfVultures extends mage.sets.visions.WakeOfVultures {
 
     public WakeOfVultures(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Wakedancer.java b/Mage.Sets/src/mage/sets/eternalmasters/Wakedancer.java
index b84d81d025..afd57d545e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Wakedancer.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Wakedancer.java
@@ -39,7 +39,7 @@ public class Wakedancer extends mage.sets.darkascension.Wakedancer {
 
     public Wakedancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WallOfOmens.java b/Mage.Sets/src/mage/sets/eternalmasters/WallOfOmens.java
index 4af25c71b2..6d054b6386 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WallOfOmens.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WallOfOmens.java
@@ -38,7 +38,7 @@ public class WallOfOmens extends mage.sets.riseoftheeldrazi.WallOfOmens {
 
     public WallOfOmens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/eternalmasters/WarPriestOfThune.java
index 1ea1a93f9b..0d0baec0ff 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WarPriestOfThune.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WarPriestOfThune.java
@@ -38,7 +38,7 @@ public class WarPriestOfThune extends mage.sets.magic2011.WarPriestOfThune {
 
     public WarPriestOfThune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WardenOfEvosIsle.java b/Mage.Sets/src/mage/sets/eternalmasters/WardenOfEvosIsle.java
index e41be8274a..7942f967ce 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WardenOfEvosIsle.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WardenOfEvosIsle.java
@@ -39,7 +39,7 @@ public class WardenOfEvosIsle extends mage.sets.magic2014.WardenOfEvosIsle {
 
     public WardenOfEvosIsle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Wasteland.java b/Mage.Sets/src/mage/sets/eternalmasters/Wasteland.java
index 7e0f478d9a..14a8fede34 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Wasteland.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Wasteland.java
@@ -38,7 +38,7 @@ public class Wasteland extends mage.sets.tempest.Wasteland {
 
     public Wasteland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WeeDragonauts.java b/Mage.Sets/src/mage/sets/eternalmasters/WeeDragonauts.java
index 5befb656e9..cc6ede17c1 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WeeDragonauts.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WeeDragonauts.java
@@ -38,7 +38,7 @@ public class WeeDragonauts extends mage.sets.guildpact.WeeDragonauts {
 
     public WeeDragonauts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WelkinGuide.java b/Mage.Sets/src/mage/sets/eternalmasters/WelkinGuide.java
index 6cd1e3eee1..db6628ac23 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WelkinGuide.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WelkinGuide.java
@@ -38,7 +38,7 @@ public class WelkinGuide extends mage.sets.shardsofalara.WelkinGuide {
 
     public WelkinGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Werebear.java b/Mage.Sets/src/mage/sets/eternalmasters/Werebear.java
index 668712e162..e6192964ef 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Werebear.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Werebear.java
@@ -37,7 +37,7 @@ public class Werebear extends mage.sets.odyssey.Werebear {
 
     public Werebear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WhitemaneLion.java b/Mage.Sets/src/mage/sets/eternalmasters/WhitemaneLion.java
index ba55465117..98ee00d36f 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WhitemaneLion.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WhitemaneLion.java
@@ -38,7 +38,7 @@ public class WhitemaneLion extends mage.sets.commander2014.WhitemaneLion {
 
     public WhitemaneLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WildfireEmissary.java b/Mage.Sets/src/mage/sets/eternalmasters/WildfireEmissary.java
index 79cb67e771..2cc3481bd4 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WildfireEmissary.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WildfireEmissary.java
@@ -38,7 +38,7 @@ public class WildfireEmissary extends mage.sets.mirage.WildfireEmissary {
 
     public WildfireEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WindScarredCrag.java b/Mage.Sets/src/mage/sets/eternalmasters/WindScarredCrag.java
index 88a148d3cc..104a72d3c8 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WindScarredCrag.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WindScarredCrag.java
@@ -38,7 +38,7 @@ public class WindScarredCrag extends mage.sets.khansoftarkir.WindScarredCrag {
 
     public WindScarredCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WinterOrb.java b/Mage.Sets/src/mage/sets/eternalmasters/WinterOrb.java
index dceb86c162..a5676bd94e 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WinterOrb.java
@@ -39,7 +39,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WirewoodSymbiote.java b/Mage.Sets/src/mage/sets/eternalmasters/WirewoodSymbiote.java
index bd9ba691e9..1f3e34d1fd 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WirewoodSymbiote.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WirewoodSymbiote.java
@@ -37,7 +37,7 @@ public class WirewoodSymbiote extends mage.sets.scourge.WirewoodSymbiote {
 
     public WirewoodSymbiote(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/Wonder.java b/Mage.Sets/src/mage/sets/eternalmasters/Wonder.java
index 6a422e4f41..351e31c101 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/Wonder.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/Wonder.java
@@ -38,7 +38,7 @@ public class Wonder extends mage.sets.judgment.Wonder {
 
     public Wonder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WorldgorgerDragon.java b/Mage.Sets/src/mage/sets/eternalmasters/WorldgorgerDragon.java
index 7309594214..2aa56266e6 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WorldgorgerDragon.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WorldgorgerDragon.java
@@ -38,7 +38,7 @@ public class WorldgorgerDragon extends mage.sets.judgment.WorldgorgerDragon {
 
     public WorldgorgerDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WornPowerstone.java b/Mage.Sets/src/mage/sets/eternalmasters/WornPowerstone.java
index e9ec5a77e9..a734aee942 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WornPowerstone.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WornPowerstone.java
@@ -38,7 +38,7 @@ public class WornPowerstone extends mage.sets.urzassaga.WornPowerstone {
 
     public WornPowerstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/WrathOfGod.java b/Mage.Sets/src/mage/sets/eternalmasters/WrathOfGod.java
index 873762bec1..362ff88a89 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/XantidSwarm.java b/Mage.Sets/src/mage/sets/eternalmasters/XantidSwarm.java
index 6781b8a80d..8804950393 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/XantidSwarm.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/XantidSwarm.java
@@ -38,7 +38,7 @@ public class XantidSwarm extends mage.sets.scourge.XantidSwarm {
 
     public XantidSwarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/eternalmasters/YavimayaEnchantress.java
index e7c4c75da1..aac6658793 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/YavimayaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/YavimayaEnchantress.java
@@ -39,7 +39,7 @@ public class YavimayaEnchantress extends mage.sets.tenthedition.YavimayaEnchantr
 
     public YavimayaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "EMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/YoungPyromancer.java b/Mage.Sets/src/mage/sets/eternalmasters/YoungPyromancer.java
index e14e29e402..90cd301825 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/YoungPyromancer.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/YoungPyromancer.java
@@ -38,7 +38,7 @@ public class YoungPyromancer extends mage.sets.magic2014.YoungPyromancer {
 
     public YoungPyromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eternalmasters/ZealousPersecution.java b/Mage.Sets/src/mage/sets/eternalmasters/ZealousPersecution.java
index 3a32eb5cf8..898197c6ee 100644
--- a/Mage.Sets/src/mage/sets/eternalmasters/ZealousPersecution.java
+++ b/Mage.Sets/src/mage/sets/eternalmasters/ZealousPersecution.java
@@ -38,7 +38,7 @@ public class ZealousPersecution extends mage.sets.alarareborn.ZealousPersecution
 
     public ZealousPersecution(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "EMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/CallTheSkybreaker.java b/Mage.Sets/src/mage/sets/eventide/CallTheSkybreaker.java
index 5af88350ea..c8d5c2a302 100644
--- a/Mage.Sets/src/mage/sets/eventide/CallTheSkybreaker.java
+++ b/Mage.Sets/src/mage/sets/eventide/CallTheSkybreaker.java
@@ -38,7 +38,7 @@ public class CallTheSkybreaker extends mage.sets.commander.CallTheSkybreaker {
 
     public CallTheSkybreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/DesecratorHag.java b/Mage.Sets/src/mage/sets/eventide/DesecratorHag.java
index e00d71a131..d1791f8149 100644
--- a/Mage.Sets/src/mage/sets/eventide/DesecratorHag.java
+++ b/Mage.Sets/src/mage/sets/eventide/DesecratorHag.java
@@ -38,7 +38,7 @@ public class DesecratorHag extends mage.sets.commander.DesecratorHag {
 
     public DesecratorHag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/DuergarHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/DuergarHedgeMage.java
index 2cb7b07ca5..6289ee7fac 100644
--- a/Mage.Sets/src/mage/sets/eventide/DuergarHedgeMage.java
+++ b/Mage.Sets/src/mage/sets/eventide/DuergarHedgeMage.java
@@ -37,7 +37,7 @@ public class DuergarHedgeMage extends mage.sets.commander.DuergarHedgeMage {
 
     public DuergarHedgeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/DuskdaleWurm.java b/Mage.Sets/src/mage/sets/eventide/DuskdaleWurm.java
index 024481bd41..14292ead3a 100644
--- a/Mage.Sets/src/mage/sets/eventide/DuskdaleWurm.java
+++ b/Mage.Sets/src/mage/sets/eventide/DuskdaleWurm.java
@@ -37,7 +37,7 @@ public class DuskdaleWurm extends mage.sets.magic2011.DuskdaleWurm {
 
     public DuskdaleWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/GwyllionHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/GwyllionHedgeMage.java
index 9ce913c152..ba01b0213f 100644
--- a/Mage.Sets/src/mage/sets/eventide/GwyllionHedgeMage.java
+++ b/Mage.Sets/src/mage/sets/eventide/GwyllionHedgeMage.java
@@ -38,7 +38,7 @@ public class GwyllionHedgeMage extends mage.sets.commander.GwyllionHedgeMage {
 
     public GwyllionHedgeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/MurkfiendLiege.java b/Mage.Sets/src/mage/sets/eventide/MurkfiendLiege.java
index f7413cbcb4..3d49a79c08 100644
--- a/Mage.Sets/src/mage/sets/eventide/MurkfiendLiege.java
+++ b/Mage.Sets/src/mage/sets/eventide/MurkfiendLiege.java
@@ -37,7 +37,7 @@ public class MurkfiendLiege extends mage.sets.commander2013.MurkfiendLiege {
 
     public MurkfiendLiege(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleRansacker.java b/Mage.Sets/src/mage/sets/eventide/NoggleRansacker.java
index 44ba5e7a15..721685f508 100644
--- a/Mage.Sets/src/mage/sets/eventide/NoggleRansacker.java
+++ b/Mage.Sets/src/mage/sets/eventide/NoggleRansacker.java
@@ -37,7 +37,7 @@ public class NoggleRansacker extends mage.sets.planechase2012.NoggleRansacker {
 
     public NoggleRansacker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/SpringjackPasture.java b/Mage.Sets/src/mage/sets/eventide/SpringjackPasture.java
index dddf0bb4bb..5d4e473e28 100644
--- a/Mage.Sets/src/mage/sets/eventide/SpringjackPasture.java
+++ b/Mage.Sets/src/mage/sets/eventide/SpringjackPasture.java
@@ -38,7 +38,7 @@ public class SpringjackPasture extends mage.sets.commander2013.SpringjackPasture
 
     public SpringjackPasture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "EVE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Anarchist.java b/Mage.Sets/src/mage/sets/exodus/Anarchist.java
index f8ccd46e0a..e0fa38fbc1 100644
--- a/Mage.Sets/src/mage/sets/exodus/Anarchist.java
+++ b/Mage.Sets/src/mage/sets/exodus/Anarchist.java
@@ -38,7 +38,7 @@ public class Anarchist extends mage.sets.ninthedition.Anarchist {
 
     public Anarchist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/AngelicBlessing.java b/Mage.Sets/src/mage/sets/exodus/AngelicBlessing.java
index 7c4e5429ca..316440d469 100644
--- a/Mage.Sets/src/mage/sets/exodus/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/exodus/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/ChargingPaladin.java b/Mage.Sets/src/mage/sets/exodus/ChargingPaladin.java
index fb01a595ae..066809c252 100644
--- a/Mage.Sets/src/mage/sets/exodus/ChargingPaladin.java
+++ b/Mage.Sets/src/mage/sets/exodus/ChargingPaladin.java
@@ -37,7 +37,7 @@ public class ChargingPaladin extends mage.sets.divinevsdemonic.ChargingPaladin {
 
     public ChargingPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/CoatOfArms.java b/Mage.Sets/src/mage/sets/exodus/CoatOfArms.java
index c47c8042ab..cc54429c3f 100644
--- a/Mage.Sets/src/mage/sets/exodus/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/exodus/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/CrashingBoars.java b/Mage.Sets/src/mage/sets/exodus/CrashingBoars.java
index 22a94554f1..959e126bf8 100644
--- a/Mage.Sets/src/mage/sets/exodus/CrashingBoars.java
+++ b/Mage.Sets/src/mage/sets/exodus/CrashingBoars.java
@@ -37,7 +37,7 @@ public class CrashingBoars extends mage.sets.tempestremastered.CrashingBoars {
 
     public CrashingBoars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Curiosity.java b/Mage.Sets/src/mage/sets/exodus/Curiosity.java
index 9c488142b4..4f608239a6 100644
--- a/Mage.Sets/src/mage/sets/exodus/Curiosity.java
+++ b/Mage.Sets/src/mage/sets/exodus/Curiosity.java
@@ -37,7 +37,7 @@ public class Curiosity extends mage.sets.innistrad.Curiosity {
 
     public Curiosity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/CursedFlesh.java b/Mage.Sets/src/mage/sets/exodus/CursedFlesh.java
index 90d3427bb9..e973d4b468 100644
--- a/Mage.Sets/src/mage/sets/exodus/CursedFlesh.java
+++ b/Mage.Sets/src/mage/sets/exodus/CursedFlesh.java
@@ -37,7 +37,7 @@ public class CursedFlesh extends mage.sets.invasion.CursedFlesh {
 
     public CursedFlesh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/DauthiJackal.java b/Mage.Sets/src/mage/sets/exodus/DauthiJackal.java
index de2c55fd16..334584f50a 100644
--- a/Mage.Sets/src/mage/sets/exodus/DauthiJackal.java
+++ b/Mage.Sets/src/mage/sets/exodus/DauthiJackal.java
@@ -37,7 +37,7 @@ public class DauthiJackal extends mage.sets.tempestremastered.DauthiJackal {
 
     public DauthiJackal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/DauthiWarlord.java b/Mage.Sets/src/mage/sets/exodus/DauthiWarlord.java
index e255fdd55a..3ac0072067 100644
--- a/Mage.Sets/src/mage/sets/exodus/DauthiWarlord.java
+++ b/Mage.Sets/src/mage/sets/exodus/DauthiWarlord.java
@@ -37,7 +37,7 @@ public class DauthiWarlord extends mage.sets.tempestremastered.DauthiWarlord {
 
     public DauthiWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/DeathsDuet.java b/Mage.Sets/src/mage/sets/exodus/DeathsDuet.java
index a99c35963a..a8388a0b14 100644
--- a/Mage.Sets/src/mage/sets/exodus/DeathsDuet.java
+++ b/Mage.Sets/src/mage/sets/exodus/DeathsDuet.java
@@ -37,7 +37,7 @@ public class DeathsDuet extends mage.sets.tempestremastered.DeathsDuet {
 
     public DeathsDuet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/ElvishBerserker.java b/Mage.Sets/src/mage/sets/exodus/ElvishBerserker.java
index 1f8625c7cf..0d603078f0 100644
--- a/Mage.Sets/src/mage/sets/exodus/ElvishBerserker.java
+++ b/Mage.Sets/src/mage/sets/exodus/ElvishBerserker.java
@@ -37,7 +37,7 @@ public class ElvishBerserker extends mage.sets.ninthedition.ElvishBerserker {
 
     public ElvishBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Fugue.java b/Mage.Sets/src/mage/sets/exodus/Fugue.java
index f5b7b580aa..279e2fa20b 100644
--- a/Mage.Sets/src/mage/sets/exodus/Fugue.java
+++ b/Mage.Sets/src/mage/sets/exodus/Fugue.java
@@ -37,7 +37,7 @@ public class Fugue extends mage.sets.seventhedition.Fugue {
 
     public Fugue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/FurnaceBrood.java b/Mage.Sets/src/mage/sets/exodus/FurnaceBrood.java
index 66440286c4..cb24817a68 100644
--- a/Mage.Sets/src/mage/sets/exodus/FurnaceBrood.java
+++ b/Mage.Sets/src/mage/sets/exodus/FurnaceBrood.java
@@ -37,7 +37,7 @@ public class FurnaceBrood extends mage.sets.tempestremastered.FurnaceBrood {
 
     public FurnaceBrood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/KillerWhale.java b/Mage.Sets/src/mage/sets/exodus/KillerWhale.java
index d680c1c17a..a5bc74d564 100644
--- a/Mage.Sets/src/mage/sets/exodus/KillerWhale.java
+++ b/Mage.Sets/src/mage/sets/exodus/KillerWhale.java
@@ -37,7 +37,7 @@ public class KillerWhale extends mage.sets.tempestremastered.KillerWhale {
 
     public KillerWhale(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/ManiacalRage.java b/Mage.Sets/src/mage/sets/exodus/ManiacalRage.java
index a74d78e8ba..8390e16375 100644
--- a/Mage.Sets/src/mage/sets/exodus/ManiacalRage.java
+++ b/Mage.Sets/src/mage/sets/exodus/ManiacalRage.java
@@ -37,7 +37,7 @@ public class ManiacalRage extends mage.sets.conflux.ManiacalRage {
 
     public ManiacalRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/MerfolkLooter.java b/Mage.Sets/src/mage/sets/exodus/MerfolkLooter.java
index 6098fba95b..4b4de1ee7e 100644
--- a/Mage.Sets/src/mage/sets/exodus/MerfolkLooter.java
+++ b/Mage.Sets/src/mage/sets/exodus/MerfolkLooter.java
@@ -37,7 +37,7 @@ public class MerfolkLooter extends mage.sets.magic2012.MerfolkLooter {
 
     public MerfolkLooter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/MirriCatWarrior.java b/Mage.Sets/src/mage/sets/exodus/MirriCatWarrior.java
index ec409ff04f..cc68c4cee2 100644
--- a/Mage.Sets/src/mage/sets/exodus/MirriCatWarrior.java
+++ b/Mage.Sets/src/mage/sets/exodus/MirriCatWarrior.java
@@ -37,7 +37,7 @@ public class MirriCatWarrior extends mage.sets.tenthedition.MirriCatWarrior {
 
     public MirriCatWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Nausea.java b/Mage.Sets/src/mage/sets/exodus/Nausea.java
index fe98cdb170..556df08dd9 100644
--- a/Mage.Sets/src/mage/sets/exodus/Nausea.java
+++ b/Mage.Sets/src/mage/sets/exodus/Nausea.java
@@ -37,7 +37,7 @@ public class Nausea extends mage.sets.seventhedition.Nausea {
 
     public Nausea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Necrologia.java b/Mage.Sets/src/mage/sets/exodus/Necrologia.java
index 1b60c9bf1c..f09912df37 100644
--- a/Mage.Sets/src/mage/sets/exodus/Necrologia.java
+++ b/Mage.Sets/src/mage/sets/exodus/Necrologia.java
@@ -38,7 +38,7 @@ public class Necrologia extends mage.sets.tempestremastered.Necrologia {
 
     public Necrologia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/PaladinEnVec.java b/Mage.Sets/src/mage/sets/exodus/PaladinEnVec.java
index 95ff81953c..8fc9790b96 100644
--- a/Mage.Sets/src/mage/sets/exodus/PaladinEnVec.java
+++ b/Mage.Sets/src/mage/sets/exodus/PaladinEnVec.java
@@ -37,7 +37,7 @@ public class PaladinEnVec extends mage.sets.ninthedition.PaladinEnVec {
 
     public PaladinEnVec(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Pandemonium.java b/Mage.Sets/src/mage/sets/exodus/Pandemonium.java
index c81b74f05a..3b1e8be6da 100644
--- a/Mage.Sets/src/mage/sets/exodus/Pandemonium.java
+++ b/Mage.Sets/src/mage/sets/exodus/Pandemonium.java
@@ -38,7 +38,7 @@ public class Pandemonium extends mage.sets.timeshifted.Pandemonium {
 
     public Pandemonium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/PeaceOfMind.java b/Mage.Sets/src/mage/sets/exodus/PeaceOfMind.java
index 0036d286d5..8bb6eed38e 100644
--- a/Mage.Sets/src/mage/sets/exodus/PeaceOfMind.java
+++ b/Mage.Sets/src/mage/sets/exodus/PeaceOfMind.java
@@ -37,7 +37,7 @@ public class PeaceOfMind extends mage.sets.ninthedition.PeaceOfMind {
 
     public PeaceOfMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/RagingGoblin.java b/Mage.Sets/src/mage/sets/exodus/RagingGoblin.java
index a8be9837dc..3da2b35193 100644
--- a/Mage.Sets/src/mage/sets/exodus/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/exodus/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Reclaim.java b/Mage.Sets/src/mage/sets/exodus/Reclaim.java
index 1fed9193ad..9153af541f 100644
--- a/Mage.Sets/src/mage/sets/exodus/Reclaim.java
+++ b/Mage.Sets/src/mage/sets/exodus/Reclaim.java
@@ -37,7 +37,7 @@ public class Reclaim extends mage.sets.magic2012.Reclaim {
 
     public Reclaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/RobeOfMirrors.java b/Mage.Sets/src/mage/sets/exodus/RobeOfMirrors.java
index be8ce7a25d..b609d8a594 100644
--- a/Mage.Sets/src/mage/sets/exodus/RobeOfMirrors.java
+++ b/Mage.Sets/src/mage/sets/exodus/RobeOfMirrors.java
@@ -37,7 +37,7 @@ public class RobeOfMirrors extends mage.sets.tenthedition.RobeOfMirrors {
 
     public RobeOfMirrors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/SeismicAssault.java b/Mage.Sets/src/mage/sets/exodus/SeismicAssault.java
index 481ddebecd..bd8e9b5d97 100644
--- a/Mage.Sets/src/mage/sets/exodus/SeismicAssault.java
+++ b/Mage.Sets/src/mage/sets/exodus/SeismicAssault.java
@@ -37,7 +37,7 @@ public class SeismicAssault extends mage.sets.seventhedition.SeismicAssault {
 
     public SeismicAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Shackles.java b/Mage.Sets/src/mage/sets/exodus/Shackles.java
index 4a3268924d..82b0d447b8 100644
--- a/Mage.Sets/src/mage/sets/exodus/Shackles.java
+++ b/Mage.Sets/src/mage/sets/exodus/Shackles.java
@@ -38,7 +38,7 @@ public class Shackles extends mage.sets.invasion.Shackles {
 
     public Shackles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Skyshaper.java b/Mage.Sets/src/mage/sets/exodus/Skyshaper.java
index 6448c4f298..d80b74a731 100644
--- a/Mage.Sets/src/mage/sets/exodus/Skyshaper.java
+++ b/Mage.Sets/src/mage/sets/exodus/Skyshaper.java
@@ -38,7 +38,7 @@ public class Skyshaper extends mage.sets.tempestremastered.Skyshaper {
 
     public Skyshaper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/SoulWarden.java b/Mage.Sets/src/mage/sets/exodus/SoulWarden.java
index 93b83e022e..cb27f2d854 100644
--- a/Mage.Sets/src/mage/sets/exodus/SoulWarden.java
+++ b/Mage.Sets/src/mage/sets/exodus/SoulWarden.java
@@ -37,7 +37,7 @@ public class SoulWarden extends mage.sets.magic2010.SoulWarden {
 
     public SoulWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Spellbook.java b/Mage.Sets/src/mage/sets/exodus/Spellbook.java
index 6170f333b4..46ba16c6a0 100644
--- a/Mage.Sets/src/mage/sets/exodus/Spellbook.java
+++ b/Mage.Sets/src/mage/sets/exodus/Spellbook.java
@@ -37,7 +37,7 @@ public class Spellbook extends mage.sets.magic2010.Spellbook {
 
     public Spellbook(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/Spellshock.java b/Mage.Sets/src/mage/sets/exodus/Spellshock.java
index ac4fce3f79..f750d672fc 100644
--- a/Mage.Sets/src/mage/sets/exodus/Spellshock.java
+++ b/Mage.Sets/src/mage/sets/exodus/Spellshock.java
@@ -37,7 +37,7 @@ public class Spellshock extends mage.sets.tempestremastered.Spellshock {
 
     public Spellshock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/SpikeHatcher.java b/Mage.Sets/src/mage/sets/exodus/SpikeHatcher.java
index 59878d9a47..bf74d01e3f 100644
--- a/Mage.Sets/src/mage/sets/exodus/SpikeHatcher.java
+++ b/Mage.Sets/src/mage/sets/exodus/SpikeHatcher.java
@@ -37,7 +37,7 @@ public class SpikeHatcher extends mage.sets.tempestremastered.SpikeHatcher {
 
     public SpikeHatcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/StandingTroops.java b/Mage.Sets/src/mage/sets/exodus/StandingTroops.java
index b605ae4c03..d19e89c618 100644
--- a/Mage.Sets/src/mage/sets/exodus/StandingTroops.java
+++ b/Mage.Sets/src/mage/sets/exodus/StandingTroops.java
@@ -37,7 +37,7 @@ public class StandingTroops extends mage.sets.eighthedition.StandingTroops {
 
     public StandingTroops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/ThalakosDrifters.java b/Mage.Sets/src/mage/sets/exodus/ThalakosDrifters.java
index 7af7154f67..1c009e8077 100644
--- a/Mage.Sets/src/mage/sets/exodus/ThalakosDrifters.java
+++ b/Mage.Sets/src/mage/sets/exodus/ThalakosDrifters.java
@@ -38,7 +38,7 @@ public class ThalakosDrifters extends mage.sets.tempestremastered.ThalakosDrifte
 
     public ThalakosDrifters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/ThalakosScout.java b/Mage.Sets/src/mage/sets/exodus/ThalakosScout.java
index 00dde053ca..8562537dea 100644
--- a/Mage.Sets/src/mage/sets/exodus/ThalakosScout.java
+++ b/Mage.Sets/src/mage/sets/exodus/ThalakosScout.java
@@ -37,7 +37,7 @@ public class ThalakosScout extends mage.sets.tempestremastered.ThalakosScout {
 
     public ThalakosScout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/ThopterSquadron.java b/Mage.Sets/src/mage/sets/exodus/ThopterSquadron.java
index b927a6791c..e7ef3d4727 100644
--- a/Mage.Sets/src/mage/sets/exodus/ThopterSquadron.java
+++ b/Mage.Sets/src/mage/sets/exodus/ThopterSquadron.java
@@ -38,7 +38,7 @@ public class ThopterSquadron extends mage.sets.vintagemasters.ThopterSquadron {
 
     public ThopterSquadron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java b/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java
index bd6e29e525..2ad8bad516 100644
--- a/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java
+++ b/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java
@@ -39,7 +39,7 @@ public class ThrullSurgeon extends mage.sets.tenthedition.ThrullSurgeon {
 
     public ThrullSurgeon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "EXO";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/exodus/TreasureHunter.java b/Mage.Sets/src/mage/sets/exodus/TreasureHunter.java
index 214a3a5c1b..8a99a82ba6 100644
--- a/Mage.Sets/src/mage/sets/exodus/TreasureHunter.java
+++ b/Mage.Sets/src/mage/sets/exodus/TreasureHunter.java
@@ -37,7 +37,7 @@ public class TreasureHunter extends mage.sets.tenthedition.TreasureHunter {
 
     public TreasureHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/TreasureTrove.java b/Mage.Sets/src/mage/sets/exodus/TreasureTrove.java
index 627cd6390f..ae7b117c81 100644
--- a/Mage.Sets/src/mage/sets/exodus/TreasureTrove.java
+++ b/Mage.Sets/src/mage/sets/exodus/TreasureTrove.java
@@ -37,7 +37,7 @@ public class TreasureTrove extends mage.sets.ninthedition.TreasureTrove {
 
     public TreasureTrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/WaywardSoul.java b/Mage.Sets/src/mage/sets/exodus/WaywardSoul.java
index 16a1f42569..1ab3d860e7 100644
--- a/Mage.Sets/src/mage/sets/exodus/WaywardSoul.java
+++ b/Mage.Sets/src/mage/sets/exodus/WaywardSoul.java
@@ -37,7 +37,7 @@ public class WaywardSoul extends mage.sets.tempestremastered.WaywardSoul {
 
     public WaywardSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/WoodElves.java b/Mage.Sets/src/mage/sets/exodus/WoodElves.java
index 665fda1ab8..1b72fcacad 100644
--- a/Mage.Sets/src/mage/sets/exodus/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/exodus/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "EXO";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Aeolipile.java b/Mage.Sets/src/mage/sets/fallenempires/Aeolipile.java
index e17cda959c..c24933bbf3 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Aeolipile.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Aeolipile.java
@@ -38,7 +38,7 @@ public class Aeolipile extends mage.sets.masterseditionii.Aeolipile {
 
     public Aeolipile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull1.java b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull1.java
index 023566b83b..c10c9f4228 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull1.java
@@ -37,7 +37,7 @@ public class ArmorThrull1 extends mage.sets.masterseditionii.ArmorThrull {
 
     public ArmorThrull1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull2.java b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull2.java
index 6c82e33fb1..0ac578b918 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull2.java
@@ -37,7 +37,7 @@ public class ArmorThrull2 extends mage.sets.masterseditionii.ArmorThrull {
 
     public ArmorThrull2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull3.java b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull3.java
index 62301a3743..3a850af9d4 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull3.java
@@ -37,7 +37,7 @@ public class ArmorThrull3 extends mage.sets.masterseditionii.ArmorThrull {
 
     public ArmorThrull3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull4.java b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull4.java
index 6a55a7ae4a..05beb4952c 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ArmorThrull4.java
@@ -37,7 +37,7 @@ public class ArmorThrull4 extends mage.sets.masterseditionii.ArmorThrull {
 
     public ArmorThrull4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BasalThrull2.java b/Mage.Sets/src/mage/sets/fallenempires/BasalThrull2.java
index 93ab2baea7..20a628fb0f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BasalThrull2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BasalThrull2.java
@@ -37,7 +37,7 @@ public class BasalThrull2 extends BasalThrull1 {
 
     public BasalThrull2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
     }
 
     public BasalThrull2(final BasalThrull2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BasalThrull3.java b/Mage.Sets/src/mage/sets/fallenempires/BasalThrull3.java
index 27a36274d8..4cee1fd002 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BasalThrull3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BasalThrull3.java
@@ -37,7 +37,7 @@ public class BasalThrull3 extends BasalThrull1 {
 
     public BasalThrull3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
     }
 
     public BasalThrull3(final BasalThrull3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BasalThrull4.java b/Mage.Sets/src/mage/sets/fallenempires/BasalThrull4.java
index d2441b5dc5..fa381a431f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BasalThrull4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BasalThrull4.java
@@ -37,7 +37,7 @@ public class BasalThrull4 extends BasalThrull1 {
 
     public BasalThrull4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
     }
 
     public BasalThrull4(final BasalThrull4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs2.java b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs2.java
index 9e71d5b62a..86fc07080f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs2.java
@@ -38,7 +38,7 @@ public class BrassclawOrcs2 extends mage.sets.fallenempires.BrassclawOrcs1 {
 
     public BrassclawOrcs2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
     }
 
     public BrassclawOrcs2(final BrassclawOrcs2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs3.java b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs3.java
index 68c5384e0b..b095ca752e 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs3.java
@@ -38,7 +38,7 @@ public class BrassclawOrcs3 extends mage.sets.fallenempires.BrassclawOrcs1 {
 
     public BrassclawOrcs3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
     }
 
     public BrassclawOrcs3(final BrassclawOrcs3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs4.java b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs4.java
index 54f8a164de..40a234394d 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BrassclawOrcs4.java
@@ -38,7 +38,7 @@ public class BrassclawOrcs4 extends mage.sets.fallenempires.BrassclawOrcs1 {
 
     public BrassclawOrcs4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
     }
 
     public BrassclawOrcs4(final BrassclawOrcs4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/BreedingPit.java b/Mage.Sets/src/mage/sets/fallenempires/BreedingPit.java
index 47b55b48cd..e07f4de7f1 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/BreedingPit.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/BreedingPit.java
@@ -37,7 +37,7 @@ public class BreedingPit extends mage.sets.fifthedition.BreedingPit {
 
     public BreedingPit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic1.java b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic1.java
index e0594d33b0..60cd9b62f6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic1.java
@@ -37,7 +37,7 @@ public class CombatMedic1 extends mage.sets.masterseditionii.CombatMedic {
 
     public CombatMedic1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic2.java b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic2.java
index f03976276f..6703f07d55 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic2.java
@@ -37,7 +37,7 @@ public class CombatMedic2 extends mage.sets.masterseditionii.CombatMedic {
 
     public CombatMedic2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic3.java b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic3.java
index 614de28720..ca8e7d6e96 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic3.java
@@ -37,7 +37,7 @@ public class CombatMedic3 extends mage.sets.masterseditionii.CombatMedic {
 
     public CombatMedic3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic4.java b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic4.java
index 30ed5cab22..95506cce8d 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/CombatMedic4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/CombatMedic4.java
@@ -37,7 +37,7 @@ public class CombatMedic4 extends mage.sets.masterseditionii.CombatMedic {
 
     public CombatMedic4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java b/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java
index 71435ecf8d..86b0b8bf93 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java
@@ -37,7 +37,7 @@ public class DwarvenCatapult extends mage.sets.fifthedition.DwarvenCatapult {
 
     public DwarvenCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/DwarvenHold.java b/Mage.Sets/src/mage/sets/fallenempires/DwarvenHold.java
index 2eec20e78d..f14e3bfba9 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/DwarvenHold.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/DwarvenHold.java
@@ -37,7 +37,7 @@ public class DwarvenHold extends mage.sets.fifthedition.DwarvenHold {
 
     public DwarvenHold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier2.java b/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier2.java
index 8112fe5bcb..c28f10e5ff 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier2.java
@@ -37,7 +37,7 @@ public class DwarvenSoldier2 extends DwarvenSoldier1 {
 
     public DwarvenSoldier2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
     }
 
     public DwarvenSoldier2(final DwarvenSoldier2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier3.java b/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier3.java
index ab21dc4eea..c1570400ce 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/DwarvenSoldier3.java
@@ -37,7 +37,7 @@ public class DwarvenSoldier3 extends DwarvenSoldier1 {
 
     public DwarvenSoldier3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
     }
 
     public DwarvenSoldier3(final DwarvenSoldier3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/EbonPraetor.java b/Mage.Sets/src/mage/sets/fallenempires/EbonPraetor.java
index 2f78159108..7b54b5d359 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/EbonPraetor.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/EbonPraetor.java
@@ -37,7 +37,7 @@ public class EbonPraetor extends mage.sets.masterseditionii.EbonPraetor {
 
     public EbonPraetor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress2.java b/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress2.java
index c454d76e92..7e08dd1d03 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress2.java
@@ -37,7 +37,7 @@ public class ElvenFortress2 extends ElvenFortress1 {
 
     public ElvenFortress2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
     }
 
     public ElvenFortress2(final ElvenFortress2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress3.java b/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress3.java
index 2af6a0b26a..4e0b20a11f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress3.java
@@ -37,7 +37,7 @@ public class ElvenFortress3 extends ElvenFortress1 {
 
     public ElvenFortress3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
     }
 
     public ElvenFortress3(final ElvenFortress3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress4.java b/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress4.java
index 70e5a5e6ac..e15debf634 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvenFortress4.java
@@ -37,7 +37,7 @@ public class ElvenFortress4 extends ElvenFortress1 {
 
     public ElvenFortress4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
     }
 
     public ElvenFortress4(final ElvenFortress4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvenLyre.java b/Mage.Sets/src/mage/sets/fallenempires/ElvenLyre.java
index a866b03d03..f9587906fc 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvenLyre.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvenLyre.java
@@ -38,7 +38,7 @@ public class ElvenLyre extends mage.sets.masterseditionii.ElvenLyre {
 
     public ElvenLyre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishFarmer.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishFarmer.java
index ef29f4273d..560f5ecae7 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvishFarmer.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishFarmer.java
@@ -37,7 +37,7 @@ public class ElvishFarmer extends mage.sets.masterseditionii.ElvishFarmer {
 
     public ElvishFarmer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java
index 1680fd5489..d1a861c4e4 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java
@@ -38,7 +38,7 @@ public class ElvishHunter1 extends mage.sets.masterseditionii.ElvishHunter {
 
     public ElvishHunter1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java
index 85ee6e335e..31e864c4f1 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java
@@ -38,7 +38,7 @@ public class ElvishHunter2 extends mage.sets.masterseditionii.ElvishHunter {
 
     public ElvishHunter2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java
index 9760808898..1d28419cd4 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java
@@ -38,7 +38,7 @@ public class ElvishHunter3 extends mage.sets.masterseditionii.ElvishHunter {
 
     public ElvishHunter3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishScout2.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishScout2.java
index 4f127a27cc..0f1918046f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvishScout2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishScout2.java
@@ -37,7 +37,7 @@ public class ElvishScout2 extends ElvishScout1 {
 
     public ElvishScout2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
     }
 
     public ElvishScout2(final ElvishScout2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishScout3.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishScout3.java
index d5b1256c5a..aae312b687 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ElvishScout3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishScout3.java
@@ -37,7 +37,7 @@ public class ElvishScout3 extends ElvishScout1 {
 
     public ElvishScout3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
     }
 
     public ElvishScout3(final ElvishScout3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot2.java b/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot2.java
index 4000777f17..c634c1b78c 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot2.java
@@ -37,7 +37,7 @@ public class FarrelsZealot2 extends FarrelsZealot1 {
 
     public FarrelsZealot2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
     }
 
     public FarrelsZealot2(final FarrelsZealot2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot3.java b/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot3.java
index 877492f1d5..7a580a468b 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/FarrelsZealot3.java
@@ -37,7 +37,7 @@ public class FarrelsZealot3 extends FarrelsZealot1 {
 
     public FarrelsZealot3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
     }
 
     public FarrelsZealot3(final FarrelsZealot3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon2.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon2.java
index a1b64fafef..ed87bf5bf9 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon2.java
@@ -38,7 +38,7 @@ public class GoblinChirurgeon2 extends mage.sets.fallenempires.GoblinChirurgeon1
 
     public GoblinChirurgeon2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
     }
 
     public GoblinChirurgeon2(final GoblinChirurgeon2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon3.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon3.java
index 06e937dddc..6e837c7611 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinChirurgeon3.java
@@ -38,7 +38,7 @@ public class GoblinChirurgeon3 extends mage.sets.fallenempires.GoblinChirurgeon1
 
     public GoblinChirurgeon3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
     }
 
     public GoblinChirurgeon3(final GoblinChirurgeon3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java
index ea0ee1b0ce..23c69a33c7 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java
@@ -38,7 +38,7 @@ public class GoblinGrenade1 extends mage.sets.magic2012.GoblinGrenade {
 
     public GoblinGrenade1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java
index a62d5202ee..f04eb1c1ee 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java
@@ -38,7 +38,7 @@ public class GoblinGrenade2 extends mage.sets.magic2012.GoblinGrenade {
 
     public GoblinGrenade2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java
index 752f2d3062..5b1a57d5b7 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java
@@ -38,7 +38,7 @@ public class GoblinGrenade3 extends mage.sets.magic2012.GoblinGrenade {
 
     public GoblinGrenade3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums2.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums2.java
index 7b046b740f..c4551a8c11 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums2.java
@@ -37,7 +37,7 @@ public class GoblinWarDrums2 extends mage.sets.fallenempires.GoblinWarDrums1 {
 
     public GoblinWarDrums2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
     }
 
     public GoblinWarDrums2(final GoblinWarDrums2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums3.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums3.java
index b11a0e4a6c..24fbcf6b7f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums3.java
@@ -37,7 +37,7 @@ public class GoblinWarDrums3 extends mage.sets.fallenempires.GoblinWarDrums1 {
 
     public GoblinWarDrums3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
     }
 
     public GoblinWarDrums3(final GoblinWarDrums3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums4.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums4.java
index cb327a7c80..ba10a1e685 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums4.java
@@ -37,7 +37,7 @@ public class GoblinWarDrums4 extends mage.sets.fallenempires.GoblinWarDrums1 {
 
     public GoblinWarDrums4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
     }
 
     public GoblinWarDrums4(final GoblinWarDrums4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HandOfJustice.java b/Mage.Sets/src/mage/sets/fallenempires/HandOfJustice.java
index a5365457f2..dbd27061c6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HandOfJustice.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HandOfJustice.java
@@ -37,7 +37,7 @@ public class HandOfJustice extends mage.sets.mastersedition.HandOfJustice {
 
     public HandOfJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HighTide2.java b/Mage.Sets/src/mage/sets/fallenempires/HighTide2.java
index 2d9a56b12b..ec6a1a04fb 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HighTide2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HighTide2.java
@@ -38,7 +38,7 @@ public class HighTide2 extends mage.sets.fallenempires.HighTide1 {
 
     public HighTide2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
     }
 
     public HighTide2(final HighTide2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HighTide3.java b/Mage.Sets/src/mage/sets/fallenempires/HighTide3.java
index 20e98c9c6b..cdccd25722 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HighTide3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HighTide3.java
@@ -38,7 +38,7 @@ public class HighTide3 extends mage.sets.fallenempires.HighTide1 {
 
     public HighTide3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
     }
 
     public HighTide3(final HighTide3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Homarid2.java b/Mage.Sets/src/mage/sets/fallenempires/Homarid2.java
index 51d33e80bb..31e3d706df 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Homarid2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Homarid2.java
@@ -37,7 +37,7 @@ public class Homarid2 extends Homarid1 {
 
     public Homarid2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
     }
 
     public Homarid2(final Homarid2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Homarid3.java b/Mage.Sets/src/mage/sets/fallenempires/Homarid3.java
index f42970458e..b029ae0dc0 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Homarid3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Homarid3.java
@@ -37,7 +37,7 @@ public class Homarid3 extends Homarid1 {
 
     public Homarid3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
     }
 
     public Homarid3(final Homarid3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Homarid4.java b/Mage.Sets/src/mage/sets/fallenempires/Homarid4.java
index 4ae2066c64..487f889f7b 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Homarid4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Homarid4.java
@@ -37,7 +37,7 @@ public class Homarid4 extends Homarid1 {
 
     public Homarid4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
     }
 
     public Homarid4(final Homarid4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior2.java b/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior2.java
index f927b68c66..9f74650c05 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior2.java
@@ -37,7 +37,7 @@ public class HomaridWarrior2 extends HomaridWarrior1 {
 
     public HomaridWarrior2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
     }
 
     public HomaridWarrior2(final HomaridWarrior2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior3.java b/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior3.java
index 92ba080f52..23cd5ec61f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HomaridWarrior3.java
@@ -37,7 +37,7 @@ public class HomaridWarrior3 extends HomaridWarrior1 {
 
     public HomaridWarrior3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
     }
 
     public HomaridWarrior3(final HomaridWarrior3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java
index e5396bf174..acda00817c 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java
@@ -37,7 +37,7 @@ public class HymnToTourach2 extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
    }
 
     public HymnToTourach2(final HymnToTourach2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java
index 0d35568452..11b9238637 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java
@@ -37,7 +37,7 @@ public class HymnToTourach3 extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
    }
 
     public HymnToTourach3(final HymnToTourach3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java
index 2db732e9c0..32ebf99910 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java
@@ -37,7 +37,7 @@ public class HymnToTourach4 extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
    }
 
     public HymnToTourach4(final HymnToTourach4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.java
index 8bad3390ef..d2c3198d4e 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.java
@@ -37,7 +37,7 @@ public class IcatianJavelineers2 extends mage.sets.fallenempires.IcatianJaveline
 
     public IcatianJavelineers2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
     }
 
     public IcatianJavelineers2(final IcatianJavelineers2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java
index b0ec0e4deb..8094f8bc62 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java
@@ -37,7 +37,7 @@ public class IcatianJavelineers3 extends mage.sets.fallenempires.IcatianJaveline
 
     public IcatianJavelineers3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
     }
 
     public IcatianJavelineers3(final IcatianJavelineers3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger2.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger2.java
index 15824afa30..7d3d04f29a 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger2.java
@@ -37,7 +37,7 @@ public class IcatianMoneychanger2 extends IcatianMoneychanger1 {
 
     public IcatianMoneychanger2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
     }
 
     public IcatianMoneychanger2(final IcatianMoneychanger2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger3.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger3.java
index 8fe9b66b03..2eb4246d81 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianMoneychanger3.java
@@ -37,7 +37,7 @@ public class IcatianMoneychanger3 extends IcatianMoneychanger1 {
 
     public IcatianMoneychanger3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
     }
 
     public IcatianMoneychanger3(final IcatianMoneychanger3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianPriest.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianPriest.java
index d69bcec421..2d571b8d35 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianPriest.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianPriest.java
@@ -37,7 +37,7 @@ public class IcatianPriest extends mage.sets.tenthedition.IcatianPriest {
 
     public IcatianPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout1.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout1.java
index 8fb739ce20..132866bf28 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout1.java
@@ -37,7 +37,7 @@ public class IcatianScout1 extends mage.sets.masterseditionii.IcatianScout {
 
     public IcatianScout1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout2.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout2.java
index 36e027992c..a022b0fd3e 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout2.java
@@ -37,7 +37,7 @@ public class IcatianScout2 extends mage.sets.masterseditionii.IcatianScout {
 
     public IcatianScout2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout3.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout3.java
index 64adce04f2..774310ebcb 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout3.java
@@ -37,7 +37,7 @@ public class IcatianScout3 extends mage.sets.masterseditionii.IcatianScout {
 
     public IcatianScout3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout4.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout4.java
index 5c7808efa9..9e16f9bc31 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianScout4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianScout4.java
@@ -37,7 +37,7 @@ public class IcatianScout4 extends mage.sets.masterseditionii.IcatianScout {
 
     public IcatianScout4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand2.java b/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand2.java
index 947cf3fbcb..388f55b275 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand2.java
@@ -37,7 +37,7 @@ public class InitiatesOfTheEbonHand2 extends InitiatesOfTheEbonHand1 {
 
     public InitiatesOfTheEbonHand2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
     }
 
     public InitiatesOfTheEbonHand2(final InitiatesOfTheEbonHand2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand3.java b/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand3.java
index b9a5ef521b..c180db229e 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/InitiatesOfTheEbonHand3.java
@@ -37,7 +37,7 @@ public class InitiatesOfTheEbonHand3 extends InitiatesOfTheEbonHand1 {
 
     public InitiatesOfTheEbonHand3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
     }
 
     public InitiatesOfTheEbonHand3(final InitiatesOfTheEbonHand3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull1.java b/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull1.java
index 84e31f61d2..b634ac21cd 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull1.java
@@ -37,7 +37,7 @@ public class MindstabThrull1 extends mage.sets.mastersedition.MindstabThrull {
 
     public MindstabThrull1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull2.java b/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull2.java
index 06ecf6a5a4..35e10e9cc6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull2.java
@@ -37,7 +37,7 @@ public class MindstabThrull2 extends mage.sets.mastersedition.MindstabThrull {
 
     public MindstabThrull2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull3.java b/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull3.java
index 8525f9f373..bb597646fc 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/MindstabThrull3.java
@@ -37,7 +37,7 @@ public class MindstabThrull3 extends mage.sets.mastersedition.MindstabThrull {
 
     public MindstabThrull3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Necrite2.java b/Mage.Sets/src/mage/sets/fallenempires/Necrite2.java
index bafa3cfce5..a5c1c4cd2c 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Necrite2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Necrite2.java
@@ -37,7 +37,7 @@ public class Necrite2 extends Necrite1 {
 
     public Necrite2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
     }
 
     public Necrite2(final Necrite2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Necrite3.java b/Mage.Sets/src/mage/sets/fallenempires/Necrite3.java
index ffc560560e..fc4d6ff7d7 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Necrite3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Necrite3.java
@@ -37,7 +37,7 @@ public class Necrite3 extends Necrite1 {
 
     public Necrite3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
     }
 
     public Necrite3(final Necrite3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java
index 25273122c2..9db1bab1b0 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java
@@ -37,7 +37,7 @@ public class NightSoil2 extends mage.sets.fallenempires.NightSoil1 {
 
     public NightSoil2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
     }
 
     public NightSoil2(final NightSoil2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java
index cac4f2d104..d88f4c774b 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java
@@ -37,7 +37,7 @@ public class NightSoil3 extends mage.sets.fallenempires.NightSoil1 {
 
     public NightSoil3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
     }
 
     public NightSoil3(final NightSoil3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishCaptain.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishCaptain.java
index ebc21104e3..0aac5add96 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishCaptain.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishCaptain.java
@@ -37,7 +37,7 @@ public class OrcishCaptain extends mage.sets.masterseditionii.OrcishCaptain {
 
     public OrcishCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy2.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy2.java
index b7e5b5b023..5061b6079e 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy2.java
@@ -38,7 +38,7 @@ public class OrcishSpy2 extends mage.sets.fallenempires.OrcishSpy1 {
 
     public OrcishSpy2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
     }
 
     public OrcishSpy2(final OrcishSpy2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy3.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy3.java
index 96d130cbcb..71382125e5 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishSpy3.java
@@ -38,7 +38,7 @@ public class OrcishSpy3 extends mage.sets.fallenempires.OrcishSpy1 {
 
     public OrcishSpy3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
     }
 
     public OrcishSpy3(final OrcishSpy3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran1.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran1.java
index 7aeb359ee3..8e37f54c6a 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran1.java
@@ -37,7 +37,7 @@ public class OrcishVeteran1 extends mage.sets.masterseditionii.OrcishVeteran {
 
     public OrcishVeteran1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran2.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran2.java
index f3220d1c45..1fc588e494 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran2.java
@@ -37,7 +37,7 @@ public class OrcishVeteran2 extends mage.sets.masterseditionii.OrcishVeteran {
 
     public OrcishVeteran2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran3.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran3.java
index 9acf5b5e29..37cc3daa3f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran3.java
@@ -37,7 +37,7 @@ public class OrcishVeteran3 extends mage.sets.masterseditionii.OrcishVeteran {
 
     public OrcishVeteran3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran4.java b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran4.java
index b8aa762950..94a75bbb0d 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrcishVeteran4.java
@@ -37,7 +37,7 @@ public class OrcishVeteran4 extends mage.sets.masterseditionii.OrcishVeteran {
 
     public OrcishVeteran4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur1.java b/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur1.java
index 194a0bd052..a90c658e91 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur1.java
@@ -38,7 +38,7 @@ public class OrderOfLeitbur1 extends mage.sets.mastersedition.OrderOfLeitbur {
 
     public OrderOfLeitbur1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur2.java b/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur2.java
index 360fdfe329..a96a133af2 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur2.java
@@ -38,7 +38,7 @@ public class OrderOfLeitbur2 extends mage.sets.mastersedition.OrderOfLeitbur {
 
     public OrderOfLeitbur2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur3.java b/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur3.java
index 1f71602dbc..3bf0dfcbd6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrderOfLeitbur3.java
@@ -38,7 +38,7 @@ public class OrderOfLeitbur3 extends mage.sets.mastersedition.OrderOfLeitbur {
 
     public OrderOfLeitbur3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand1.java b/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand1.java
index 221a35d91d..5768e16ccc 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand1.java
@@ -38,7 +38,7 @@ public class OrderOfTheEbonHand1 extends mage.sets.mastersedition.OrderOfTheEbon
 
     public OrderOfTheEbonHand1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand2.java b/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand2.java
index 28270bc648..0212ea0cf6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand2.java
@@ -38,7 +38,7 @@ public class OrderOfTheEbonHand2 extends mage.sets.mastersedition.OrderOfTheEbon
 
     public OrderOfTheEbonHand2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand3.java b/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand3.java
index 85e25ae3f4..c1497487df 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/OrderOfTheEbonHand3.java
@@ -38,7 +38,7 @@ public class OrderOfTheEbonHand3 extends mage.sets.mastersedition.OrderOfTheEbon
 
     public OrderOfTheEbonHand3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Orgg.java b/Mage.Sets/src/mage/sets/fallenempires/Orgg.java
index 5f5233f8b6..4d22fd0271 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Orgg.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Orgg.java
@@ -38,7 +38,7 @@ public class Orgg extends mage.sets.timeshifted.Orgg {
 
     public Orgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/RainbowVale.java b/Mage.Sets/src/mage/sets/fallenempires/RainbowVale.java
index 6a63f8a124..80beb8c3fb 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/RainbowVale.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/RainbowVale.java
@@ -37,7 +37,7 @@ public class RainbowVale extends mage.sets.mastersedition.RainbowVale {
 
     public RainbowVale(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/RingOfRenewal.java b/Mage.Sets/src/mage/sets/fallenempires/RingOfRenewal.java
index 064ea7d9ed..64aeefe7b3 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/RingOfRenewal.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/RingOfRenewal.java
@@ -37,7 +37,7 @@ public class RingOfRenewal extends mage.sets.masterseditioniv.RingOfRenewal {
 
     public RingOfRenewal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/RiverMerfolk.java b/Mage.Sets/src/mage/sets/fallenempires/RiverMerfolk.java
index 8c42a0096a..8eb7a84dfe 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/RiverMerfolk.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/RiverMerfolk.java
@@ -38,7 +38,7 @@ public class RiverMerfolk extends mage.sets.mastersedition.RiverMerfolk {
 
     public RiverMerfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/SandSilos.java b/Mage.Sets/src/mage/sets/fallenempires/SandSilos.java
index f16a6a2ebf..32d79f545a 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/SandSilos.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/SandSilos.java
@@ -37,7 +37,7 @@ public class SandSilos extends mage.sets.fifthedition.SandSilos {
 
     public SandSilos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/SoulExchange.java b/Mage.Sets/src/mage/sets/fallenempires/SoulExchange.java
index 6d24cabbe9..facfff06e9 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/SoulExchange.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/SoulExchange.java
@@ -37,7 +37,7 @@ public class SoulExchange extends mage.sets.masterseditionii.SoulExchange {
 
     public SoulExchange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Thallid1.java b/Mage.Sets/src/mage/sets/fallenempires/Thallid1.java
index a851ca6b50..5a69a108ee 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Thallid1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Thallid1.java
@@ -38,7 +38,7 @@ public class Thallid1 extends mage.sets.timeshifted.Thallid {
 
     public Thallid1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Thallid2.java b/Mage.Sets/src/mage/sets/fallenempires/Thallid2.java
index b51b407f53..74694d0058 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Thallid2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Thallid2.java
@@ -38,7 +38,7 @@ public class Thallid2 extends mage.sets.timeshifted.Thallid {
 
     public Thallid2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Thallid3.java b/Mage.Sets/src/mage/sets/fallenempires/Thallid3.java
index e6ec80d536..f84952cc90 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Thallid3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Thallid3.java
@@ -38,7 +38,7 @@ public class Thallid3 extends mage.sets.timeshifted.Thallid {
 
     public Thallid3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Thallid4.java b/Mage.Sets/src/mage/sets/fallenempires/Thallid4.java
index 4353643e52..3cc1e6271d 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Thallid4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Thallid4.java
@@ -38,7 +38,7 @@ public class Thallid4 extends mage.sets.timeshifted.Thallid {
 
     public Thallid4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/TheloniteDruid.java b/Mage.Sets/src/mage/sets/fallenempires/TheloniteDruid.java
index ded9f9f2cb..f1b6c2e029 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/TheloniteDruid.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/TheloniteDruid.java
@@ -38,7 +38,7 @@ public class TheloniteDruid extends mage.sets.masterseditionii.TheloniteDruid {
 
     public TheloniteDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ThornThallid2.java b/Mage.Sets/src/mage/sets/fallenempires/ThornThallid2.java
index 17b7c45c5f..fbfd70e7d6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ThornThallid2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ThornThallid2.java
@@ -38,7 +38,7 @@ public class ThornThallid2 extends mage.sets.fallenempires.ThornThallid1 {
 
     public ThornThallid2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
     }
 
     public ThornThallid2(final ThornThallid2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ThornThallid3.java b/Mage.Sets/src/mage/sets/fallenempires/ThornThallid3.java
index ecbc9a67d0..4830ce9765 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ThornThallid3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ThornThallid3.java
@@ -38,7 +38,7 @@ public class ThornThallid3 extends mage.sets.fallenempires.ThornThallid1 {
 
     public ThornThallid3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
     }
 
     public ThornThallid3(final ThornThallid3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ThornThallid4.java b/Mage.Sets/src/mage/sets/fallenempires/ThornThallid4.java
index 07d2856033..c7e1da12c2 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ThornThallid4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ThornThallid4.java
@@ -38,7 +38,7 @@ public class ThornThallid4 extends mage.sets.fallenempires.ThornThallid1 {
 
     public ThornThallid4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
     }
 
     public ThornThallid4(final ThornThallid4 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ThrullChampion.java b/Mage.Sets/src/mage/sets/fallenempires/ThrullChampion.java
index e1350b3b42..8269352c91 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ThrullChampion.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ThrullChampion.java
@@ -37,7 +37,7 @@ public class ThrullChampion extends mage.sets.mastersedition.ThrullChampion {
 
     public ThrullChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ThrullRetainer.java b/Mage.Sets/src/mage/sets/fallenempires/ThrullRetainer.java
index 7c6a1c2dbe..3f3a61768d 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/ThrullRetainer.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/ThrullRetainer.java
@@ -37,7 +37,7 @@ public class ThrullRetainer extends mage.sets.fifthedition.ThrullRetainer {
 
     public ThrullRetainer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/VodalianMage2.java b/Mage.Sets/src/mage/sets/fallenempires/VodalianMage2.java
index c1d98f2207..2c08b9c3bd 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/VodalianMage2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/VodalianMage2.java
@@ -37,7 +37,7 @@ public class VodalianMage2 extends VodalianMage1 {
 
     public VodalianMage2(UUID ownerId) {
         super(ownerId);
-         this.cardNumber = 60;
+         this.cardNumber = "60";
    }
 
     public VodalianMage2(final VodalianMage2 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/VodalianMage3.java b/Mage.Sets/src/mage/sets/fallenempires/VodalianMage3.java
index c7d1789e17..5fc73e5402 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/VodalianMage3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/VodalianMage3.java
@@ -37,7 +37,7 @@ public class VodalianMage3 extends VodalianMage1 {
 
     public VodalianMage3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
     }
 
     public VodalianMage3(final VodalianMage3 card) {
diff --git a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers1.java b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers1.java
index 6ee0565446..d7c51c245f 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers1.java
@@ -37,7 +37,7 @@ public class VodalianSoldiers1 extends mage.sets.fifthedition.VodalianSoldiers {
 
     public VodalianSoldiers1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers2.java b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers2.java
index 342503cbdc..529cdd5bd5 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers2.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers2.java
@@ -37,7 +37,7 @@ public class VodalianSoldiers2 extends mage.sets.fifthedition.VodalianSoldiers {
 
     public VodalianSoldiers2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers3.java b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers3.java
index a7a5c6251e..fd7984163e 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers3.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers3.java
@@ -37,7 +37,7 @@ public class VodalianSoldiers3 extends mage.sets.fifthedition.VodalianSoldiers {
 
     public VodalianSoldiers3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers4.java b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers4.java
index 7910c66b53..28df03d2cb 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers4.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/VodalianSoldiers4.java
@@ -37,7 +37,7 @@ public class VodalianSoldiers4 extends mage.sets.fifthedition.VodalianSoldiers {
 
     public VodalianSoldiers4(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "FEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/BloodfellCaves.java b/Mage.Sets/src/mage/sets/fatereforged/BloodfellCaves.java
index 13568da92f..905b85316a 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/BloodfellCaves.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/BloodfellCaves.java
@@ -37,7 +37,7 @@ public class BloodfellCaves extends mage.sets.khansoftarkir.BloodfellCaves {
 
     public BloodfellCaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/BlossomingSands.java b/Mage.Sets/src/mage/sets/fatereforged/BlossomingSands.java
index 177a2fbb03..2d0c0b5613 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/BlossomingSands.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/BlossomingSands.java
@@ -37,7 +37,7 @@ public class BlossomingSands extends mage.sets.khansoftarkir.BlossomingSands {
 
     public BlossomingSands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/DismalBackwater.java b/Mage.Sets/src/mage/sets/fatereforged/DismalBackwater.java
index a5f798dd87..31f3534abc 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/DismalBackwater.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/DismalBackwater.java
@@ -37,7 +37,7 @@ public class DismalBackwater extends mage.sets.khansoftarkir.DismalBackwater {
 
     public DismalBackwater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/DouseInGloom.java b/Mage.Sets/src/mage/sets/fatereforged/DouseInGloom.java
index a9f3d3e16a..c4706021ac 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/DouseInGloom.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/DouseInGloom.java
@@ -37,7 +37,7 @@ public class DouseInGloom extends mage.sets.guildpact.DouseInGloom {
 
     public DouseInGloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/HuntTheWeak.java b/Mage.Sets/src/mage/sets/fatereforged/HuntTheWeak.java
index 4806afb729..b1d9ee179b 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/HuntTheWeak.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/HuntTheWeak.java
@@ -37,7 +37,7 @@ public class HuntTheWeak extends mage.sets.magic2014.HuntTheWeak {
 
     public HuntTheWeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/JungleHollow.java b/Mage.Sets/src/mage/sets/fatereforged/JungleHollow.java
index f1872d6fbb..1926c65daa 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/JungleHollow.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/JungleHollow.java
@@ -37,7 +37,7 @@ public class JungleHollow extends mage.sets.khansoftarkir.JungleHollow {
 
     public JungleHollow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/Pyrotechnics.java b/Mage.Sets/src/mage/sets/fatereforged/Pyrotechnics.java
index 7578e98ccf..a8f20254ed 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/Pyrotechnics.java
@@ -37,7 +37,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/RuggedHighlands.java b/Mage.Sets/src/mage/sets/fatereforged/RuggedHighlands.java
index 5959ffecad..04a8bf3eae 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/RuggedHighlands.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/RuggedHighlands.java
@@ -37,7 +37,7 @@ public class RuggedHighlands extends mage.sets.khansoftarkir.RuggedHighlands {
 
     public RuggedHighlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/ScouredBarrens.java b/Mage.Sets/src/mage/sets/fatereforged/ScouredBarrens.java
index ded7c83cc3..eefb90ab32 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/ScouredBarrens.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/ScouredBarrens.java
@@ -37,7 +37,7 @@ public class ScouredBarrens extends mage.sets.khansoftarkir.ScouredBarrens {
 
     public ScouredBarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/SwiftwaterCliffs.java b/Mage.Sets/src/mage/sets/fatereforged/SwiftwaterCliffs.java
index 4b9aa11b2d..013ac22dd6 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/SwiftwaterCliffs.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/SwiftwaterCliffs.java
@@ -37,7 +37,7 @@ public class SwiftwaterCliffs extends mage.sets.khansoftarkir.SwiftwaterCliffs {
 
     public SwiftwaterCliffs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/ThornwoodFalls.java b/Mage.Sets/src/mage/sets/fatereforged/ThornwoodFalls.java
index 9574b560a6..bb836a8f82 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/ThornwoodFalls.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/ThornwoodFalls.java
@@ -37,7 +37,7 @@ public class ThornwoodFalls extends mage.sets.khansoftarkir.ThornwoodFalls {
 
     public ThornwoodFalls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/TranquilCove.java b/Mage.Sets/src/mage/sets/fatereforged/TranquilCove.java
index d51efc880a..f3622d1477 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/TranquilCove.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/TranquilCove.java
@@ -37,7 +37,7 @@ public class TranquilCove extends mage.sets.khansoftarkir.TranquilCove {
 
     public TranquilCove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/TyphoidRats.java b/Mage.Sets/src/mage/sets/fatereforged/TyphoidRats.java
index ac25180cb9..bfc6c2ffac 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/TyphoidRats.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/TyphoidRats.java
@@ -37,7 +37,7 @@ public class TyphoidRats extends mage.sets.innistrad.TyphoidRats {
 
     public TyphoidRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fatereforged/WindScarredCrag.java b/Mage.Sets/src/mage/sets/fatereforged/WindScarredCrag.java
index 11134bf5cd..411d82e2b5 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/WindScarredCrag.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/WindScarredCrag.java
@@ -37,7 +37,7 @@ public class WindScarredCrag extends mage.sets.khansoftarkir.WindScarredCrag {
 
     public WindScarredCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "FRF";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/AllSunsDawn.java b/Mage.Sets/src/mage/sets/fifthdawn/AllSunsDawn.java
index 73150279e2..b0e1e172c0 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/AllSunsDawn.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/AllSunsDawn.java
@@ -37,7 +37,7 @@ public class AllSunsDawn extends mage.sets.modernmasters2015.AllSunsDawn {
 
     public AllSunsDawn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ArcboundWanderer.java b/Mage.Sets/src/mage/sets/fifthdawn/ArcboundWanderer.java
index 6cd5b97f94..52acd5c87a 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/ArcboundWanderer.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/ArcboundWanderer.java
@@ -38,7 +38,7 @@ public class ArcboundWanderer extends mage.sets.modernmasters.ArcboundWanderer {
 
     public ArcboundWanderer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "5DN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java b/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java
index 85e13a3ad3..4d0739d74d 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java
@@ -38,7 +38,7 @@ public class AuriokSalvagers extends mage.sets.modernmasters.AuriokSalvagers {
 
     public AuriokSalvagers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "5DN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfDestruction.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfDestruction.java
index a05edb7aec..1eed8a63e7 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfDestruction.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfDestruction.java
@@ -37,7 +37,7 @@ public class BeaconOfDestruction extends mage.sets.tenthedition.BeaconOfDestruct
 
     public BeaconOfDestruction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfImmortality.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfImmortality.java
index 11e40aa3ab..ad08437d1a 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfImmortality.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfImmortality.java
@@ -37,7 +37,7 @@ public class BeaconOfImmortality extends mage.sets.tenthedition.BeaconOfImmortal
 
     public BeaconOfImmortality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfUnrest.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfUnrest.java
index 7ce252a49c..e6c1f31d55 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfUnrest.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfUnrest.java
@@ -37,7 +37,7 @@ public class BeaconOfUnrest extends mage.sets.planechase.BeaconOfUnrest {
 
     public BeaconOfUnrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/CacklingImp.java b/Mage.Sets/src/mage/sets/fifthdawn/CacklingImp.java
index a61ec1d8d6..663d771374 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/CacklingImp.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/CacklingImp.java
@@ -37,7 +37,7 @@ public class CacklingImp extends mage.sets.divinevsdemonic.CacklingImp {
 
     public CacklingImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ClockOfOmens.java b/Mage.Sets/src/mage/sets/fifthdawn/ClockOfOmens.java
index 27a2450d3c..51a84704ab 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/ClockOfOmens.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/ClockOfOmens.java
@@ -37,7 +37,7 @@ public class ClockOfOmens extends mage.sets.magic2013.ClockOfOmens {
 
     public ClockOfOmens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/CompositeGolem.java b/Mage.Sets/src/mage/sets/fifthdawn/CompositeGolem.java
index b2c114b1a1..f999bdf3ff 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/CompositeGolem.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/CompositeGolem.java
@@ -37,7 +37,7 @@ public class CompositeGolem extends mage.sets.tenthedition.CompositeGolem {
 
     public CompositeGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/CranialPlating.java b/Mage.Sets/src/mage/sets/fifthdawn/CranialPlating.java
index fa1f86a603..d2db49962a 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/CranialPlating.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/CranialPlating.java
@@ -37,7 +37,7 @@ public class CranialPlating extends mage.sets.planechase.CranialPlating {
 
     public CranialPlating(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/CrucibleOfWorlds.java b/Mage.Sets/src/mage/sets/fifthdawn/CrucibleOfWorlds.java
index 671c587bea..8475c50792 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/CrucibleOfWorlds.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/CrucibleOfWorlds.java
@@ -37,7 +37,7 @@ public class CrucibleOfWorlds extends mage.sets.tenthedition.CrucibleOfWorlds {
 
     public CrucibleOfWorlds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DoorToNothingness.java b/Mage.Sets/src/mage/sets/fifthdawn/DoorToNothingness.java
index f75e0d6705..451d75418d 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/DoorToNothingness.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/DoorToNothingness.java
@@ -37,7 +37,7 @@ public class DoorToNothingness extends mage.sets.planechase.DoorToNothingness {
 
     public DoorToNothingness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java b/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java
index a675dd8baa..f290fadf55 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java
@@ -37,7 +37,7 @@ public class DoublingCube extends mage.sets.tenthedition.DoublingCube {
 
     public DoublingCube(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DrossCrocodile.java b/Mage.Sets/src/mage/sets/fifthdawn/DrossCrocodile.java
index 8d3996b211..90a8b5b4b1 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/DrossCrocodile.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/DrossCrocodile.java
@@ -37,7 +37,7 @@ public class DrossCrocodile extends mage.sets.tenthedition.DrossCrocodile {
 
     public DrossCrocodile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EnergyChamber.java b/Mage.Sets/src/mage/sets/fifthdawn/EnergyChamber.java
index bb2a9a2473..8cde11d699 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/EnergyChamber.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/EnergyChamber.java
@@ -37,7 +37,7 @@ public class EnergyChamber extends mage.sets.elspethvstezzeret.EnergyChamber {
 
     public EnergyChamber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EtchedOracle.java b/Mage.Sets/src/mage/sets/fifthdawn/EtchedOracle.java
index b3e97aba9b..76a5017141 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/EtchedOracle.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/EtchedOracle.java
@@ -37,7 +37,7 @@ public class EtchedOracle extends mage.sets.planechase.EtchedOracle {
 
     public EtchedOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/fifthdawn/FurnaceWhelp.java
index de9cd08559..1d493bd15d 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/FurnaceWhelp.java
@@ -37,7 +37,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
 
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/JoinerAdept.java b/Mage.Sets/src/mage/sets/fifthdawn/JoinerAdept.java
index 2f27a11fd4..21be5d0d65 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/JoinerAdept.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/JoinerAdept.java
@@ -37,7 +37,7 @@ public class JoinerAdept extends mage.sets.tenthedition.JoinerAdept {
 
     public JoinerAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/MagmaGiant.java b/Mage.Sets/src/mage/sets/fifthdawn/MagmaGiant.java
index 6b5793cb00..ec8b970111 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/MagmaGiant.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/MagmaGiant.java
@@ -37,7 +37,7 @@ public class MagmaGiant extends mage.sets.portalsecondage.MagmaGiant {
 
     public MagmaGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ManaGeyser.java b/Mage.Sets/src/mage/sets/fifthdawn/ManaGeyser.java
index 90cb0877c0..0daa4d6712 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/ManaGeyser.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/ManaGeyser.java
@@ -37,7 +37,7 @@ public class ManaGeyser extends mage.sets.conspiracy.ManaGeyser {
 
     public ManaGeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/PentadPrism.java b/Mage.Sets/src/mage/sets/fifthdawn/PentadPrism.java
index 9f2164d799..58670a497d 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/PentadPrism.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/PentadPrism.java
@@ -37,7 +37,7 @@ public class PentadPrism extends mage.sets.planechase.PentadPrism {
 
     public PentadPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Qumulox.java b/Mage.Sets/src/mage/sets/fifthdawn/Qumulox.java
index a9b7c816ab..ad0faca2bc 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/Qumulox.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/Qumulox.java
@@ -37,7 +37,7 @@ public class Qumulox extends mage.sets.elspethvstezzeret.Qumulox {
 
     public Qumulox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/RazormaneMasticore.java b/Mage.Sets/src/mage/sets/fifthdawn/RazormaneMasticore.java
index 40dfffe0cb..d2d39b4eef 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/RazormaneMasticore.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/RazormaneMasticore.java
@@ -37,7 +37,7 @@ public class RazormaneMasticore extends mage.sets.tenthedition.RazormaneMasticor
 
     public RazormaneMasticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/RelentlessRats.java b/Mage.Sets/src/mage/sets/fifthdawn/RelentlessRats.java
index 18c8111751..f271853e59 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/RelentlessRats.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/RelentlessRats.java
@@ -37,7 +37,7 @@ public class RelentlessRats extends mage.sets.tenthedition.RelentlessRats {
 
     public RelentlessRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/RelicBarrier.java b/Mage.Sets/src/mage/sets/fifthdawn/RelicBarrier.java
index d0c52d8372..04897693a2 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/RelicBarrier.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/RelicBarrier.java
@@ -37,7 +37,7 @@ public class RelicBarrier extends mage.sets.legends.RelicBarrier {
 
     public RelicBarrier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/RudeAwakening.java b/Mage.Sets/src/mage/sets/fifthdawn/RudeAwakening.java
index 82091acadf..0f5c15d5a2 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/RudeAwakening.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/RudeAwakening.java
@@ -37,7 +37,7 @@ public class RudeAwakening extends mage.sets.modernmasters.RudeAwakening {
 
     public RudeAwakening(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Skullcage.java b/Mage.Sets/src/mage/sets/fifthdawn/Skullcage.java
index 41712f34e4..5e6329b0b5 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/Skullcage.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/Skullcage.java
@@ -37,7 +37,7 @@ public class Skullcage extends mage.sets.archenemy.Skullcage {
 
     public Skullcage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterProwler.java b/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterProwler.java
index cdcd2d45f5..48504c2143 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterProwler.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterProwler.java
@@ -37,7 +37,7 @@ public class SkyhunterProwler extends mage.sets.tenthedition.SkyhunterProwler {
 
     public SkyhunterProwler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterSkirmisher.java b/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterSkirmisher.java
index ea362082d8..4f1d3788fd 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/SkyhunterSkirmisher.java
@@ -37,7 +37,7 @@ public class SkyhunterSkirmisher extends mage.sets.tenthedition.SkyhunterSkirmis
 
     public SkyhunterSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java b/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java
index 46f1a24aec..c97e9b279c 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java
@@ -38,7 +38,7 @@ public class SparkElemental extends mage.sets.tenthedition.SparkElemental {
 
     public SparkElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "5DN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SuntouchedMyr.java b/Mage.Sets/src/mage/sets/fifthdawn/SuntouchedMyr.java
index 0e950b3a5b..f4c195d277 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/SuntouchedMyr.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/SuntouchedMyr.java
@@ -37,7 +37,7 @@ public class SuntouchedMyr extends mage.sets.planechase.SuntouchedMyr {
 
     public SuntouchedMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SynodCenturion.java b/Mage.Sets/src/mage/sets/fifthdawn/SynodCenturion.java
index 542c478b52..7a707716e8 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/SynodCenturion.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/SynodCenturion.java
@@ -37,7 +37,7 @@ public class SynodCenturion extends mage.sets.elspethvstezzeret.SynodCenturion {
 
     public SynodCenturion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ThoughtCourier.java b/Mage.Sets/src/mage/sets/fifthdawn/ThoughtCourier.java
index 914228b4be..92065510c0 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/ThoughtCourier.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/ThoughtCourier.java
@@ -38,7 +38,7 @@ public class ThoughtCourier extends mage.sets.ninthedition.ThoughtCourier {
 
     public ThoughtCourier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "5DN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java b/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java
index dc1e5a320e..e5bbe937fb 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java
@@ -38,7 +38,7 @@ public class TrinketMage extends mage.sets.scarsofmirrodin.TrinketMage {
 
     public TrinketMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "5DN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/VedalkenMastermind.java b/Mage.Sets/src/mage/sets/fifthdawn/VedalkenMastermind.java
index 605e51e78b..63a4d7911a 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/VedalkenMastermind.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/VedalkenMastermind.java
@@ -37,7 +37,7 @@ public class VedalkenMastermind extends mage.sets.tenthedition.VedalkenMastermin
 
     public VedalkenMastermind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/VedalkenShackles.java b/Mage.Sets/src/mage/sets/fifthdawn/VedalkenShackles.java
index b0ea06e0ba..d32103b633 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/VedalkenShackles.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/VedalkenShackles.java
@@ -38,7 +38,7 @@ public class VedalkenShackles extends mage.sets.modernmasters.VedalkenShackles {
 
     public VedalkenShackles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "5DN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/WayfarersBauble.java b/Mage.Sets/src/mage/sets/fifthdawn/WayfarersBauble.java
index 1a6f475b8c..cd5f35684f 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/WayfarersBauble.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/WayfarersBauble.java
@@ -37,7 +37,7 @@ public class WayfarersBauble extends mage.sets.commander2013.WayfarersBauble {
 
     public WayfarersBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "5DN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AdarkarWastes.java b/Mage.Sets/src/mage/sets/fifthedition/AdarkarWastes.java
index 82e0673be4..4d34a3ea47 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AdarkarWastes.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AdarkarWastes.java
@@ -37,7 +37,7 @@ public class AdarkarWastes extends mage.sets.tenthedition.AdarkarWastes {
 
     public AdarkarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 410;
+        this.cardNumber = "410";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AirElemental.java b/Mage.Sets/src/mage/sets/fifthedition/AirElemental.java
index ae042273ed..ae18cc14f5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AkronLegionnaire.java b/Mage.Sets/src/mage/sets/fifthedition/AkronLegionnaire.java
index 9aadf88e21..9452ceafcc 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AkronLegionnaire.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AkronLegionnaire.java
@@ -37,7 +37,7 @@ public class AkronLegionnaire extends mage.sets.legends.AkronLegionnaire {
 
     public AkronLegionnaire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/fifthedition/AladdinsRing.java
index b151cd84fb..8f543d870f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 346;
+        this.cardNumber = "346";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AnimateDead.java b/Mage.Sets/src/mage/sets/fifthedition/AnimateDead.java
index 1638056fc9..2898e58dc4 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AnimateWall.java b/Mage.Sets/src/mage/sets/fifthedition/AnimateWall.java
index e33751d41c..0faf26c128 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AnimateWall.java
@@ -37,7 +37,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/fifthedition/AnkhOfMishra.java
index 7bbd5882d2..10afda35fc 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AnkhOfMishra.java
@@ -38,7 +38,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 348;
+        this.cardNumber = "348";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ArmorOfFaith.java b/Mage.Sets/src/mage/sets/fifthedition/ArmorOfFaith.java
index 782575fd3a..112e9a5677 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ArmorOfFaith.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ArmorOfFaith.java
@@ -37,7 +37,7 @@ public class ArmorOfFaith extends mage.sets.masterseditionii.ArmorOfFaith {
 
     public ArmorOfFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AspectOfWolf.java b/Mage.Sets/src/mage/sets/fifthedition/AspectOfWolf.java
index 2c4e077e17..43b0cb4172 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AspectOfWolf.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AspectOfWolf.java
@@ -38,7 +38,7 @@ public class AspectOfWolf extends mage.sets.limitedalpha.AspectOfWolf {
 
     public AspectOfWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Atog.java b/Mage.Sets/src/mage/sets/fifthedition/Atog.java
index dd00d4263d..c59efa93e2 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Atog.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Atog.java
@@ -37,7 +37,7 @@ public class Atog extends mage.sets.mirrodin.Atog {
 
     public Atog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Aurochs.java b/Mage.Sets/src/mage/sets/fifthedition/Aurochs.java
index 28cb9aa4cb..761d06e6ab 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Aurochs.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Aurochs.java
@@ -37,7 +37,7 @@ public class Aurochs extends mage.sets.iceage.Aurochs {
 
     public Aurochs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AysenBureaucrats.java b/Mage.Sets/src/mage/sets/fifthedition/AysenBureaucrats.java
index eb92598194..2baa086c75 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AysenBureaucrats.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AysenBureaucrats.java
@@ -37,7 +37,7 @@ public class AysenBureaucrats extends mage.sets.masterseditionii.AysenBureaucrat
 
     public AysenBureaucrats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java b/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java
index 721bfcba37..cf213f6e0c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java
@@ -38,7 +38,7 @@ public class AzureDrake extends mage.sets.magic2011.AzureDrake {
 
     public AzureDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BallLightning.java b/Mage.Sets/src/mage/sets/fifthedition/BallLightning.java
index cb4f6978ba..8395021e91 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BallLightning.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BallLightning.java
@@ -37,7 +37,7 @@ public class BallLightning extends mage.sets.magic2010.BallLightning {
 
     public BallLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BarbedSextant.java b/Mage.Sets/src/mage/sets/fifthedition/BarbedSextant.java
index 39fd118bff..661fe879a1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BarbedSextant.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BarbedSextant.java
@@ -37,7 +37,7 @@ public class BarbedSextant extends mage.sets.iceage.BarbedSextant {
 
     public BarbedSextant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 351;
+        this.cardNumber = "351";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BarlsCage.java b/Mage.Sets/src/mage/sets/fifthedition/BarlsCage.java
index bde4c70328..c99001737e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BarlsCage.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BarlsCage.java
@@ -37,7 +37,7 @@ public class BarlsCage extends mage.sets.thedark.BarlsCage {
 
     public BarlsCage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 352;
+        this.cardNumber = "352";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BindingGrasp.java b/Mage.Sets/src/mage/sets/fifthedition/BindingGrasp.java
index 862222f765..93ce966242 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BindingGrasp.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BindingGrasp.java
@@ -38,7 +38,7 @@ public class BindingGrasp extends mage.sets.masterseditionii.BindingGrasp {
 
     public BindingGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/fifthedition/BirdsOfParadise.java
index 513ee31b27..d8ab2919bd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BlackKnight.java b/Mage.Sets/src/mage/sets/fifthedition/BlackKnight.java
index 29f5496b41..7df30a4821 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BlinkingSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/BlinkingSpirit.java
index ef34f8c739..f79a53ee56 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BlinkingSpirit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BlinkingSpirit.java
@@ -37,7 +37,7 @@ public class BlinkingSpirit extends mage.sets.ninthedition.BlinkingSpirit {
 
     public BlinkingSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BloodLust.java b/Mage.Sets/src/mage/sets/fifthedition/BloodLust.java
index ca62d3e642..171f8b00c7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BloodLust.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BloodLust.java
@@ -37,7 +37,7 @@ public class BloodLust extends mage.sets.fourthedition.BloodLust {
 
     public BloodLust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BogRats.java b/Mage.Sets/src/mage/sets/fifthedition/BogRats.java
index 88234d78fe..382c72c82c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BogRats.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BogRats.java
@@ -37,7 +37,7 @@ public class BogRats extends mage.sets.thedark.BogRats {
 
     public BogRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BogWraith.java b/Mage.Sets/src/mage/sets/fifthedition/BogWraith.java
index 0afe5e985c..eb1e2be621 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Boomerang.java b/Mage.Sets/src/mage/sets/fifthedition/Boomerang.java
index 8c5f37fee7..50f8d7583b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BottomlessVault.java b/Mage.Sets/src/mage/sets/fifthedition/BottomlessVault.java
index 764ce6ab9c..afb2a5e3b9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BottomlessVault.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BottomlessVault.java
@@ -37,7 +37,7 @@ public class BottomlessVault extends mage.sets.fallenempires.BottomlessVault {
 
     public BottomlessVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 411;
+        this.cardNumber = "411";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BrassclawOrcs.java b/Mage.Sets/src/mage/sets/fifthedition/BrassclawOrcs.java
index b95a5e1e11..08bc636790 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BrassclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BrassclawOrcs.java
@@ -37,7 +37,7 @@ public class BrassclawOrcs extends mage.sets.fallenempires.BrassclawOrcs1 {
 
     public BrassclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/BrothersOfFire.java b/Mage.Sets/src/mage/sets/fifthedition/BrothersOfFire.java
index 9f80f5a49f..d176c96e0e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/BrothersOfFire.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/BrothersOfFire.java
@@ -37,7 +37,7 @@ public class BrothersOfFire extends mage.sets.fourthedition.BrothersOfFire {
 
     public BrothersOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Brushland.java b/Mage.Sets/src/mage/sets/fifthedition/Brushland.java
index 2a583cb276..85deacc427 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Brushland.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Brushland.java
@@ -37,7 +37,7 @@ public class Brushland extends mage.sets.tenthedition.Brushland {
 
     public Brushland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 412;
+        this.cardNumber = "412";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Castle.java b/Mage.Sets/src/mage/sets/fifthedition/Castle.java
index 9bbdfa05d3..310fde3cc4 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Castle.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CavePeople.java b/Mage.Sets/src/mage/sets/fifthedition/CavePeople.java
index f5ffa299dc..5f76f486c4 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CavePeople.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CavePeople.java
@@ -37,7 +37,7 @@ public class CavePeople extends mage.sets.thedark.CavePeople {
 
     public CavePeople(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ChubToad.java b/Mage.Sets/src/mage/sets/fifthedition/ChubToad.java
index a3448378e3..9542000de9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ChubToad.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ChubToad.java
@@ -37,7 +37,7 @@ public class ChubToad extends mage.sets.iceage.ChubToad {
 
     public ChubToad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionArtifacts.java b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionArtifacts.java
index b2addb8b6b..c1e8f743a5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionArtifacts.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionArtifacts.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionArtifacts extends mage.sets.fifthdawn.CircleOfPro
     
     public CircleOfProtectionArtifacts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlack.java
index 354b1de7ff..7f07e83dfa 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlue.java
index bf8f249fbd..2009b3e97f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionGreen.java
index edc2709527..76df36cddc 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionRed.java
index c7751e1086..ae2e28d6f5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionWhite.java
index a3120adb9f..488ccc8c31 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CityOfBrass.java b/Mage.Sets/src/mage/sets/fifthedition/CityOfBrass.java
index f197d09b82..663ae92feb 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CityOfBrass.java
@@ -37,7 +37,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 413;
+        this.cardNumber = "413";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ClayStatue.java b/Mage.Sets/src/mage/sets/fifthedition/ClayStatue.java
index ffebdce89f..71f42abf4e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ClayStatue.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ClayStatue.java
@@ -37,7 +37,7 @@ public class ClayStatue extends mage.sets.antiquities.ClayStatue {
 
     public ClayStatue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 355;
+        this.cardNumber = "355";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ClockworkBeast.java b/Mage.Sets/src/mage/sets/fifthedition/ClockworkBeast.java
index abadcc8600..8d0834a6d6 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ClockworkBeast.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ClockworkBeast.java
@@ -37,7 +37,7 @@ public class ClockworkBeast extends mage.sets.limitedalpha.ClockworkBeast {
 
     public ClockworkBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 356;
+        this.cardNumber = "356";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Cockatrice.java b/Mage.Sets/src/mage/sets/fifthedition/Cockatrice.java
index 25d631aaaa..6c78bcb198 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Cockatrice.java
@@ -37,7 +37,7 @@ public class Cockatrice extends mage.sets.limitedalpha.Cockatrice {
 
     public Cockatrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Conquer.java b/Mage.Sets/src/mage/sets/fifthedition/Conquer.java
index bbded8f0c8..7b03f69ea9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Conquer.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Conquer.java
@@ -37,7 +37,7 @@ public class Conquer extends mage.sets.iceage.Conquer {
 
     public Conquer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CoralHelm.java b/Mage.Sets/src/mage/sets/fifthedition/CoralHelm.java
index 2986ae235f..67916b1e05 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CoralHelm.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CoralHelm.java
@@ -38,7 +38,7 @@ public class CoralHelm extends mage.sets.masterseditioniv.CoralHelm {
 
     public CoralHelm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 359;
+        this.cardNumber = "359";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Counterspell.java b/Mage.Sets/src/mage/sets/fifthedition/Counterspell.java
index d0311f5875..f37af737fc 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CrawGiant.java b/Mage.Sets/src/mage/sets/fifthedition/CrawGiant.java
index 72995743e3..73a2625dc7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CrawGiant.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CrawGiant.java
@@ -37,7 +37,7 @@ public class CrawGiant extends mage.sets.legends.CrawGiant {
 
     public CrawGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CrawWurm.java b/Mage.Sets/src/mage/sets/fifthedition/CrawWurm.java
index edd66767f5..7463e9296e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CrimsonManticore.java b/Mage.Sets/src/mage/sets/fifthedition/CrimsonManticore.java
index 2f940d7613..9217484ee1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CrimsonManticore.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CrimsonManticore.java
@@ -37,7 +37,7 @@ public class CrimsonManticore extends mage.sets.legends.CrimsonManticore {
 
     public CrimsonManticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Crumble.java b/Mage.Sets/src/mage/sets/fifthedition/Crumble.java
index 0611ff890d..2e14d89d97 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Crumble.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Crumble.java
@@ -38,7 +38,7 @@ public class Crumble extends mage.sets.masterseditioniv.Crumble {
 
     public Crumble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Crusade.java b/Mage.Sets/src/mage/sets/fifthedition/Crusade.java
index eefae73b68..fb1885263a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Crusade.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CrystalRod.java b/Mage.Sets/src/mage/sets/fifthedition/CrystalRod.java
index 18d5dbd1ff..42492bad6a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 361;
+        this.cardNumber = "361";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/CursedLand.java b/Mage.Sets/src/mage/sets/fifthedition/CursedLand.java
index 0499efe5ed..b70d18d2ef 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/CursedLand.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/CursedLand.java
@@ -37,7 +37,7 @@ public class CursedLand extends mage.sets.fourthedition.CursedLand {
 
     public CursedLand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DanceOfMany.java b/Mage.Sets/src/mage/sets/fifthedition/DanceOfMany.java
index 3f271c613f..9b1edf822d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DanceOfMany.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DanceOfMany.java
@@ -37,7 +37,7 @@ public class DanceOfMany extends mage.sets.thedark.DanceOfMany {
 
     public DanceOfMany(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java
index 1880c10520..8621739d49 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java
@@ -38,7 +38,7 @@ public class DancingScimitar extends mage.sets.ninthedition.DancingScimitar {
 
     public DancingScimitar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 362;
+        this.cardNumber = "362";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DarkRitual.java b/Mage.Sets/src/mage/sets/fifthedition/DarkRitual.java
index 8037c7ea93..b6c95973b0 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DeathSpeakers.java b/Mage.Sets/src/mage/sets/fifthedition/DeathSpeakers.java
index ec2df2169f..2a14a25c83 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DeathSpeakers.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DeathSpeakers.java
@@ -38,7 +38,7 @@ public class DeathSpeakers extends mage.sets.homelands.DeathSpeakers {
 
     public DeathSpeakers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DeathWard.java b/Mage.Sets/src/mage/sets/fifthedition/DeathWard.java
index ecfa2851ae..7289d7ce21 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DeathWard.java
@@ -38,7 +38,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Deathgrip.java b/Mage.Sets/src/mage/sets/fifthedition/Deathgrip.java
index 9c22ef52f3..09a238a03c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Deathgrip.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Deathgrip.java
@@ -37,7 +37,7 @@ public class Deathgrip extends mage.sets.limitedbeta.Deathgrip {
 
     public Deathgrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Deflection.java b/Mage.Sets/src/mage/sets/fifthedition/Deflection.java
index d823ec266f..d899ba84cb 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Deflection.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Deflection.java
@@ -37,7 +37,7 @@ public class Deflection extends mage.sets.iceage.Deflection {
 
     public Deflection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Derelor.java b/Mage.Sets/src/mage/sets/fifthedition/Derelor.java
index 5af7b7ab1c..7f21255c1d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Derelor.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Derelor.java
@@ -37,7 +37,7 @@ public class Derelor extends mage.sets.fallenempires.Derelor {
 
     public Derelor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DesertTwister.java b/Mage.Sets/src/mage/sets/fifthedition/DesertTwister.java
index 4c76751c9f..dcd75f62fe 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DiabolicMachine.java b/Mage.Sets/src/mage/sets/fifthedition/DiabolicMachine.java
index 9472d8e8a6..ca6d9a9df9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DiabolicMachine.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DiabolicMachine.java
@@ -37,7 +37,7 @@ public class DiabolicMachine extends mage.sets.fourthedition.DiabolicMachine {
 
     public DiabolicMachine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 363;
+        this.cardNumber = "363";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DingusEgg.java b/Mage.Sets/src/mage/sets/fifthedition/DingusEgg.java
index 1bf349c8c2..b2a76f5f91 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 364;
+        this.cardNumber = "364";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Disenchant.java b/Mage.Sets/src/mage/sets/fifthedition/Disenchant.java
index 3d4bfc6ad0..e2fa509e53 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Disintegrate.java b/Mage.Sets/src/mage/sets/fifthedition/Disintegrate.java
index 1df26fbbaa..c6b68d242d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Disintegrate.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Disintegrate.java
@@ -37,7 +37,7 @@ public class Disintegrate extends mage.sets.limitedalpha.Disintegrate {
 
     public Disintegrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/fifthedition/DisruptingScepter.java
index d954bee0cd..490a511d70 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 365;
+        this.cardNumber = "365";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DivineOffering.java b/Mage.Sets/src/mage/sets/fifthedition/DivineOffering.java
index 496fd16073..698fb60cdd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DivineOffering.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DivineOffering.java
@@ -37,7 +37,7 @@ public class DivineOffering extends mage.sets.mirrodinbesieged.DivineOffering {
 
     public DivineOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DrainLife.java b/Mage.Sets/src/mage/sets/fifthedition/DrainLife.java
index 25be33ec6b..602e4f7ea4 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/fifthedition/DrudgeSkeletons.java
index f90ea58586..9913a32f58 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DustToDust.java b/Mage.Sets/src/mage/sets/fifthedition/DustToDust.java
index 6c7ef5e09a..9bd8307054 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DustToDust.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DustToDust.java
@@ -38,7 +38,7 @@ public class DustToDust extends mage.sets.thedark.DustToDust {
 
     public DustToDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DwarvenRuins.java b/Mage.Sets/src/mage/sets/fifthedition/DwarvenRuins.java
index 04883b3f22..f99047fa0e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DwarvenRuins.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DwarvenRuins.java
@@ -37,7 +37,7 @@ public class DwarvenRuins extends mage.sets.fallenempires.DwarvenRuins {
 
     public DwarvenRuins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 415;
+        this.cardNumber = "415";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DwarvenSoldier.java b/Mage.Sets/src/mage/sets/fifthedition/DwarvenSoldier.java
index fc5317efda..e762d2bda6 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DwarvenSoldier.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DwarvenSoldier.java
@@ -37,7 +37,7 @@ public class DwarvenSoldier extends mage.sets.fallenempires.DwarvenSoldier1 {
 
     public DwarvenSoldier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/DwarvenWarriors.java b/Mage.Sets/src/mage/sets/fifthedition/DwarvenWarriors.java
index 3f1f710407..e733158894 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/DwarvenWarriors.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/DwarvenWarriors.java
@@ -37,7 +37,7 @@ public class DwarvenWarriors extends mage.sets.revisededition.DwarvenWarriors {
 
     public DwarvenWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Earthquake.java b/Mage.Sets/src/mage/sets/fifthedition/Earthquake.java
index a4f2f45a9c..1843fa4fd1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/EbonStronghold.java b/Mage.Sets/src/mage/sets/fifthedition/EbonStronghold.java
index ea3145eaaf..f455ebafd8 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/EbonStronghold.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/EbonStronghold.java
@@ -37,7 +37,7 @@ public class EbonStronghold extends mage.sets.fallenempires.EbonStronghold {
 
     public EbonStronghold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 416;
+        this.cardNumber = "416";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ElderDruid.java b/Mage.Sets/src/mage/sets/fifthedition/ElderDruid.java
index f193699350..b292881b68 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ElderDruid.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ElderDruid.java
@@ -37,7 +37,7 @@ public class ElderDruid extends mage.sets.iceage.ElderDruid {
 
     public ElderDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ElvenRiders.java b/Mage.Sets/src/mage/sets/fifthedition/ElvenRiders.java
index fc2f8b7f99..b62c3c313e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ElvenRiders.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ElvenRiders.java
@@ -37,7 +37,7 @@ public class ElvenRiders extends mage.sets.onslaught.ElvenRiders {
 
     public ElvenRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/EnergyFlux.java b/Mage.Sets/src/mage/sets/fifthedition/EnergyFlux.java
index 579b6cc595..1f499a620f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/EnergyFlux.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/EnergyFlux.java
@@ -37,7 +37,7 @@ public class EnergyFlux extends mage.sets.antiquities.EnergyFlux {
 
     public EnergyFlux(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Enervate.java b/Mage.Sets/src/mage/sets/fifthedition/Enervate.java
index b89b480d39..b6fb762d92 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Enervate.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Enervate.java
@@ -37,7 +37,7 @@ public class Enervate extends mage.sets.masterseditionii.Enervate {
 
     public Enervate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ErgRaiders.java b/Mage.Sets/src/mage/sets/fifthedition/ErgRaiders.java
index 44ff58679d..a7fdec3308 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ErgRaiders.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ErgRaiders.java
@@ -38,7 +38,7 @@ public class ErgRaiders extends mage.sets.fourthedition.ErgRaiders {
 
     public ErgRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Errantry.java b/Mage.Sets/src/mage/sets/fifthedition/Errantry.java
index c158957898..d7e7bf4987 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Errantry.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Errantry.java
@@ -38,7 +38,7 @@ public class Errantry extends mage.sets.masterseditionii.Errantry {
 
     public Errantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java b/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java
index 502515f5b8..0fa31a89f2 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java
@@ -38,7 +38,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/EyeForAnEye.java b/Mage.Sets/src/mage/sets/fifthedition/EyeForAnEye.java
index ede56cb57b..4a1cd153d1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/EyeForAnEye.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/EyeForAnEye.java
@@ -38,7 +38,7 @@ public class EyeForAnEye extends mage.sets.arabiannights.EyeForAnEye {
 
     public EyeForAnEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java b/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java
index 84b43bccbd..f052a274f3 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java
@@ -38,7 +38,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Fear.java b/Mage.Sets/src/mage/sets/fifthedition/Fear.java
index 05c1a29f4c..841a3608cf 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Fear.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Feedback.java b/Mage.Sets/src/mage/sets/fifthedition/Feedback.java
index 9e9581af67..ec6f48419b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Feedback.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Feedback.java
@@ -37,7 +37,7 @@ public class Feedback extends mage.sets.limitedalpha.Feedback {
 
     public Feedback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FeldonsCane.java b/Mage.Sets/src/mage/sets/fifthedition/FeldonsCane.java
index ba0b3dfe79..c60de9eb04 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FeldonsCane.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FeldonsCane.java
@@ -38,7 +38,7 @@ public class FeldonsCane extends mage.sets.timeshifted.FeldonsCane {
 
     public FeldonsCane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 368;
+        this.cardNumber = "368";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FellwarStone.java b/Mage.Sets/src/mage/sets/fifthedition/FellwarStone.java
index 3e6ab7f940..65d3afe09b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FellwarStone.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FellwarStone.java
@@ -37,7 +37,7 @@ public class FellwarStone extends mage.sets.ninthedition.FellwarStone {
 
     public FellwarStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 369;
+        this.cardNumber = "369";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Fireball.java b/Mage.Sets/src/mage/sets/fifthedition/Fireball.java
index 89b918b78b..122c139ce5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Fireball.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Firebreathing.java b/Mage.Sets/src/mage/sets/fifthedition/Firebreathing.java
index e64d21cb88..f55dd8f25c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FlameSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/FlameSpirit.java
index 8e77958d3c..949932f959 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FlameSpirit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FlameSpirit.java
@@ -37,7 +37,7 @@ public class FlameSpirit extends mage.sets.iceage.FlameSpirit {
 
     public FlameSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Flight.java b/Mage.Sets/src/mage/sets/fifthedition/Flight.java
index 6ac8b230a8..e51ac2a322 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Flight.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Flood.java b/Mage.Sets/src/mage/sets/fifthedition/Flood.java
index eacc2e1374..75cf272991 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Flood.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Flood.java
@@ -37,7 +37,7 @@ public class Flood extends mage.sets.fourthedition.Flood {
 
     public Flood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/fifthedition/FlyingCarpet.java
index 460e11ec36..95b8ba9ecf 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FlyingCarpet.java
@@ -37,7 +37,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 371;
+        this.cardNumber = "371";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Fog.java b/Mage.Sets/src/mage/sets/fifthedition/Fog.java
index adf61368d5..befca08371 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Fog.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ForceOfNature.java b/Mage.Sets/src/mage/sets/fifthedition/ForceOfNature.java
index 713cdaffe7..a638007485 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ForceSpike.java b/Mage.Sets/src/mage/sets/fifthedition/ForceSpike.java
index 075dd0bf70..d4a8a10bfd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ForceSpike.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ForceSpike.java
@@ -37,7 +37,7 @@ public class ForceSpike extends mage.sets.seventhedition.ForceSpike {
 
     public ForceSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Forget.java b/Mage.Sets/src/mage/sets/fifthedition/Forget.java
index fdfc27e2f5..873b51f223 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Forget.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Forget.java
@@ -37,7 +37,7 @@ public class Forget extends mage.sets.homelands.Forget {
 
     public Forget(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FountainOfYouth.java b/Mage.Sets/src/mage/sets/fifthedition/FountainOfYouth.java
index b932c789c4..3ac56a4157 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FountainOfYouth.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FountainOfYouth.java
@@ -37,7 +37,7 @@ public class FountainOfYouth extends mage.sets.tenthedition.FountainOfYouth {
 
     public FountainOfYouth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 372;
+        this.cardNumber = "372";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FrozenShade.java b/Mage.Sets/src/mage/sets/fifthedition/FrozenShade.java
index 5166af9a34..415d016ac9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FrozenShade.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FrozenShade.java
@@ -38,7 +38,7 @@ public class FrozenShade extends mage.sets.limitedalpha.FrozenShade {
 
     public FrozenShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Fungusaur.java b/Mage.Sets/src/mage/sets/fifthedition/Fungusaur.java
index b58a0e81ff..1c088560e2 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Fungusaur.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Fungusaur.java
@@ -37,7 +37,7 @@ public class Fungusaur extends mage.sets.limitedalpha.Fungusaur {
 
     public Fungusaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/FyndhornElder.java b/Mage.Sets/src/mage/sets/fifthedition/FyndhornElder.java
index 1383ccf5cb..1e7d8d1e4b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/FyndhornElder.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/FyndhornElder.java
@@ -37,7 +37,7 @@ public class FyndhornElder extends mage.sets.iceage.FyndhornElder {
 
     public FyndhornElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GameOfChaos.java b/Mage.Sets/src/mage/sets/fifthedition/GameOfChaos.java
index c504ff7fcf..fb197fb466 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GameOfChaos.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GameOfChaos.java
@@ -37,7 +37,7 @@ public class GameOfChaos extends mage.sets.iceage.GameOfChaos {
 
     public GameOfChaos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GaseousForm.java b/Mage.Sets/src/mage/sets/fifthedition/GaseousForm.java
index fbc4a857dd..1cabfe94a0 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GaseousForm.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GaseousForm.java
@@ -37,7 +37,7 @@ public class GaseousForm extends mage.sets.tempest.GaseousForm {
 
     public GaseousForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/fifthedition/GiantGrowth.java
index f1de35d6d9..e44ac52951 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/fifthedition/GiantSpider.java
index 04f2a0c1f3..903f056677 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GiantStrength.java b/Mage.Sets/src/mage/sets/fifthedition/GiantStrength.java
index 0413510a44..a49276fd93 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GiantStrength.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GiantStrength.java
@@ -37,7 +37,7 @@ public class GiantStrength extends mage.sets.tempest.GiantStrength {
 
     public GiantStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/fifthedition/GlassesOfUrza.java
index fa74168baa..51f5290051 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GlassesOfUrza.java
@@ -37,7 +37,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 374;
+        this.cardNumber = "374";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Gloom.java b/Mage.Sets/src/mage/sets/fifthedition/Gloom.java
index 34ebf73c44..6d188148f7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Gloom.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Gloom.java
@@ -37,7 +37,7 @@ public class Gloom extends mage.sets.limitedalpha.Gloom {
 
     public Gloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinDiggingTeam.java
index 000d2788b9..8200432329 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GoblinDiggingTeam.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinDiggingTeam.java
@@ -37,7 +37,7 @@ public class GoblinDiggingTeam extends mage.sets.thedark.GoblinDiggingTeam {
 
     public GoblinDiggingTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinKing.java
index c0c4b74cfc..58b4fc839a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java
index 945070ca2c..fb53d7ff39 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java
@@ -39,7 +39,7 @@ public class GoblinWarDrums extends mage.sets.fallenempires.GoblinWarDrums1 {
     public GoblinWarDrums(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.COMMON;
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinWarrens.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinWarrens.java
index ef8186bf55..ad3397a3d7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GoblinWarrens.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinWarrens.java
@@ -37,7 +37,7 @@ public class GoblinWarrens extends mage.sets.fallenempires.GoblinWarrens {
 
     public GoblinWarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GrapeshotCatapult.java b/Mage.Sets/src/mage/sets/fifthedition/GrapeshotCatapult.java
index 2115166858..00e2596f22 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GrapeshotCatapult.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GrapeshotCatapult.java
@@ -38,7 +38,7 @@ public class GrapeshotCatapult extends mage.sets.seventhedition.GrapeshotCatapul
 
     public GrapeshotCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 375;
+        this.cardNumber = "375";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/fifthedition/GrizzlyBears.java
index e3e5571221..7061e8f9a1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HavenwoodBattleground.java b/Mage.Sets/src/mage/sets/fifthedition/HavenwoodBattleground.java
index e4bddf5a09..b56c570d6b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HavenwoodBattleground.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HavenwoodBattleground.java
@@ -37,7 +37,7 @@ public class HavenwoodBattleground extends mage.sets.fallenempires.HavenwoodBatt
 
     public HavenwoodBattleground(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 421;
+        this.cardNumber = "421";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Heal.java b/Mage.Sets/src/mage/sets/fifthedition/Heal.java
index 3bc09b63fa..c7ca647827 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Heal.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Heal.java
@@ -37,7 +37,7 @@ public class Heal extends mage.sets.iceage.Heal {
 
     public Heal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HealingSalve.java b/Mage.Sets/src/mage/sets/fifthedition/HealingSalve.java
index 56518eab2b..7fc69cabf3 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Hecatomb.java b/Mage.Sets/src/mage/sets/fifthedition/Hecatomb.java
index f6460d7af0..795184e54b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Hecatomb.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Hecatomb.java
@@ -37,7 +37,7 @@ public class Hecatomb extends mage.sets.iceage.Hecatomb {
 
     public Hecatomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HillGiant.java b/Mage.Sets/src/mage/sets/fifthedition/HillGiant.java
index da007a3ced..f04b7e013d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HollowTrees.java b/Mage.Sets/src/mage/sets/fifthedition/HollowTrees.java
index fb7c8abc47..89cb705635 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HollowTrees.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HollowTrees.java
@@ -37,7 +37,7 @@ public class HollowTrees extends mage.sets.fallenempires.HollowTrees {
 
     public HollowTrees(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 422;
+        this.cardNumber = "422";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HolyStrength.java b/Mage.Sets/src/mage/sets/fifthedition/HolyStrength.java
index eab4adf654..7217a02591 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HomaridWarrior.java b/Mage.Sets/src/mage/sets/fifthedition/HomaridWarrior.java
index c4371775f9..0c797c3732 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HomaridWarrior.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HomaridWarrior.java
@@ -37,7 +37,7 @@ public class HomaridWarrior extends mage.sets.fallenempires.HomaridWarrior1 {
 
     public HomaridWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/fifthedition/HowlFromBeyond.java
index 8c460e1847..5f1b67c8e8 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/fifthedition/HowlingMine.java
index a8c64d327b..59d26312ee 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 377;
+        this.cardNumber = "377";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Hurricane.java b/Mage.Sets/src/mage/sets/fifthedition/Hurricane.java
index 82aa581349..cfde8a56a6 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Hurricane.java
@@ -37,7 +37,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IcatianScout.java b/Mage.Sets/src/mage/sets/fifthedition/IcatianScout.java
index 8f691fe4ff..27dbc53f08 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IcatianScout.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IcatianScout.java
@@ -37,7 +37,7 @@ public class IcatianScout extends mage.sets.masterseditionii.IcatianScout {
 
     public IcatianScout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IcatianStore.java b/Mage.Sets/src/mage/sets/fifthedition/IcatianStore.java
index a7a9455453..2295176035 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IcatianStore.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IcatianStore.java
@@ -37,7 +37,7 @@ public class IcatianStore extends mage.sets.fallenempires.IcatianStore {
 
     public IcatianStore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 423;
+        this.cardNumber = "423";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IcatianTown.java b/Mage.Sets/src/mage/sets/fifthedition/IcatianTown.java
index d879b073e2..a9f79eed7e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IcatianTown.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IcatianTown.java
@@ -37,7 +37,7 @@ public class IcatianTown extends mage.sets.fallenempires.IcatianTown {
 
     public IcatianTown(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ImposingVisage.java b/Mage.Sets/src/mage/sets/fifthedition/ImposingVisage.java
index be38dcecbe..ac4c9e3ab1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ImposingVisage.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ImposingVisage.java
@@ -37,7 +37,7 @@ public class ImposingVisage extends mage.sets.iceage.ImposingVisage {
 
     public ImposingVisage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Incinerate.java b/Mage.Sets/src/mage/sets/fifthedition/Incinerate.java
index 0a1ad77201..a8982bc84c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Inferno.java b/Mage.Sets/src/mage/sets/fifthedition/Inferno.java
index 6c9ef8110e..b5f87e3d47 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Inferno.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Inferno.java
@@ -37,7 +37,7 @@ public class Inferno extends mage.sets.thedark.Inferno {
 
     public Inferno(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/InitiatesOfTheEbonHand.java b/Mage.Sets/src/mage/sets/fifthedition/InitiatesOfTheEbonHand.java
index f6e2198ea9..81d14b9fb7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/InitiatesOfTheEbonHand.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/InitiatesOfTheEbonHand.java
@@ -37,7 +37,7 @@ public class InitiatesOfTheEbonHand extends mage.sets.fallenempires.InitiatesOfT
 
     public InitiatesOfTheEbonHand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IronStar.java b/Mage.Sets/src/mage/sets/fifthedition/IronStar.java
index fef08eea2e..6b850b09a8 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 379;
+        this.cardNumber = "379";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IronclawOrcs.java b/Mage.Sets/src/mage/sets/fifthedition/IronclawOrcs.java
index 1353e8be10..789d56eb4c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IronclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IronclawOrcs.java
@@ -37,7 +37,7 @@ public class IronclawOrcs extends mage.sets.limitedalpha.IronclawOrcs {
 
     public IronclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IslandSanctuary.java b/Mage.Sets/src/mage/sets/fifthedition/IslandSanctuary.java
index 9a5b3ecff7..1d3b84e40a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IslandSanctuary.java
@@ -37,7 +37,7 @@ public class IslandSanctuary extends mage.sets.limitedalpha.IslandSanctuary {
 
     public IslandSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IvoryCup.java b/Mage.Sets/src/mage/sets/fifthedition/IvoryCup.java
index 9ee94025b5..2712845ca1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 380;
+        this.cardNumber = "380";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/IvoryGuardians.java b/Mage.Sets/src/mage/sets/fifthedition/IvoryGuardians.java
index 5d92bf379f..fc0f56f38a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/IvoryGuardians.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/IvoryGuardians.java
@@ -37,7 +37,7 @@ public class IvoryGuardians extends mage.sets.legends.IvoryGuardians {
 
     public IvoryGuardians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/JadeMonolith.java b/Mage.Sets/src/mage/sets/fifthedition/JadeMonolith.java
index 51490525a6..02ae4f1c38 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 381;
+        this.cardNumber = "381";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/JalumTome.java b/Mage.Sets/src/mage/sets/fifthedition/JalumTome.java
index f25e073ae8..d4c1346d7b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/JalumTome.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/JalumTome.java
@@ -37,7 +37,7 @@ public class JalumTome extends mage.sets.seventhedition.JalumTome {
 
     public JalumTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 382;
+        this.cardNumber = "382";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/JandorsSaddlebags.java b/Mage.Sets/src/mage/sets/fifthedition/JandorsSaddlebags.java
index 3d97d268ef..d8aae326a5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/JandorsSaddlebags.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/JandorsSaddlebags.java
@@ -37,7 +37,7 @@ public class JandorsSaddlebags extends mage.sets.seventhedition.JandorsSaddlebag
 
     public JandorsSaddlebags(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 383;
+        this.cardNumber = "383";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/fifthedition/JayemdaeTome.java
index c93788a496..914889ef2d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 384;
+        this.cardNumber = "384";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/JohtullWurm.java b/Mage.Sets/src/mage/sets/fifthedition/JohtullWurm.java
index c44c8b8349..dc12a428df 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/JohtullWurm.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/JohtullWurm.java
@@ -37,7 +37,7 @@ public class JohtullWurm extends mage.sets.iceage.JohtullWurm {
 
     public JohtullWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Jokulhaups.java b/Mage.Sets/src/mage/sets/fifthedition/Jokulhaups.java
index 4f39148c3a..ad0a6f4431 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Jokulhaups.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Jokulhaups.java
@@ -37,7 +37,7 @@ public class Jokulhaups extends mage.sets.iceage.Jokulhaups {
 
     public Jokulhaups(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/KarplusanForest.java b/Mage.Sets/src/mage/sets/fifthedition/KarplusanForest.java
index 181cda3f57..f42b24223e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/KarplusanForest.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/KarplusanForest.java
@@ -37,7 +37,7 @@ public class KarplusanForest extends mage.sets.tenthedition.KarplusanForest {
 
     public KarplusanForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 429;
+        this.cardNumber = "429";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/KeldonWarlord.java b/Mage.Sets/src/mage/sets/fifthedition/KeldonWarlord.java
index 2979aa77f9..7bdc2c2e27 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/KeldonWarlord.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/KeldonWarlord.java
@@ -37,7 +37,7 @@ public class KeldonWarlord extends mage.sets.unlimitededition.KeldonWarlord {
 
     public KeldonWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/KjeldoranDead.java b/Mage.Sets/src/mage/sets/fifthedition/KjeldoranDead.java
index 243765932a..52089adca0 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/KjeldoranDead.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/KjeldoranDead.java
@@ -37,7 +37,7 @@ public class KjeldoranDead extends mage.sets.iceage.KjeldoranDead {
 
     public KjeldoranDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/sets/fifthedition/KjeldoranRoyalGuard.java
index 90afbaa3d7..a3722b6690 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/KjeldoranRoyalGuard.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/KjeldoranRoyalGuard.java
@@ -37,7 +37,7 @@ public class KjeldoranRoyalGuard extends mage.sets.iceage.KjeldoranRoyalGuard {
 
     public KjeldoranRoyalGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/KnightOfStromgald.java b/Mage.Sets/src/mage/sets/fifthedition/KnightOfStromgald.java
index af5cc58290..9bc8f447d6 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/KnightOfStromgald.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/KnightOfStromgald.java
@@ -38,7 +38,7 @@ public class KnightOfStromgald extends mage.sets.iceage.KnightOfStromgald {
 
     public KnightOfStromgald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/KrovikanSorcerer.java b/Mage.Sets/src/mage/sets/fifthedition/KrovikanSorcerer.java
index 387ea3b81c..494d011646 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/KrovikanSorcerer.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/KrovikanSorcerer.java
@@ -37,7 +37,7 @@ public class KrovikanSorcerer extends mage.sets.vintagemasters.KrovikanSorcerer
 
     public KrovikanSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/LeshracsRite.java b/Mage.Sets/src/mage/sets/fifthedition/LeshracsRite.java
index 10a0e515c6..6327768f5b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/LeshracsRite.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/LeshracsRite.java
@@ -37,7 +37,7 @@ public class LeshracsRite extends mage.sets.iceage.LeshracsRite {
 
     public LeshracsRite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/LeyDruid.java b/Mage.Sets/src/mage/sets/fifthedition/LeyDruid.java
index 156c9a6cd5..b7d528b02f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/LeyDruid.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/LeyDruid.java
@@ -39,7 +39,7 @@ public class LeyDruid extends mage.sets.limitedalpha.LeyDruid {
 
     public LeyDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Lhurgoyf.java b/Mage.Sets/src/mage/sets/fifthedition/Lhurgoyf.java
index 615e693a1c..b9964a06b2 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Lhurgoyf.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Lhurgoyf.java
@@ -37,7 +37,7 @@ public class Lhurgoyf extends mage.sets.iceage.Lhurgoyf {
 
     public Lhurgoyf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/LibraryOfLeng.java b/Mage.Sets/src/mage/sets/fifthedition/LibraryOfLeng.java
index bb428888af..56b6789a40 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/LibraryOfLeng.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/LibraryOfLeng.java
@@ -37,7 +37,7 @@ public class LibraryOfLeng extends mage.sets.limitedbeta.LibraryOfLeng {
 
     public LibraryOfLeng(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 387;
+        this.cardNumber = "387";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Lifeforce.java b/Mage.Sets/src/mage/sets/fifthedition/Lifeforce.java
index 140dcebb67..d86835813d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Lifeforce.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Lifeforce.java
@@ -38,7 +38,7 @@ public class Lifeforce extends mage.sets.masterseditioniv.Lifeforce {
 
     public Lifeforce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/LivingLands.java b/Mage.Sets/src/mage/sets/fifthedition/LivingLands.java
index 34da079165..ce4b394f05 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/fifthedition/LlanowarElves.java
index 9718667ee6..03b91b3293 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/LordOfThePit.java b/Mage.Sets/src/mage/sets/fifthedition/LordOfThePit.java
index 70dc39acdc..51c3249ea0 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Lure.java b/Mage.Sets/src/mage/sets/fifthedition/Lure.java
index c583a8dd07..742a908a9c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Lure.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/MagusOfTheUnseen.java b/Mage.Sets/src/mage/sets/fifthedition/MagusOfTheUnseen.java
index e9b0f23ae9..9bf6c0b05d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/MagusOfTheUnseen.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/MagusOfTheUnseen.java
@@ -37,7 +37,7 @@ public class MagusOfTheUnseen extends mage.sets.iceage.MagusOfTheUnseen {
 
     public MagusOfTheUnseen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ManaClash.java b/Mage.Sets/src/mage/sets/fifthedition/ManaClash.java
index 1281e8f345..70614a8aad 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ManaClash.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ManaClash.java
@@ -37,7 +37,7 @@ public class ManaClash extends mage.sets.fourthedition.ManaClash {
 
     public ManaClash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ManaFlare.java b/Mage.Sets/src/mage/sets/fifthedition/ManaFlare.java
index 9627f7aaae..546d59693d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ManaFlare.java
@@ -37,7 +37,7 @@ public class ManaFlare extends mage.sets.fourthedition.ManaFlare {
 
     public ManaFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ManaVault.java b/Mage.Sets/src/mage/sets/fifthedition/ManaVault.java
index 3f4bb93337..7413b8ec9d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 388;
+        this.cardNumber = "388";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Manabarbs.java b/Mage.Sets/src/mage/sets/fifthedition/Manabarbs.java
index e1aa4e8f1d..09b2f86d56 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/MarshViper.java b/Mage.Sets/src/mage/sets/fifthedition/MarshViper.java
index 0899cf080f..2ad401c533 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/MarshViper.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/MarshViper.java
@@ -37,7 +37,7 @@ public class MarshViper extends mage.sets.thedark.MarshViper {
 
     public MarshViper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Meekstone.java b/Mage.Sets/src/mage/sets/fifthedition/Meekstone.java
index 4d2a3965b7..c39b92fa88 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 389;
+        this.cardNumber = "389";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/MemoryLapse.java b/Mage.Sets/src/mage/sets/fifthedition/MemoryLapse.java
index 1c999daf0f..0ad9f2a0e7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/MemoryLapse.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/MemoryLapse.java
@@ -37,7 +37,7 @@ public class MemoryLapse extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/MesaFalcon.java b/Mage.Sets/src/mage/sets/fifthedition/MesaFalcon.java
index ea121afd8e..0ecd5b8995 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/MesaFalcon.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/MesaFalcon.java
@@ -37,7 +37,7 @@ public class MesaFalcon extends mage.sets.homelands.MesaFalcon1 {
 
     public MesaFalcon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/MindWarp.java b/Mage.Sets/src/mage/sets/fifthedition/MindWarp.java
index b0226a3088..05a46b092e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/MindWarp.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/MindWarp.java
@@ -37,7 +37,7 @@ public class MindWarp extends mage.sets.iceage.MindWarp {
 
     public MindWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/MindstabThrull.java b/Mage.Sets/src/mage/sets/fifthedition/MindstabThrull.java
index ba4d43b21a..302eef8243 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/MindstabThrull.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/MindstabThrull.java
@@ -37,7 +37,7 @@ public class MindstabThrull extends mage.sets.mastersedition.MindstabThrull {
 
     public MindstabThrull(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/NaturesLore.java b/Mage.Sets/src/mage/sets/fifthedition/NaturesLore.java
index 95532fbf65..11018c9988 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Necrite.java b/Mage.Sets/src/mage/sets/fifthedition/Necrite.java
index 6f6ce644a8..c95a82da1e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Necrite.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Necrite.java
@@ -37,7 +37,7 @@ public class Necrite extends mage.sets.fallenempires.Necrite1 {
 
     public Necrite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Necropotence.java b/Mage.Sets/src/mage/sets/fifthedition/Necropotence.java
index 412e7eedf1..5b33bff6e5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Necropotence.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Necropotence.java
@@ -37,7 +37,7 @@ public class Necropotence extends mage.sets.iceage.Necropotence {
 
     public Necropotence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/NetherShadow.java b/Mage.Sets/src/mage/sets/fifthedition/NetherShadow.java
index 3fb62f9906..3178921d9f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/NetherShadow.java
@@ -37,7 +37,7 @@ public class NetherShadow extends mage.sets.limitedalpha.NetherShadow {
 
     public NetherShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Nightmare.java b/Mage.Sets/src/mage/sets/fifthedition/Nightmare.java
index 220223edea..727a4b367b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ObeliskOfUndoing.java b/Mage.Sets/src/mage/sets/fifthedition/ObeliskOfUndoing.java
index cae667f49a..7566479f80 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ObeliskOfUndoing.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ObeliskOfUndoing.java
@@ -37,7 +37,7 @@ public class ObeliskOfUndoing extends mage.sets.chronicles.ObeliskOfUndoing {
 
     public ObeliskOfUndoing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 392;
+        this.cardNumber = "392";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/fifthedition/OrcishArtillery.java
index dd40b399b9..03cca597cf 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/OrcishCaptain.java b/Mage.Sets/src/mage/sets/fifthedition/OrcishCaptain.java
index 5a30798d54..d639822529 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/OrcishCaptain.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/OrcishCaptain.java
@@ -37,7 +37,7 @@ public class OrcishCaptain extends mage.sets.masterseditionii.OrcishCaptain {
 
     public OrcishCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/fifthedition/OrcishOriflamme.java
index 7748d027a8..be3e3bf083 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheSacredTorch.java
index 4b7d3d2188..716f2cf376 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheSacredTorch.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheSacredTorch.java
@@ -37,7 +37,7 @@ public class OrderOfTheSacredTorch extends mage.sets.iceage.OrderOfTheSacredTorc
 
     public OrderOfTheSacredTorch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheWhiteShield.java b/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheWhiteShield.java
index b131da9bee..8cc2592a32 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheWhiteShield.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/OrderOfTheWhiteShield.java
@@ -38,7 +38,7 @@ public class OrderOfTheWhiteShield extends mage.sets.iceage.OrderOfTheWhiteShiel
 
     public OrderOfTheWhiteShield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Orgg.java b/Mage.Sets/src/mage/sets/fifthedition/Orgg.java
index 6f6a2d0821..2afbed2f6e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Orgg.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Orgg.java
@@ -38,7 +38,7 @@ public class Orgg extends mage.sets.timeshifted.Orgg {
 
     public Orgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Ornithopter.java b/Mage.Sets/src/mage/sets/fifthedition/Ornithopter.java
index 401085c6ec..ce253f99b8 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Ornithopter.java
@@ -37,7 +37,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 393;
+        this.cardNumber = "393";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Panic.java b/Mage.Sets/src/mage/sets/fifthedition/Panic.java
index 589256a6c0..f5574d0251 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Panic.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Panic.java
@@ -37,7 +37,7 @@ public class Panic extends mage.sets.masterseditionii.Panic {
 
     public Panic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Paralyze.java b/Mage.Sets/src/mage/sets/fifthedition/Paralyze.java
index 6cc86b939b..efa8fd9ab1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PentagramOfTheAges.java b/Mage.Sets/src/mage/sets/fifthedition/PentagramOfTheAges.java
index 11dab61e2e..13aa52be7f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PentagramOfTheAges.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PentagramOfTheAges.java
@@ -37,7 +37,7 @@ public class PentagramOfTheAges extends mage.sets.iceage.PentagramOfTheAges {
 
     public PentagramOfTheAges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 394;
+        this.cardNumber = "394";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Pestilence.java b/Mage.Sets/src/mage/sets/fifthedition/Pestilence.java
index f8b6ac0e1f..c409c3bfae 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java
index 9e1ad079cc..8760ed400d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java
@@ -37,7 +37,7 @@ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
 
     public PhantasmalForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalTerrain.java
index 4f0a6c3e80..d98bf3ef8f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PirateShip.java b/Mage.Sets/src/mage/sets/fifthedition/PirateShip.java
index b636157916..66929d2e22 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PirateShip.java
@@ -38,7 +38,7 @@ public class PirateShip extends mage.sets.limitedalpha.PirateShip {
 
     public PirateShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java b/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java
index bd99299405..a7a2c50812 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java
@@ -37,7 +37,7 @@ public class PlagueRats extends mage.sets.unlimitededition.PlagueRats {
 
     public PlagueRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PowerSink.java b/Mage.Sets/src/mage/sets/fifthedition/PowerSink.java
index 9032aa3e1c..67fcdd6607 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PowerSink.java
@@ -38,7 +38,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PrimalOrder.java b/Mage.Sets/src/mage/sets/fifthedition/PrimalOrder.java
index 07a904ae4f..574c0909d9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PrimalOrder.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PrimalOrder.java
@@ -37,7 +37,7 @@ public class PrimalOrder extends mage.sets.homelands.PrimalOrder {
 
     public PrimalOrder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java
index 4040f9e3dc..765e43587c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PsychicVenom.java b/Mage.Sets/src/mage/sets/fifthedition/PsychicVenom.java
index fc86acafd2..a6f19d3fbd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PsychicVenom.java
@@ -38,7 +38,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java b/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java
index ac3421bc62..59d9d91b8c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java
@@ -38,7 +38,7 @@ public class Pyroblast extends mage.sets.iceage.Pyroblast {
 
     public Pyroblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Pyrotechnics.java b/Mage.Sets/src/mage/sets/fifthedition/Pyrotechnics.java
index a148f882b7..23b1a13510 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Pyrotechnics.java
@@ -37,7 +37,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/RagMan.java b/Mage.Sets/src/mage/sets/fifthedition/RagMan.java
index 6a9e9bb5d4..7eec8d9d64 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/RagMan.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/RagMan.java
@@ -37,7 +37,7 @@ public class RagMan extends mage.sets.thedark.RagMan {
 
     public RagMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/RaiseDead.java b/Mage.Sets/src/mage/sets/fifthedition/RaiseDead.java
index d1376545c2..394c9e6799 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/RayOfCommand.java b/Mage.Sets/src/mage/sets/fifthedition/RayOfCommand.java
index 5fb48a053d..e11cde3f13 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/RayOfCommand.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/RayOfCommand.java
@@ -37,7 +37,7 @@ public class RayOfCommand extends mage.sets.iceage.RayOfCommand {
 
     public RayOfCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ReefPirates.java b/Mage.Sets/src/mage/sets/fifthedition/ReefPirates.java
index 8bb200c14d..fbfcd37c4d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ReefPirates.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ReefPirates.java
@@ -37,7 +37,7 @@ public class ReefPirates extends mage.sets.homelands.ReefPirates1 {
 
     public ReefPirates(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Regeneration.java b/Mage.Sets/src/mage/sets/fifthedition/Regeneration.java
index b720ab27f1..d0908a9615 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/fifthedition/RemoveSoul.java
index 5e7faa529d..bc48c4ae0d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ReverseDamage.java b/Mage.Sets/src/mage/sets/fifthedition/ReverseDamage.java
index 36edad85f0..8ee93e1fda 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 331;
+        this.cardNumber = "331";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Righteousness.java b/Mage.Sets/src/mage/sets/fifthedition/Righteousness.java
index b6c9bb9ab7..3ae9fbbda8 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 332;
+        this.cardNumber = "332";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/fifthedition/RodOfRuin.java
index 5711f55ab6..0690e3dc18 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 396;
+        this.cardNumber = "396";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/RuinsOfTrokair.java b/Mage.Sets/src/mage/sets/fifthedition/RuinsOfTrokair.java
index 6c8edd7d90..414f026997 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/RuinsOfTrokair.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/RuinsOfTrokair.java
@@ -37,7 +37,7 @@ public class RuinsOfTrokair extends mage.sets.fallenempires.RuinsOfTrokair {
 
     public RuinsOfTrokair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 438;
+        this.cardNumber = "438";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/fifthedition/SamiteHealer.java
index e7e7cfadcd..9dc93c03bf 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 334;
+        this.cardNumber = "334";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ScaledWurm.java b/Mage.Sets/src/mage/sets/fifthedition/ScaledWurm.java
index 83075bfa59..c3a79b155c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ScaledWurm.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ScaledWurm.java
@@ -37,7 +37,7 @@ public class ScaledWurm extends mage.sets.ninthedition.ScaledWurm {
 
     public ScaledWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/fifthedition/ScatheZombies.java
index 251545a090..646db9bc6f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SeaSerpent.java b/Mage.Sets/src/mage/sets/fifthedition/SeaSerpent.java
index f7fcd0b23a..e972fd72e0 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SeaSerpent.java
@@ -38,7 +38,7 @@ public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
 
     public SeaSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SeaSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/SeaSpirit.java
index 57d996beeb..1acfc36515 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SeaSpirit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SeaSpirit.java
@@ -37,7 +37,7 @@ public class SeaSpirit extends mage.sets.masterseditionii.SeaSpirit {
 
     public SeaSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SeaSprite.java b/Mage.Sets/src/mage/sets/fifthedition/SeaSprite.java
index 2798e0d189..c37ccc12b7 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SeaSprite.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SeaSprite.java
@@ -37,7 +37,7 @@ public class SeaSprite extends mage.sets.homelands.SeaSprite {
 
     public SeaSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Seasinger.java b/Mage.Sets/src/mage/sets/fifthedition/Seasinger.java
index 445865bdff..335f226a82 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Seasinger.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Seasinger.java
@@ -37,7 +37,7 @@ public class Seasinger extends mage.sets.fallenempires.Seasinger {
 
     public Seasinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SengirAutocrat.java b/Mage.Sets/src/mage/sets/fifthedition/SengirAutocrat.java
index faab190ab7..bd3be22b0f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SengirAutocrat.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SengirAutocrat.java
@@ -38,7 +38,7 @@ public class SengirAutocrat extends mage.sets.homelands.SengirAutocrat {
 
     public SengirAutocrat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Shapeshifter.java b/Mage.Sets/src/mage/sets/fifthedition/Shapeshifter.java
index b66e6e764d..571098ff03 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Shapeshifter.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Shapeshifter.java
@@ -38,7 +38,7 @@ public class Shapeshifter extends mage.sets.antiquities.Shapeshifter {
 
     public Shapeshifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 398;
+        this.cardNumber = "398";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Shatter.java b/Mage.Sets/src/mage/sets/fifthedition/Shatter.java
index 1c8aea853a..b3c71d0a69 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ShieldWall.java b/Mage.Sets/src/mage/sets/fifthedition/ShieldWall.java
index ece5522be5..bdb9ab156e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ShieldWall.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ShieldWall.java
@@ -39,7 +39,7 @@ public class ShieldWall extends mage.sets.legends.ShieldWall {
 
     public ShieldWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 339;
+        this.cardNumber = "339";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ShivanDragon.java b/Mage.Sets/src/mage/sets/fifthedition/ShivanDragon.java
index fb661ff8d6..3e50cb896b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SibilantSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/SibilantSpirit.java
index a804d9df45..f105090d2b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SibilantSpirit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SibilantSpirit.java
@@ -37,7 +37,7 @@ public class SibilantSpirit extends mage.sets.iceage.SibilantSpirit {
 
     public SibilantSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SkullCatapult.java b/Mage.Sets/src/mage/sets/fifthedition/SkullCatapult.java
index ce76c9f99e..e622c265b1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SkullCatapult.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SkullCatapult.java
@@ -37,7 +37,7 @@ public class SkullCatapult extends mage.sets.iceage.SkullCatapult {
 
     public SkullCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 399;
+        this.cardNumber = "399";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Smoke.java b/Mage.Sets/src/mage/sets/fifthedition/Smoke.java
index 71a9e02b94..74b1f6d3bd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Smoke.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Smoke.java
@@ -38,7 +38,7 @@ public class Smoke extends mage.sets.limitedalpha.Smoke {
 
     public Smoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SorceressQueen.java b/Mage.Sets/src/mage/sets/fifthedition/SorceressQueen.java
index daebdb4c04..cb54295b42 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SorceressQueen.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SorceressQueen.java
@@ -37,7 +37,7 @@ public class SorceressQueen extends mage.sets.revisededition.SorceressQueen {
 
     public SorceressQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SoulNet.java b/Mage.Sets/src/mage/sets/fifthedition/SoulNet.java
index 884cae7304..d48d8adb8c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 400;
+        this.cardNumber = "400";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SpellBlast.java b/Mage.Sets/src/mage/sets/fifthedition/SpellBlast.java
index 5ba5cff514..8dba0b3dbc 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/fifthedition/SpiritLink.java
index f03120df47..4f9eb5c016 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 340;
+        this.cardNumber = "340";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Stampede.java b/Mage.Sets/src/mage/sets/fifthedition/Stampede.java
index 90464fd4ef..8b6755745a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Stampede.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Stampede.java
@@ -37,7 +37,7 @@ public class Stampede extends mage.sets.iceage.Stampede {
 
     public Stampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/StealArtifact.java b/Mage.Sets/src/mage/sets/fifthedition/StealArtifact.java
index 4ab0485d63..f31b0e523f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/StoneGiant.java b/Mage.Sets/src/mage/sets/fifthedition/StoneGiant.java
index 3132066b93..50f4c3187e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/StoneRain.java b/Mage.Sets/src/mage/sets/fifthedition/StoneRain.java
index df8f738a14..80d3f2c97d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/StoneSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/StoneSpirit.java
index 340714ca5d..496ffec904 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/StoneSpirit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/StoneSpirit.java
@@ -37,7 +37,7 @@ public class StoneSpirit extends mage.sets.iceage.StoneSpirit {
 
     public StoneSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/fifthedition/StreamOfLife.java
index a516024f2a..ed967f08a2 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/StromgaldCabal.java b/Mage.Sets/src/mage/sets/fifthedition/StromgaldCabal.java
index 624b2ca170..607e2d237c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/StromgaldCabal.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/StromgaldCabal.java
@@ -37,7 +37,7 @@ public class StromgaldCabal extends mage.sets.iceage.StromgaldCabal {
 
     public StromgaldCabal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SulfurousSprings.java b/Mage.Sets/src/mage/sets/fifthedition/SulfurousSprings.java
index e5e35ed1ab..de9a932efc 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SulfurousSprings.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SulfurousSprings.java
@@ -37,7 +37,7 @@ public class SulfurousSprings extends mage.sets.tenthedition.SulfurousSprings {
 
     public SulfurousSprings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 440;
+        this.cardNumber = "440";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SvyeluniteTemple.java b/Mage.Sets/src/mage/sets/fifthedition/SvyeluniteTemple.java
index 644e151c91..70ee7ccd4a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SvyeluniteTemple.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SvyeluniteTemple.java
@@ -37,7 +37,7 @@ public class SvyeluniteTemple extends mage.sets.fallenempires.SvyeluniteTemple {
 
     public SvyeluniteTemple(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 441;
+        this.cardNumber = "441";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Tarpan.java b/Mage.Sets/src/mage/sets/fifthedition/Tarpan.java
index e938c786c9..ff3ed73685 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Tarpan.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Tarpan.java
@@ -38,7 +38,7 @@ public class Tarpan extends mage.sets.iceage.Tarpan {
 
     public Tarpan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Terror.java b/Mage.Sets/src/mage/sets/fifthedition/Terror.java
index 18496b15dd..d85f345d3b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Terror.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/TheHive.java b/Mage.Sets/src/mage/sets/fifthedition/TheHive.java
index 6cc354f8f9..a23afb710c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/TheHive.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 402;
+        this.cardNumber = "402";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/fifthedition/ThicketBasilisk.java
index 9240ba5113..078ef559cd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/fifthedition/ThroneOfBone.java
index b97aa5d11c..a6efa4478c 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 403;
+        this.cardNumber = "403";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/TimeBomb.java b/Mage.Sets/src/mage/sets/fifthedition/TimeBomb.java
index 02b17e3aa8..1af5aa6603 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/TimeBomb.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/TimeBomb.java
@@ -37,7 +37,7 @@ public class TimeBomb extends mage.sets.masterseditionii.TimeBomb {
 
     public TimeBomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 404;
+        this.cardNumber = "404";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/TitaniasSong.java b/Mage.Sets/src/mage/sets/fifthedition/TitaniasSong.java
index 80b6cc45f0..b8b5319384 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/TitaniasSong.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/TitaniasSong.java
@@ -37,7 +37,7 @@ public class TitaniasSong extends mage.sets.fourthedition.TitaniasSong {
 
     public TitaniasSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Torture.java b/Mage.Sets/src/mage/sets/fifthedition/Torture.java
index 660dc02b7f..0928e53459 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Torture.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Torture.java
@@ -38,7 +38,7 @@ public class Torture extends mage.sets.homelands.Torture1 {
 
     public Torture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/TouchOfDeath.java b/Mage.Sets/src/mage/sets/fifthedition/TouchOfDeath.java
index 7b1768d4d9..72385bcdfd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/TouchOfDeath.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/TouchOfDeath.java
@@ -37,7 +37,7 @@ public class TouchOfDeath extends mage.sets.iceage.TouchOfDeath {
 
     public TouchOfDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Tranquility.java b/Mage.Sets/src/mage/sets/fifthedition/Tranquility.java
index 7d0ec438dc..ba076d08a1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Tsunami.java b/Mage.Sets/src/mage/sets/fifthedition/Tsunami.java
index 8e1ca9509b..b94db750ef 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Tsunami.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Tsunami.java
@@ -37,7 +37,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
 
     public Tsunami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/TundraWolves.java b/Mage.Sets/src/mage/sets/fifthedition/TundraWolves.java
index 554074f934..a952f6fa1f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/TundraWolves.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/TundraWolves.java
@@ -37,7 +37,7 @@ public class TundraWolves extends mage.sets.tenthedition.TundraWolves {
 
     public TundraWolves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 342;
+        this.cardNumber = "342";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Twiddle.java b/Mage.Sets/src/mage/sets/fifthedition/Twiddle.java
index ba8c6e7ff0..b8305b96cd 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Twiddle.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Twiddle.java
@@ -37,7 +37,7 @@ public class Twiddle extends mage.sets.unlimitededition.Twiddle {
 
     public Twiddle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/UndergroundRiver.java b/Mage.Sets/src/mage/sets/fifthedition/UndergroundRiver.java
index 7ec5532fb8..67a8723fcb 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/UndergroundRiver.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/UndergroundRiver.java
@@ -37,7 +37,7 @@ public class UndergroundRiver extends mage.sets.tenthedition.UndergroundRiver {
 
     public UndergroundRiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 446;
+        this.cardNumber = "446";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/UnholyStrength.java b/Mage.Sets/src/mage/sets/fifthedition/UnholyStrength.java
index d8a1d8f6c2..674f4a2dd6 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/UnstableMutation.java b/Mage.Sets/src/mage/sets/fifthedition/UnstableMutation.java
index 4569f9286a..fcdbc83aaa 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/UnstableMutation.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/UnstableMutation.java
@@ -38,7 +38,7 @@ public class UnstableMutation extends mage.sets.arabiannights.UnstableMutation {
 
     public UnstableMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Unsummon.java b/Mage.Sets/src/mage/sets/fifthedition/Unsummon.java
index 24fbefb87a..d36a68cd4b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/UntamedWilds.java b/Mage.Sets/src/mage/sets/fifthedition/UntamedWilds.java
index b47aba2618..06c03996de 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Updraft.java b/Mage.Sets/src/mage/sets/fifthedition/Updraft.java
index 7b8982eed8..2afd18a967 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Updraft.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Updraft.java
@@ -38,7 +38,7 @@ public class Updraft extends mage.sets.iceage.Updraft {
 
     public Updraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/UrzasBauble.java b/Mage.Sets/src/mage/sets/fifthedition/UrzasBauble.java
index 6af70e3ceb..eeda8ed058 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/UrzasBauble.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/UrzasBauble.java
@@ -37,7 +37,7 @@ public class UrzasBauble extends mage.sets.mastersedition.UrzasBauble {
 
     public UrzasBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 406;
+        this.cardNumber = "406";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Venom.java b/Mage.Sets/src/mage/sets/fifthedition/Venom.java
index 6ff2a09c22..ed7adb9f71 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Venom.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Venom.java
@@ -37,7 +37,7 @@ public class Venom extends mage.sets.thedark.Venom {
 
     public Venom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/fifthedition/VerduranEnchantress.java
index c4454ed7a2..1f618a8a33 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfAir.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfAir.java
index ab6d91964b..1ab036b870 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfBone.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfBone.java
index e1de2fa633..03900f869b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfBrambles.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfBrambles.java
index f2581f2a5e..41b84ba5a9 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WallOfBrambles.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfBrambles.java
@@ -37,7 +37,7 @@ public class WallOfBrambles extends mage.sets.limitedalpha.WallOfBrambles {
 
     public WallOfBrambles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfFire.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfFire.java
index 1b28fff3b4..5311230364 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfSwords.java
index ecf0f60704..d926d7e62e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 343;
+        this.cardNumber = "343";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Wanderlust.java b/Mage.Sets/src/mage/sets/fifthedition/Wanderlust.java
index a01d984a7c..2aa990c028 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Wanderlust.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Wanderlust.java
@@ -37,7 +37,7 @@ public class Wanderlust extends mage.sets.unlimitededition.Wanderlust {
 
     public Wanderlust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Weakness.java b/Mage.Sets/src/mage/sets/fifthedition/Weakness.java
index d2bd2c6f5f..bcadc0be92 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Weakness.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java b/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java
index 599e635811..22b2bf0433 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java
@@ -38,7 +38,7 @@ public class WhirlingDervish extends mage.sets.timeshifted.WhirlingDervish {
 
     public WhirlingDervish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WhiteKnight.java b/Mage.Sets/src/mage/sets/fifthedition/WhiteKnight.java
index 48b67b9ed2..26b15b645e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 344;
+        this.cardNumber = "344";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WildGrowth.java b/Mage.Sets/src/mage/sets/fifthedition/WildGrowth.java
index 22e197e43b..23da77ad5b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WindSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/WindSpirit.java
index 0704726703..f4d0f863c5 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WindSpirit.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WindSpirit.java
@@ -37,7 +37,7 @@ public class WindSpirit extends mage.sets.iceage.WindSpirit {
 
     public WindSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WinterOrb.java b/Mage.Sets/src/mage/sets/fifthedition/WinterOrb.java
index d28a7e18c5..074f5725ae 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WinterOrb.java
@@ -37,7 +37,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 408;
+        this.cardNumber = "408";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WolverinePack.java b/Mage.Sets/src/mage/sets/fifthedition/WolverinePack.java
index f50f7c3bec..23b0bd27ab 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WolverinePack.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WolverinePack.java
@@ -38,7 +38,7 @@ public class WolverinePack extends mage.sets.legends.WolverinePack {
 
     public WolverinePack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WoodenSphere.java b/Mage.Sets/src/mage/sets/fifthedition/WoodenSphere.java
index e3385856b0..b25432b22e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 409;
+        this.cardNumber = "409";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WordOfBlasting.java b/Mage.Sets/src/mage/sets/fifthedition/WordOfBlasting.java
index c8355cfef0..af55445740 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WordOfBlasting.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WordOfBlasting.java
@@ -37,7 +37,7 @@ public class WordOfBlasting extends mage.sets.iceage.WordOfBlasting {
 
     public WordOfBlasting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/fifthedition/WrathOfGod.java
index 7fe2968fed..3691f3935e 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 345;
+        this.cardNumber = "345";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/XenicPoltergeist.java b/Mage.Sets/src/mage/sets/fifthedition/XenicPoltergeist.java
index e74d893480..fd75f1173a 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/XenicPoltergeist.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/XenicPoltergeist.java
@@ -38,7 +38,7 @@ public class XenicPoltergeist extends mage.sets.masterseditioniv.XenicPoltergeis
 
     public XenicPoltergeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "5ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ZombieMaster.java b/Mage.Sets/src/mage/sets/fifthedition/ZombieMaster.java
index 8a2bbb73f4..6a5163e466 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/ZursWeirding.java b/Mage.Sets/src/mage/sets/fifthedition/ZursWeirding.java
index 6446a61760..28aba9d6f1 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/ZursWeirding.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/ZursWeirding.java
@@ -37,7 +37,7 @@ public class ZursWeirding extends mage.sets.iceage.ZursWeirding {
 
     public ZursWeirding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "5ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Abomination.java b/Mage.Sets/src/mage/sets/fourthedition/Abomination.java
index 7ad385c93a..1d02f39f6f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Abomination.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Abomination.java
@@ -37,7 +37,7 @@ public class Abomination extends mage.sets.legends.Abomination {
 
     public Abomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AirElemental.java b/Mage.Sets/src/mage/sets/fourthedition/AirElemental.java
index ff30a0ed05..a03733d8bb 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AladdinsLamp.java b/Mage.Sets/src/mage/sets/fourthedition/AladdinsLamp.java
index 5a5df2f0c5..5c2dbb1f3c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AladdinsLamp.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AladdinsLamp.java
@@ -37,7 +37,7 @@ public class AladdinsLamp extends mage.sets.revisededition.AladdinsLamp {
 
     public AladdinsLamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/fourthedition/AladdinsRing.java
index 2cb7617aa7..244dd92ed7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AliBaba.java b/Mage.Sets/src/mage/sets/fourthedition/AliBaba.java
index 17ad11ae82..981e3f2f1b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AliBaba.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AliBaba.java
@@ -37,7 +37,7 @@ public class AliBaba extends mage.sets.arabiannights.AliBaba {
 
     public AliBaba(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AmrouKithkin.java b/Mage.Sets/src/mage/sets/fourthedition/AmrouKithkin.java
index f7ce1b9f3c..b5b47bc6c3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AmrouKithkin.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AmrouKithkin.java
@@ -37,7 +37,7 @@ public class AmrouKithkin extends mage.sets.legends.AmrouKithkin {
 
     public AmrouKithkin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AmuletOfKroog.java b/Mage.Sets/src/mage/sets/fourthedition/AmuletOfKroog.java
index 528e56727d..00a540a9d1 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AmuletOfKroog.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AmuletOfKroog.java
@@ -37,7 +37,7 @@ public class AmuletOfKroog extends mage.sets.fifthedition.AmuletOfKroog {
 
     public AmuletOfKroog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AnimateDead.java b/Mage.Sets/src/mage/sets/fourthedition/AnimateDead.java
index 56d3e72ad0..1efb849a68 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AnimateWall.java b/Mage.Sets/src/mage/sets/fourthedition/AnimateWall.java
index 1b41444fd0..4c3f31cd47 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AnimateWall.java
@@ -37,7 +37,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/fourthedition/AnkhOfMishra.java
index a9b0b3f929..20a35f9040 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AnkhOfMishra.java
@@ -38,7 +38,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java b/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java
index 34537065ea..4710c72246 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java
@@ -37,7 +37,7 @@ public class ApprenticeWizard extends mage.sets.mastersedition.ApprenticeWizard
 
     public ApprenticeWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Armageddon.java b/Mage.Sets/src/mage/sets/fourthedition/Armageddon.java
index a45fe7efad..a5f8c2d96b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ArmageddonClock.java b/Mage.Sets/src/mage/sets/fourthedition/ArmageddonClock.java
index 7a2753e3a0..3c0d88a128 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ArmageddonClock.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ArmageddonClock.java
@@ -37,7 +37,7 @@ public class ArmageddonClock extends mage.sets.masterseditioniv.ArmageddonClock
 
     public ArmageddonClock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AshesToAshes.java b/Mage.Sets/src/mage/sets/fourthedition/AshesToAshes.java
index f2f1076278..6fe153d8f3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AshesToAshes.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AshesToAshes.java
@@ -37,7 +37,7 @@ public class AshesToAshes extends mage.sets.fifthedition.AshesToAshes {
 
     public AshesToAshes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AshnodsBattleGear.java b/Mage.Sets/src/mage/sets/fourthedition/AshnodsBattleGear.java
index 81087867db..2c00e60ca5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AshnodsBattleGear.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AshnodsBattleGear.java
@@ -37,7 +37,7 @@ public class AshnodsBattleGear extends mage.sets.antiquities.AshnodsBattleGear {
 
     public AshnodsBattleGear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/AspectOfWolf.java b/Mage.Sets/src/mage/sets/fourthedition/AspectOfWolf.java
index 22effef612..4448f3a3fe 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/AspectOfWolf.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/AspectOfWolf.java
@@ -38,7 +38,7 @@ public class AspectOfWolf extends mage.sets.limitedalpha.AspectOfWolf {
 
     public AspectOfWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BadMoon.java b/Mage.Sets/src/mage/sets/fourthedition/BadMoon.java
index 7f2f7e7822..ae9558c4a2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Balance.java b/Mage.Sets/src/mage/sets/fourthedition/Balance.java
index 4030b1e8a2..66e6a4d5e2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Balance.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Balance.java
@@ -37,7 +37,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BallLightning.java b/Mage.Sets/src/mage/sets/fourthedition/BallLightning.java
index 5519e2d830..ac0f433323 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BallLightning.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BallLightning.java
@@ -37,7 +37,7 @@ public class BallLightning extends mage.sets.magic2010.BallLightning {
 
     public BallLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BirdMaiden.java b/Mage.Sets/src/mage/sets/fourthedition/BirdMaiden.java
index 237a7199cf..410d5b54c4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BirdMaiden.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BirdMaiden.java
@@ -37,7 +37,7 @@ public class BirdMaiden extends mage.sets.fifthedition.BirdMaiden {
 
     public BirdMaiden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/fourthedition/BirdsOfParadise.java
index 493d90c728..19757325f2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BlackKnight.java b/Mage.Sets/src/mage/sets/fourthedition/BlackKnight.java
index fb6a444a9d..73fe8176b5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BlackVise.java b/Mage.Sets/src/mage/sets/fourthedition/BlackVise.java
index b8135bdb30..990ee570c4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BlackVise.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BlackVise.java
@@ -37,7 +37,7 @@ public class BlackVise extends mage.sets.limitedalpha.BlackVise {
 
     public BlackVise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BlackWard.java b/Mage.Sets/src/mage/sets/fourthedition/BlackWard.java
index bc7c6a22ed..63769512d4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BlackWard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BlackWard.java
@@ -37,7 +37,7 @@ public class BlackWard extends mage.sets.revisededition.BlackWard {
 
     public BlackWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Blight.java b/Mage.Sets/src/mage/sets/fourthedition/Blight.java
index a70470f40f..46cedb6d32 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Blight.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Blight.java
@@ -37,7 +37,7 @@ public class Blight extends mage.sets.fifthedition.Blight {
 
     public Blight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/fourthedition/BlueElementalBlast.java
index 5ca6b56269..d56ce764bb 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BlueElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BlueElementalBlast.java
@@ -37,7 +37,7 @@ public class BlueElementalBlast extends mage.sets.limitedalpha.BlueElementalBlas
 
     public BlueElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BlueWard.java b/Mage.Sets/src/mage/sets/fourthedition/BlueWard.java
index 0189e0d7ff..959bc64afa 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BlueWard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BlueWard.java
@@ -37,7 +37,7 @@ public class BlueWard extends mage.sets.unlimitededition.BlueWard {
 
     public BlueWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BogImp.java b/Mage.Sets/src/mage/sets/fourthedition/BogImp.java
index 5000693871..c970071567 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BogImp.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BogWraith.java b/Mage.Sets/src/mage/sets/fourthedition/BogWraith.java
index cac843d31d..c923b8a977 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/BottleOfSuleiman.java b/Mage.Sets/src/mage/sets/fourthedition/BottleOfSuleiman.java
index 0b323014f4..3e2a9bfd4a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/BottleOfSuleiman.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/BottleOfSuleiman.java
@@ -37,7 +37,7 @@ public class BottleOfSuleiman extends mage.sets.fifthedition.BottleOfSuleiman {
 
     public BottleOfSuleiman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Burrowing.java b/Mage.Sets/src/mage/sets/fourthedition/Burrowing.java
index 4ed42743c2..75307d6511 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Burrowing.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Burrowing.java
@@ -38,7 +38,7 @@ public class Burrowing extends mage.sets.limitedalpha.Burrowing {
 
     public Burrowing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CarrionAnts.java b/Mage.Sets/src/mage/sets/fourthedition/CarrionAnts.java
index c5a487e99e..32e3d0b06a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CarrionAnts.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CarrionAnts.java
@@ -37,7 +37,7 @@ public class CarrionAnts extends mage.sets.fifthedition.CarrionAnts {
 
     public CarrionAnts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Castle.java b/Mage.Sets/src/mage/sets/fourthedition/Castle.java
index e06b1c69e0..fed7ebf424 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Castle.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CavePeople.java b/Mage.Sets/src/mage/sets/fourthedition/CavePeople.java
index 69bcfadd19..c86b989478 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CavePeople.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CavePeople.java
@@ -37,7 +37,7 @@ public class CavePeople extends mage.sets.thedark.CavePeople {
 
     public CavePeople(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CelestialPrism.java b/Mage.Sets/src/mage/sets/fourthedition/CelestialPrism.java
index b0725106b1..15fc43b96f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CelestialPrism.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CelestialPrism.java
@@ -37,7 +37,7 @@ public class CelestialPrism extends mage.sets.limitedalpha.CelestialPrism {
 
     public CelestialPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Channel.java b/Mage.Sets/src/mage/sets/fourthedition/Channel.java
index e2108ee566..47cf92c630 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Channel.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Channel.java
@@ -37,7 +37,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionArtifacts.java b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionArtifacts.java
index 7e630e27c1..74146a9835 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionArtifacts.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionArtifacts.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionArtifacts extends mage.sets.fifthdawn.CircleOfPro
     
     public CircleOfProtectionArtifacts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlack.java
index 60242e0872..1b29b77dd0 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlue.java
index a0164ecae0..43555b07ca 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionGreen.java
index aefbc7487e..1126a85c11 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionRed.java
index 42febcfa60..952c99fc98 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionWhite.java
index 874e492bed..8d186ead86 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ClayStatue.java b/Mage.Sets/src/mage/sets/fourthedition/ClayStatue.java
index 7924167129..ac3f633412 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ClayStatue.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ClayStatue.java
@@ -37,7 +37,7 @@ public class ClayStatue extends mage.sets.antiquities.ClayStatue {
 
     public ClayStatue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ClockworkBeast.java b/Mage.Sets/src/mage/sets/fourthedition/ClockworkBeast.java
index 20defabb86..a4ca9024e3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ClockworkBeast.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ClockworkBeast.java
@@ -37,7 +37,7 @@ public class ClockworkBeast extends mage.sets.limitedalpha.ClockworkBeast {
 
     public ClockworkBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Cockatrice.java b/Mage.Sets/src/mage/sets/fourthedition/Cockatrice.java
index 145b57c74c..9cb61779a5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Cockatrice.java
@@ -37,7 +37,7 @@ public class Cockatrice extends mage.sets.limitedalpha.Cockatrice {
 
     public Cockatrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ColossusOfSardia.java b/Mage.Sets/src/mage/sets/fourthedition/ColossusOfSardia.java
index 200068eb05..78412c31d7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ColossusOfSardia.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ColossusOfSardia.java
@@ -37,7 +37,7 @@ public class ColossusOfSardia extends mage.sets.fifthedition.ColossusOfSardia {
 
     public ColossusOfSardia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 326;
+        this.cardNumber = "326";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Conservator.java b/Mage.Sets/src/mage/sets/fourthedition/Conservator.java
index 9318729df3..eca16d537d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Conservator.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Conservator.java
@@ -38,7 +38,7 @@ public class Conservator extends mage.sets.limitedalpha.Conservator {
 
     public Conservator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 327;
+        this.cardNumber = "327";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ControlMagic.java b/Mage.Sets/src/mage/sets/fourthedition/ControlMagic.java
index d5853448ef..f7a8073dd5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Conversion.java b/Mage.Sets/src/mage/sets/fourthedition/Conversion.java
index 9644d35987..aca39796a1 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Conversion.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Conversion.java
@@ -37,7 +37,7 @@ public class Conversion extends mage.sets.limitedalpha.Conversion {
 
     public Conversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CoralHelm.java b/Mage.Sets/src/mage/sets/fourthedition/CoralHelm.java
index af73dce6c9..42f023c67a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CoralHelm.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CoralHelm.java
@@ -38,7 +38,7 @@ public class CoralHelm extends mage.sets.masterseditioniv.CoralHelm {
 
     public CoralHelm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 328;
+        this.cardNumber = "328";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CosmicHorror.java b/Mage.Sets/src/mage/sets/fourthedition/CosmicHorror.java
index acc8a0cfe3..d6c817b0fa 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CosmicHorror.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CosmicHorror.java
@@ -37,7 +37,7 @@ public class CosmicHorror extends mage.sets.legends.CosmicHorror {
 
     public CosmicHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java b/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java
index 8aeb432a48..c058089273 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CrawWurm.java b/Mage.Sets/src/mage/sets/fourthedition/CrawWurm.java
index 42053205da..97b759956b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CrimsonManticore.java b/Mage.Sets/src/mage/sets/fourthedition/CrimsonManticore.java
index c27686fa0c..adcbc1ec02 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CrimsonManticore.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CrimsonManticore.java
@@ -37,7 +37,7 @@ public class CrimsonManticore extends mage.sets.legends.CrimsonManticore {
 
     public CrimsonManticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Crumble.java b/Mage.Sets/src/mage/sets/fourthedition/Crumble.java
index 18d5931db0..d6a85f8129 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Crumble.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Crumble.java
@@ -38,7 +38,7 @@ public class Crumble extends mage.sets.masterseditioniv.Crumble {
 
     public Crumble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Crusade.java b/Mage.Sets/src/mage/sets/fourthedition/Crusade.java
index cfced2308a..0253c2f339 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Crusade.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CrystalRod.java b/Mage.Sets/src/mage/sets/fourthedition/CrystalRod.java
index 2a98c7ef5d..b46ad8e112 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 329;
+        this.cardNumber = "329";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/CursedRack.java b/Mage.Sets/src/mage/sets/fourthedition/CursedRack.java
index a43a9c5cb3..e663af78da 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/CursedRack.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/CursedRack.java
@@ -37,7 +37,7 @@ public class CursedRack extends mage.sets.antiquities.CursedRack {
 
     public CursedRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 330;
+        this.cardNumber = "330";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java
index eccc1178f9..87f5f9703e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java
@@ -38,7 +38,7 @@ public class DancingScimitar extends mage.sets.ninthedition.DancingScimitar {
 
     public DancingScimitar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 331;
+        this.cardNumber = "331";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DarkRitual.java b/Mage.Sets/src/mage/sets/fourthedition/DarkRitual.java
index 8bef3f56a0..311fe6d08f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DeathWard.java b/Mage.Sets/src/mage/sets/fourthedition/DeathWard.java
index 7497baa60c..04d0e10028 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DeathWard.java
@@ -38,7 +38,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Deathgrip.java b/Mage.Sets/src/mage/sets/fourthedition/Deathgrip.java
index 8890939b42..61385cdc1a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Deathgrip.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Deathgrip.java
@@ -37,7 +37,7 @@ public class Deathgrip extends mage.sets.limitedbeta.Deathgrip {
 
     public Deathgrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Deathlace.java b/Mage.Sets/src/mage/sets/fourthedition/Deathlace.java
index a6d66e70d7..047d4a73f3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Deathlace.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Deathlace.java
@@ -37,7 +37,7 @@ public class Deathlace extends mage.sets.limitedbeta.Deathlace {
 
     public Deathlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DesertTwister.java b/Mage.Sets/src/mage/sets/fourthedition/DesertTwister.java
index ddb64227bb..922b37a875 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Detonate.java b/Mage.Sets/src/mage/sets/fourthedition/Detonate.java
index 51981a7b4b..748d492711 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Detonate.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Detonate.java
@@ -37,7 +37,7 @@ public class Detonate extends mage.sets.fifthedition.Detonate {
 
     public Detonate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DingusEgg.java b/Mage.Sets/src/mage/sets/fourthedition/DingusEgg.java
index 92eecc05fb..3b2f8b4fea 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 333;
+        this.cardNumber = "333";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Disenchant.java b/Mage.Sets/src/mage/sets/fourthedition/Disenchant.java
index bb8e798097..55f54ee3ae 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Disintegrate.java b/Mage.Sets/src/mage/sets/fourthedition/Disintegrate.java
index 948a731aa3..e12941ad62 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Disintegrate.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Disintegrate.java
@@ -37,7 +37,7 @@ public class Disintegrate extends mage.sets.limitedalpha.Disintegrate {
 
     public Disintegrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/fourthedition/DisruptingScepter.java
index a767fdea29..2ef9312213 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 334;
+        this.cardNumber = "334";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/fourthedition/DivineTransformation.java
index 703547d191..a3d29aac52 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DivineTransformation.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DivineTransformation.java
@@ -37,7 +37,7 @@ public class DivineTransformation extends mage.sets.fifthedition.DivineTransform
 
     public DivineTransformation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DragonEngine.java b/Mage.Sets/src/mage/sets/fourthedition/DragonEngine.java
index eaec32d61b..635c708eba 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DragonEngine.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DragonEngine.java
@@ -37,7 +37,7 @@ public class DragonEngine extends mage.sets.fifthedition.DragonEngine {
 
     public DragonEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 335;
+        this.cardNumber = "335";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DragonWhelp.java b/Mage.Sets/src/mage/sets/fourthedition/DragonWhelp.java
index 24c04d7e11..112a8eb6f6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DrainLife.java b/Mage.Sets/src/mage/sets/fourthedition/DrainLife.java
index aa044ebcc0..dd2aaae2dc 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/fourthedition/DrudgeSkeletons.java
index 29559655f6..f08cc0eb23 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DurkwoodBoars.java b/Mage.Sets/src/mage/sets/fourthedition/DurkwoodBoars.java
index c9def3beda..270a18e633 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DurkwoodBoars.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DurkwoodBoars.java
@@ -37,7 +37,7 @@ public class DurkwoodBoars extends mage.sets.fifthedition.DurkwoodBoars {
 
     public DurkwoodBoars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/DwarvenWarriors.java b/Mage.Sets/src/mage/sets/fourthedition/DwarvenWarriors.java
index 8b33028198..77306aedda 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/DwarvenWarriors.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/DwarvenWarriors.java
@@ -37,7 +37,7 @@ public class DwarvenWarriors extends mage.sets.revisededition.DwarvenWarriors {
 
     public DwarvenWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EarthElemental.java b/Mage.Sets/src/mage/sets/fourthedition/EarthElemental.java
index c1f546795b..6e8715c62b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EarthElemental.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EarthElemental.java
@@ -37,7 +37,7 @@ public class EarthElemental extends mage.sets.tenthedition.EarthElemental {
 
     public EarthElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Earthquake.java b/Mage.Sets/src/mage/sets/fourthedition/Earthquake.java
index f4c1b14178..88d6f90d2f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ElHajjaj.java b/Mage.Sets/src/mage/sets/fourthedition/ElHajjaj.java
index a8a7adba10..30933484c6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ElHajjaj.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ElHajjaj.java
@@ -37,7 +37,7 @@ public class ElHajjaj extends mage.sets.arabiannights.ElHajjaj {
 
     public ElHajjaj(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ElvenRiders.java b/Mage.Sets/src/mage/sets/fourthedition/ElvenRiders.java
index 35d46df453..28468aca27 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ElvenRiders.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ElvenRiders.java
@@ -37,7 +37,7 @@ public class ElvenRiders extends mage.sets.onslaught.ElvenRiders {
 
     public ElvenRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ElvishArchers.java b/Mage.Sets/src/mage/sets/fourthedition/ElvishArchers.java
index 6b31c27936..2f79855870 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EnergyFlux.java b/Mage.Sets/src/mage/sets/fourthedition/EnergyFlux.java
index df14aa2663..7b5ee7cff7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EnergyFlux.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EnergyFlux.java
@@ -37,7 +37,7 @@ public class EnergyFlux extends mage.sets.antiquities.EnergyFlux {
 
     public EnergyFlux(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EnergyTap.java b/Mage.Sets/src/mage/sets/fourthedition/EnergyTap.java
index 600d46972b..1dd8a809ef 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EnergyTap.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EnergyTap.java
@@ -37,7 +37,7 @@ public class EnergyTap extends mage.sets.legends.EnergyTap {
 
     public EnergyTap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EternalWarrior.java b/Mage.Sets/src/mage/sets/fourthedition/EternalWarrior.java
index 70b5a4c8a9..9c5f50dbb6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EternalWarrior.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EternalWarrior.java
@@ -37,7 +37,7 @@ public class EternalWarrior extends mage.sets.fifthedition.EternalWarrior {
 
     public EternalWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java b/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java
index 93ab996f5f..ce613ec55c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java
@@ -38,7 +38,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EyeForAnEye.java b/Mage.Sets/src/mage/sets/fourthedition/EyeForAnEye.java
index befdbe2b92..3cffada2a8 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EyeForAnEye.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EyeForAnEye.java
@@ -38,7 +38,7 @@ public class EyeForAnEye extends mage.sets.arabiannights.EyeForAnEye {
 
     public EyeForAnEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Fear.java b/Mage.Sets/src/mage/sets/fourthedition/Fear.java
index ca3474e1d1..ad0bded513 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Fear.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Feedback.java b/Mage.Sets/src/mage/sets/fourthedition/Feedback.java
index 468529f6bc..b0cb63e18d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Feedback.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Feedback.java
@@ -37,7 +37,7 @@ public class Feedback extends mage.sets.limitedalpha.Feedback {
 
     public Feedback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/FellwarStone.java b/Mage.Sets/src/mage/sets/fourthedition/FellwarStone.java
index 167b8ac265..70b9f9706a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/FellwarStone.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/FellwarStone.java
@@ -37,7 +37,7 @@ public class FellwarStone extends mage.sets.ninthedition.FellwarStone {
 
     public FellwarStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 337;
+        this.cardNumber = "337";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java b/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java
index 47a5b7f846..d3502a281c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Fireball.java b/Mage.Sets/src/mage/sets/fourthedition/Fireball.java
index 4310a7d901..2cbec31882 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Fireball.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Firebreathing.java b/Mage.Sets/src/mage/sets/fourthedition/Firebreathing.java
index 0cd437e10a..0754061d30 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Fissure.java b/Mage.Sets/src/mage/sets/fourthedition/Fissure.java
index bcd22f4feb..31f5802b3b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Fissure.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Fissure.java
@@ -37,7 +37,7 @@ public class Fissure extends mage.sets.thedark.Fissure {
 
     public Fissure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Flashfires.java b/Mage.Sets/src/mage/sets/fourthedition/Flashfires.java
index 019fd4909f..641843f7ce 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Flight.java b/Mage.Sets/src/mage/sets/fourthedition/Flight.java
index b2508c4480..fb517a8bbc 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Flight.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/fourthedition/FlyingCarpet.java
index 2da18fdf76..b8ecc1edce 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/FlyingCarpet.java
@@ -37,7 +37,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 338;
+        this.cardNumber = "338";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Fog.java b/Mage.Sets/src/mage/sets/fourthedition/Fog.java
index 21d0c98fab..55161dabe1 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Fog.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/FrozenShade.java b/Mage.Sets/src/mage/sets/fourthedition/FrozenShade.java
index f5af7bec0a..15f14bb9c0 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/FrozenShade.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/FrozenShade.java
@@ -38,7 +38,7 @@ public class FrozenShade extends mage.sets.limitedalpha.FrozenShade {
 
     public FrozenShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Fungusaur.java b/Mage.Sets/src/mage/sets/fourthedition/Fungusaur.java
index de47605306..49872c557c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Fungusaur.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Fungusaur.java
@@ -37,7 +37,7 @@ public class Fungusaur extends mage.sets.limitedalpha.Fungusaur {
 
     public Fungusaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GaseousForm.java b/Mage.Sets/src/mage/sets/fourthedition/GaseousForm.java
index dad275152d..cd159e137c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GaseousForm.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GaseousForm.java
@@ -37,7 +37,7 @@ public class GaseousForm extends mage.sets.tempest.GaseousForm {
 
     public GaseousForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GhostShip.java b/Mage.Sets/src/mage/sets/fourthedition/GhostShip.java
index beb2ef12a8..e39a4c3184 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GhostShip.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GhostShip.java
@@ -38,7 +38,7 @@ public class GhostShip extends mage.sets.timeshifted.GhostShip {
 
     public GhostShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/fourthedition/GiantGrowth.java
index 4391c530b8..3a8b874709 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/fourthedition/GiantSpider.java
index bb10272552..048e4f4ff1 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GiantStrength.java b/Mage.Sets/src/mage/sets/fourthedition/GiantStrength.java
index 2102e5e482..34e7637367 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GiantStrength.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GiantStrength.java
@@ -37,7 +37,7 @@ public class GiantStrength extends mage.sets.tempest.GiantStrength {
 
     public GiantStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/fourthedition/GlassesOfUrza.java
index 1a201dae02..d9cebaf513 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GlassesOfUrza.java
@@ -37,7 +37,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 339;
+        this.cardNumber = "339";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Gloom.java b/Mage.Sets/src/mage/sets/fourthedition/Gloom.java
index 9ee65a3cfd..fadc617a35 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Gloom.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Gloom.java
@@ -37,7 +37,7 @@ public class Gloom extends mage.sets.limitedalpha.Gloom {
 
     public Gloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java
index d7a66e130b..16c03a4dfc 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java
@@ -38,7 +38,7 @@ public class GoblinBalloonBrigade extends mage.sets.magic2011.GoblinBalloonBriga
 
     public GoblinBalloonBrigade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/fourthedition/GoblinKing.java
index e2d05ea156..6546f68a03 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GrapeshotCatapult.java b/Mage.Sets/src/mage/sets/fourthedition/GrapeshotCatapult.java
index 00755fd12c..5bc4179224 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GrapeshotCatapult.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GrapeshotCatapult.java
@@ -38,7 +38,7 @@ public class GrapeshotCatapult extends mage.sets.seventhedition.GrapeshotCatapul
 
     public GrapeshotCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 340;
+        this.cardNumber = "340";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Greed.java b/Mage.Sets/src/mage/sets/fourthedition/Greed.java
index 6257d15bbf..dffc583717 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Greed.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Greed.java
@@ -37,7 +37,7 @@ public class Greed extends mage.sets.commander2013.Greed {
 
     public Greed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GreenWard.java b/Mage.Sets/src/mage/sets/fourthedition/GreenWard.java
index c0e15ec5d2..e34885dc5a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GreenWard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GreenWard.java
@@ -37,7 +37,7 @@ public class GreenWard extends mage.sets.unlimitededition.GreenWard {
 
     public GreenWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/fourthedition/GrizzlyBears.java
index 0efb654f2a..866eeb053f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HealingSalve.java b/Mage.Sets/src/mage/sets/fourthedition/HealingSalve.java
index eb66cb7017..168a36f0c4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HillGiant.java b/Mage.Sets/src/mage/sets/fourthedition/HillGiant.java
index c566f57937..9fea24eb10 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HolyStrength.java b/Mage.Sets/src/mage/sets/fourthedition/HolyStrength.java
index d538092418..f88f0c7aa3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/fourthedition/HowlFromBeyond.java
index 22e971d3ec..ed40cffd67 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/fourthedition/HowlingMine.java
index 8450aaa98d..4b0250ad79 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 343;
+        this.cardNumber = "343";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HurkylsRecall.java b/Mage.Sets/src/mage/sets/fourthedition/HurkylsRecall.java
index 5053448138..55e0f7b421 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HurkylsRecall.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HurkylsRecall.java
@@ -37,7 +37,7 @@ public class HurkylsRecall extends mage.sets.fifthedition.HurkylsRecall {
 
     public HurkylsRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/fourthedition/HurloonMinotaur.java
index 811059a8cf..6ecaba227f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HurloonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HurloonMinotaur.java
@@ -37,7 +37,7 @@ public class HurloonMinotaur extends mage.sets.fifthedition.HurloonMinotaur {
 
     public HurloonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HurrJackal.java b/Mage.Sets/src/mage/sets/fourthedition/HurrJackal.java
index 536dff2763..c23c18e39b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HurrJackal.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HurrJackal.java
@@ -38,7 +38,7 @@ public class HurrJackal extends mage.sets.arabiannights.HurrJackal {
 
     public HurrJackal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Hurricane.java b/Mage.Sets/src/mage/sets/fourthedition/Hurricane.java
index b53ec18c13..e6247f421e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Hurricane.java
@@ -37,7 +37,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java
index cec379280d..21dabb6edf 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java
@@ -38,7 +38,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Inferno.java b/Mage.Sets/src/mage/sets/fourthedition/Inferno.java
index b855f4a502..0f72128dbe 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Inferno.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Inferno.java
@@ -37,7 +37,7 @@ public class Inferno extends mage.sets.thedark.Inferno {
 
     public Inferno(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/InstillEnergy.java b/Mage.Sets/src/mage/sets/fourthedition/InstillEnergy.java
index da00f2a861..f49525702f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/InstillEnergy.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/InstillEnergy.java
@@ -37,7 +37,7 @@ public class InstillEnergy extends mage.sets.fifthedition.InstillEnergy {
 
     public InstillEnergy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IronStar.java b/Mage.Sets/src/mage/sets/fourthedition/IronStar.java
index 9e1b6a6316..9f1d25b7a9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 344;
+        this.cardNumber = "344";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IronclawOrcs.java b/Mage.Sets/src/mage/sets/fourthedition/IronclawOrcs.java
index 9faf2b58ad..a58bf3a00b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/IronclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/IronclawOrcs.java
@@ -37,7 +37,7 @@ public class IronclawOrcs extends mage.sets.limitedalpha.IronclawOrcs {
 
     public IronclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/fourthedition/IronrootTreefolk.java
index b0d59d7336..33007f2bb7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/IronrootTreefolk.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/IronrootTreefolk.java
@@ -37,7 +37,7 @@ public class IronrootTreefolk extends mage.sets.fifthedition.IronrootTreefolk {
 
     public IronrootTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IslandSanctuary.java b/Mage.Sets/src/mage/sets/fourthedition/IslandSanctuary.java
index edd31c18c6..56d6adebe4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/IslandSanctuary.java
@@ -37,7 +37,7 @@ public class IslandSanctuary extends mage.sets.limitedalpha.IslandSanctuary {
 
     public IslandSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IvoryCup.java b/Mage.Sets/src/mage/sets/fourthedition/IvoryCup.java
index 12e57d2e1c..1da492870f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 345;
+        this.cardNumber = "345";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java b/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java
index 45d33f986a..347719a10e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java
@@ -39,7 +39,7 @@ public class IvoryTower extends mage.sets.antiquities.IvoryTower {
 
     public IvoryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 346;
+        this.cardNumber = "346";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/JadeMonolith.java b/Mage.Sets/src/mage/sets/fourthedition/JadeMonolith.java
index 766d765aa3..34590712f8 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 347;
+        this.cardNumber = "347";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/JandorsSaddlebags.java b/Mage.Sets/src/mage/sets/fourthedition/JandorsSaddlebags.java
index bebf6a6115..54daf84e4e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/JandorsSaddlebags.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/JandorsSaddlebags.java
@@ -37,7 +37,7 @@ public class JandorsSaddlebags extends mage.sets.seventhedition.JandorsSaddlebag
 
     public JandorsSaddlebags(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 348;
+        this.cardNumber = "348";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/fourthedition/JayemdaeTome.java
index 752de3804f..fe237c8abd 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 349;
+        this.cardNumber = "349";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Jump.java b/Mage.Sets/src/mage/sets/fourthedition/Jump.java
index d736dec941..6d085de582 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Jump.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Jump.java
@@ -37,7 +37,7 @@ public class Jump extends mage.sets.magic2010.Jump {
 
     public Jump(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Karma.java b/Mage.Sets/src/mage/sets/fourthedition/Karma.java
index 4a97469267..6d522c92ad 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Karma.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Karma.java
@@ -37,7 +37,7 @@ public class Karma extends mage.sets.fifthedition.Karma {
 
     public Karma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/KeldonWarlord.java b/Mage.Sets/src/mage/sets/fourthedition/KeldonWarlord.java
index 5848d4da25..faa1ed06b5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/KeldonWarlord.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/KeldonWarlord.java
@@ -37,7 +37,7 @@ public class KeldonWarlord extends mage.sets.unlimitededition.KeldonWarlord {
 
     public KeldonWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/KillerBees.java b/Mage.Sets/src/mage/sets/fourthedition/KillerBees.java
index ab9b265bd6..1376c24d2c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/KillerBees.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/KillerBees.java
@@ -37,7 +37,7 @@ public class KillerBees extends mage.sets.fifthedition.KillerBees {
 
     public KillerBees(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Kismet.java b/Mage.Sets/src/mage/sets/fourthedition/Kismet.java
index aebef4d6c6..67bea2ea0f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Kismet.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Kismet.java
@@ -37,7 +37,7 @@ public class Kismet extends mage.sets.fifthedition.Kismet {
 
     public Kismet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/KormusBell.java b/Mage.Sets/src/mage/sets/fourthedition/KormusBell.java
index 1f9f8a5a0b..7ba8617b82 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/KormusBell.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/KormusBell.java
@@ -38,7 +38,7 @@ public class KormusBell extends mage.sets.limitedalpha.KormusBell {
 
     public KormusBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 350;
+        this.cardNumber = "350";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LandTax.java b/Mage.Sets/src/mage/sets/fourthedition/LandTax.java
index 435b2de059..fd202cc576 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LandTax.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LandTax.java
@@ -38,7 +38,7 @@ public class LandTax extends mage.sets.legends.LandTax {
 
     public LandTax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LeyDruid.java b/Mage.Sets/src/mage/sets/fourthedition/LeyDruid.java
index 6fe3be83d7..c02e80f045 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LeyDruid.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LeyDruid.java
@@ -38,7 +38,7 @@ public class LeyDruid extends mage.sets.limitedalpha.LeyDruid {
 
     public LeyDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LibraryOfLeng.java b/Mage.Sets/src/mage/sets/fourthedition/LibraryOfLeng.java
index 75d9d60803..da518fcde6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LibraryOfLeng.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LibraryOfLeng.java
@@ -37,7 +37,7 @@ public class LibraryOfLeng extends mage.sets.limitedbeta.LibraryOfLeng {
 
     public LibraryOfLeng(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 351;
+        this.cardNumber = "351";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Lifeforce.java b/Mage.Sets/src/mage/sets/fourthedition/Lifeforce.java
index b784c3473e..6133af08d1 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Lifeforce.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Lifeforce.java
@@ -38,7 +38,7 @@ public class Lifeforce extends mage.sets.masterseditioniv.Lifeforce {
 
     public Lifeforce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Lifelace.java b/Mage.Sets/src/mage/sets/fourthedition/Lifelace.java
index 2b9c81b10e..4134d4cda6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Lifelace.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Lifelace.java
@@ -37,7 +37,7 @@ public class Lifelace extends mage.sets.limitedalpha.Lifelace {
 
     public Lifelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Lifetap.java b/Mage.Sets/src/mage/sets/fourthedition/Lifetap.java
index c0e5522047..1bc68298ae 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Lifetap.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Lifetap.java
@@ -37,7 +37,7 @@ public class Lifetap extends mage.sets.fifthedition.Lifetap {
 
     public Lifetap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LightningBolt.java b/Mage.Sets/src/mage/sets/fourthedition/LightningBolt.java
index 527bea0694..605d072967 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LivingArtifact.java b/Mage.Sets/src/mage/sets/fourthedition/LivingArtifact.java
index 250d27dd9e..19163ef572 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LivingArtifact.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LivingArtifact.java
@@ -37,7 +37,7 @@ public class LivingArtifact extends mage.sets.fifthedition.LivingArtifact {
 
     public LivingArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LivingLands.java b/Mage.Sets/src/mage/sets/fourthedition/LivingLands.java
index 60b528a702..38147f84cd 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/fourthedition/LlanowarElves.java
index 7ea61abb97..52efe1b737 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/fourthedition/LordOfAtlantis.java
index 1100dfbbb6..0783ed923e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LordOfThePit.java b/Mage.Sets/src/mage/sets/fourthedition/LordOfThePit.java
index 723359d9de..e9da4e742a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/LostSoul.java b/Mage.Sets/src/mage/sets/fourthedition/LostSoul.java
index a1fb3ac8ee..7dbaa6a84d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/LostSoul.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/LostSoul.java
@@ -37,7 +37,7 @@ public class LostSoul extends mage.sets.fifthedition.LostSoul {
 
     public LostSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Lure.java b/Mage.Sets/src/mage/sets/fourthedition/Lure.java
index d66a80996f..41147fea84 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Lure.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MagneticMountain.java b/Mage.Sets/src/mage/sets/fourthedition/MagneticMountain.java
index 7857c8c165..6666eb763c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MagneticMountain.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MagneticMountain.java
@@ -38,7 +38,7 @@ public class MagneticMountain extends mage.sets.arabiannights.MagneticMountain {
 
     public MagneticMountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/fourthedition/MahamotiDjinn.java
index 5ef78ceb21..719397a27f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ManaShort.java b/Mage.Sets/src/mage/sets/fourthedition/ManaShort.java
index 0c67d367e7..d254161bb2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ManaShort.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ManaShort.java
@@ -37,7 +37,7 @@ public class ManaShort extends mage.sets.limitedalpha.ManaShort {
 
     public ManaShort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ManaVault.java b/Mage.Sets/src/mage/sets/fourthedition/ManaVault.java
index 28c0fb66aa..cf8158e465 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 352;
+        this.cardNumber = "352";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Manabarbs.java b/Mage.Sets/src/mage/sets/fourthedition/Manabarbs.java
index 109078aaf7..2eefcb0811 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MarshGas.java b/Mage.Sets/src/mage/sets/fourthedition/MarshGas.java
index 02ec712a83..854cfa7b5f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MarshGas.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MarshGas.java
@@ -37,7 +37,7 @@ public class MarshGas extends mage.sets.thedark.MarshGas {
 
     public MarshGas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MarshViper.java b/Mage.Sets/src/mage/sets/fourthedition/MarshViper.java
index b10c128c03..5a024f1174 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MarshViper.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MarshViper.java
@@ -37,7 +37,7 @@ public class MarshViper extends mage.sets.thedark.MarshViper {
 
     public MarshViper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Meekstone.java b/Mage.Sets/src/mage/sets/fourthedition/Meekstone.java
index f806254425..f4a1cc3ab9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 353;
+        this.cardNumber = "353";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/fourthedition/MerfolkOfThePearlTrident.java
index b5df827314..02d58f54b7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Millstone.java b/Mage.Sets/src/mage/sets/fourthedition/Millstone.java
index 74bc482782..0af91a7fe9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 354;
+        this.cardNumber = "354";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MindTwist.java b/Mage.Sets/src/mage/sets/fourthedition/MindTwist.java
index 9ece3724c9..c55aab8f09 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MindTwist.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MindTwist.java
@@ -37,7 +37,7 @@ public class MindTwist extends mage.sets.limitedalpha.MindTwist {
 
     public MindTwist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MishrasFactory.java b/Mage.Sets/src/mage/sets/fourthedition/MishrasFactory.java
index a52d1ee1fd..fb8f27b9f2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MishrasFactory.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MishrasFactory.java
@@ -37,7 +37,7 @@ public class MishrasFactory extends mage.sets.elspethvstezzeret.MishrasFactory {
 
     public MishrasFactory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/fourthedition/MonssGoblinRaiders.java
index df44be74a5..e383b75e50 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MonssGoblinRaiders.java
@@ -37,7 +37,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/MurkDwellers.java b/Mage.Sets/src/mage/sets/fourthedition/MurkDwellers.java
index 882619abda..6fb986ea15 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/MurkDwellers.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/MurkDwellers.java
@@ -37,7 +37,7 @@ public class MurkDwellers extends mage.sets.fifthedition.MurkDwellers {
 
     public MurkDwellers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java b/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java
index d40c749ca7..46884ffb3c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java
@@ -37,7 +37,7 @@ public class NafsAsp extends mage.sets.arabiannights.NafsAsp1 {
 
     public NafsAsp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/NetherShadow.java b/Mage.Sets/src/mage/sets/fourthedition/NetherShadow.java
index a85c403ad1..9bb021068a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/NetherShadow.java
@@ -37,7 +37,7 @@ public class NetherShadow extends mage.sets.limitedalpha.NetherShadow {
 
     public NetherShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/fourthedition/NevinyrralsDisk.java
index dc80ada764..d22b3a671a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 356;
+        this.cardNumber = "356";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Nightmare.java b/Mage.Sets/src/mage/sets/fourthedition/Nightmare.java
index da1a77a5c1..fd88ffeae5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/NorthernPaladin.java b/Mage.Sets/src/mage/sets/fourthedition/NorthernPaladin.java
index dcb96bee1d..1451d9b2f0 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/NorthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/NorthernPaladin.java
@@ -37,7 +37,7 @@ public class NorthernPaladin extends mage.sets.limitedalpha.NorthernPaladin {
 
     public NorthernPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java
index 534244a2ee..c659140b9f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java
@@ -37,7 +37,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 357;
+        this.cardNumber = "357";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Onulet.java b/Mage.Sets/src/mage/sets/fourthedition/Onulet.java
index a7ad5753d5..d1336bbcad 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Onulet.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Onulet.java
@@ -38,7 +38,7 @@ public class Onulet extends mage.sets.mastersedition.Onulet {
 
     public Onulet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 358;
+        this.cardNumber = "358";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/fourthedition/OrcishArtillery.java
index 71e38dbec8..7f3afe1d3e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/fourthedition/OrcishOriflamme.java
index c0858152eb..462e0315c6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Ornithopter.java b/Mage.Sets/src/mage/sets/fourthedition/Ornithopter.java
index 62cde9c7d1..e23700da4c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Ornithopter.java
@@ -37,7 +37,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 359;
+        this.cardNumber = "359";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/OsaiVultures.java b/Mage.Sets/src/mage/sets/fourthedition/OsaiVultures.java
index 0c8d13b4a9..bc0679b18b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/OsaiVultures.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/OsaiVultures.java
@@ -38,7 +38,7 @@ public class OsaiVultures extends mage.sets.legends.OsaiVultures {
 
     public OsaiVultures(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Paralyze.java b/Mage.Sets/src/mage/sets/fourthedition/Paralyze.java
index 5b8d0eec7e..e61dfdef08 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PearledUnicorn.java b/Mage.Sets/src/mage/sets/fourthedition/PearledUnicorn.java
index 0255c825ca..728a39ccf9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PearledUnicorn.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PearledUnicorn.java
@@ -37,7 +37,7 @@ public class PearledUnicorn extends mage.sets.fifthedition.PearledUnicorn {
 
     public PearledUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Pestilence.java b/Mage.Sets/src/mage/sets/fourthedition/Pestilence.java
index 14af25a633..3d6fa5120d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/fourthedition/PhantasmalTerrain.java
index 5cafb8e98e..7874f01cc9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PhantomMonster.java b/Mage.Sets/src/mage/sets/fourthedition/PhantomMonster.java
index a9d1a8ecb8..d88ad2e6bd 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PhantomMonster.java
@@ -37,7 +37,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Piety.java b/Mage.Sets/src/mage/sets/fourthedition/Piety.java
index 5bfba697c8..5c44a88459 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Piety.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Piety.java
@@ -37,7 +37,7 @@ public class Piety extends mage.sets.arabiannights.Piety1 {
 
     public Piety(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PirateShip.java b/Mage.Sets/src/mage/sets/fourthedition/PirateShip.java
index 75e07527b4..d25fa606d3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PirateShip.java
@@ -38,7 +38,7 @@ public class PirateShip extends mage.sets.limitedalpha.PirateShip {
 
     public PirateShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PitScorpion.java b/Mage.Sets/src/mage/sets/fourthedition/PitScorpion.java
index 6933cc9818..8e0969851d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PitScorpion.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PitScorpion.java
@@ -37,7 +37,7 @@ public class PitScorpion extends mage.sets.fifthedition.PitScorpion {
 
     public PitScorpion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java b/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java
index 4750a58f5d..f79c3bf9df 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java
@@ -37,7 +37,7 @@ public class PlagueRats extends mage.sets.unlimitededition.PlagueRats {
 
     public PlagueRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PowerSink.java b/Mage.Sets/src/mage/sets/fourthedition/PowerSink.java
index 7976116125..4f74b8ecae 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PradeshGypsies.java b/Mage.Sets/src/mage/sets/fourthedition/PradeshGypsies.java
index 125f08877d..b5c2af9b91 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PradeshGypsies.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PradeshGypsies.java
@@ -37,7 +37,7 @@ public class PradeshGypsies extends mage.sets.fifthedition.PradeshGypsies {
 
     public PradeshGypsies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PrimalClay.java b/Mage.Sets/src/mage/sets/fourthedition/PrimalClay.java
index 0462b3188f..d9583971c4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PrimalClay.java
@@ -37,7 +37,7 @@ public class PrimalClay extends mage.sets.fifthedition.PrimalClay {
 
     public PrimalClay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 360;
+        this.cardNumber = "360";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java
index ffb7417052..c7568e51b8 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PsychicVenom.java b/Mage.Sets/src/mage/sets/fourthedition/PsychicVenom.java
index a21e5a15c7..90a9474da8 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/PsychicVenom.java
@@ -38,7 +38,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Purelace.java b/Mage.Sets/src/mage/sets/fourthedition/Purelace.java
index a25d9f92c2..1c96c63248 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Purelace.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Purelace.java
@@ -37,7 +37,7 @@ public class Purelace extends mage.sets.unlimitededition.Purelace {
 
     public Purelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Pyrotechnics.java b/Mage.Sets/src/mage/sets/fourthedition/Pyrotechnics.java
index a2c485e3a6..43b8177fd9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Pyrotechnics.java
@@ -37,7 +37,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RadjanSpirit.java b/Mage.Sets/src/mage/sets/fourthedition/RadjanSpirit.java
index eddac1a940..dbee71724a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RadjanSpirit.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RadjanSpirit.java
@@ -37,7 +37,7 @@ public class RadjanSpirit extends mage.sets.fifthedition.RadjanSpirit {
 
     public RadjanSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RagMan.java b/Mage.Sets/src/mage/sets/fourthedition/RagMan.java
index bacd8a46c5..d2d58a58ac 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RagMan.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RagMan.java
@@ -37,7 +37,7 @@ public class RagMan extends mage.sets.thedark.RagMan {
 
     public RagMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RaiseDead.java b/Mage.Sets/src/mage/sets/fourthedition/RaiseDead.java
index 97d68061ce..c37e064391 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RedElementalBlast.java b/Mage.Sets/src/mage/sets/fourthedition/RedElementalBlast.java
index ce906990fa..7db90ae079 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RedElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RedElementalBlast.java
@@ -37,7 +37,7 @@ public class RedElementalBlast extends mage.sets.limitedalpha.RedElementalBlast
 
     public RedElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RedWard.java b/Mage.Sets/src/mage/sets/fourthedition/RedWard.java
index 87290276aa..fd5c7c7e0b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RedWard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RedWard.java
@@ -37,7 +37,7 @@ public class RedWard extends mage.sets.revisededition.RedWard {
 
     public RedWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Regeneration.java b/Mage.Sets/src/mage/sets/fourthedition/Regeneration.java
index aa5a11226a..54302149c4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ReverseDamage.java b/Mage.Sets/src/mage/sets/fourthedition/ReverseDamage.java
index 0473aa0702..cc29b58350 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Righteousness.java b/Mage.Sets/src/mage/sets/fourthedition/Righteousness.java
index e607624822..836a5f25e5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/fourthedition/RodOfRuin.java
index be9e65b4ef..18a15971ca 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 362;
+        this.cardNumber = "362";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/RoyalAssassin.java b/Mage.Sets/src/mage/sets/fourthedition/RoyalAssassin.java
index db3a87b625..6380510f84 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/fourthedition/SamiteHealer.java
index 6629433673..60f8a50567 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SavannahLions.java b/Mage.Sets/src/mage/sets/fourthedition/SavannahLions.java
index a828804358..f441a05590 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SavannahLions.java
@@ -37,7 +37,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/fourthedition/ScatheZombies.java
index 68dac7e728..92f1f849f9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ScavengingGhoul.java b/Mage.Sets/src/mage/sets/fourthedition/ScavengingGhoul.java
index 97c27f312a..d627badf25 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ScavengingGhoul.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ScavengingGhoul.java
@@ -37,7 +37,7 @@ public class ScavengingGhoul extends mage.sets.limitedalpha.ScavengingGhoul {
 
     public ScavengingGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ScrybSprites.java b/Mage.Sets/src/mage/sets/fourthedition/ScrybSprites.java
index 396f2d0bdc..01573b1232 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SeaSerpent.java b/Mage.Sets/src/mage/sets/fourthedition/SeaSerpent.java
index 30cb4635cf..cdc8d389cd 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SeaSerpent.java
@@ -38,7 +38,7 @@ public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
 
     public SeaSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SegovianLeviathan.java b/Mage.Sets/src/mage/sets/fourthedition/SegovianLeviathan.java
index 0a87cc3ae5..476b17648e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SegovianLeviathan.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SegovianLeviathan.java
@@ -37,7 +37,7 @@ public class SegovianLeviathan extends mage.sets.fifthedition.SegovianLeviathan
 
     public SegovianLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java b/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java
index f2627ba97d..8c7529ff8a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java b/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java
index cf8b3d4008..37a37377d7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/fourthedition/ShanodinDryads.java
index b11bff4d54..452cde0eea 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Shapeshifter.java b/Mage.Sets/src/mage/sets/fourthedition/Shapeshifter.java
index 92cbc3e010..004b166f1f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Shapeshifter.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Shapeshifter.java
@@ -38,7 +38,7 @@ public class Shapeshifter extends mage.sets.antiquities.Shapeshifter {
 
     public Shapeshifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 363;
+        this.cardNumber = "363";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Shatter.java b/Mage.Sets/src/mage/sets/fourthedition/Shatter.java
index d22287976b..478f4aab74 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ShivanDragon.java b/Mage.Sets/src/mage/sets/fourthedition/ShivanDragon.java
index f568c4b6b5..c85cd64fd4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Smoke.java b/Mage.Sets/src/mage/sets/fourthedition/Smoke.java
index 7389e35451..3e3cd74611 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Smoke.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Smoke.java
@@ -38,7 +38,7 @@ public class Smoke extends mage.sets.limitedalpha.Smoke {
 
     public Smoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SorceressQueen.java b/Mage.Sets/src/mage/sets/fourthedition/SorceressQueen.java
index db2b529445..74c2ab6a02 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SorceressQueen.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SorceressQueen.java
@@ -37,7 +37,7 @@ public class SorceressQueen extends mage.sets.revisededition.SorceressQueen {
 
     public SorceressQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SoulNet.java b/Mage.Sets/src/mage/sets/fourthedition/SoulNet.java
index 69ef8b5f8b..b6aa5a56a5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 364;
+        this.cardNumber = "364";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SpellBlast.java b/Mage.Sets/src/mage/sets/fourthedition/SpellBlast.java
index b349f3ad70..476ced5e96 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/fourthedition/SpiritLink.java
index 0acc3be664..869c7bc5f4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Stasis.java b/Mage.Sets/src/mage/sets/fourthedition/Stasis.java
index 2d372b0636..02023c49d9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Stasis.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Stasis.java
@@ -37,7 +37,7 @@ public class Stasis extends mage.sets.fifthedition.Stasis {
 
     public Stasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/StealArtifact.java b/Mage.Sets/src/mage/sets/fourthedition/StealArtifact.java
index 694a294f6f..839dc6447d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/StoneGiant.java b/Mage.Sets/src/mage/sets/fourthedition/StoneGiant.java
index 3878576820..ca605f9c06 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/StoneRain.java b/Mage.Sets/src/mage/sets/fourthedition/StoneRain.java
index a2b9b4b670..4c13d09bf5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/fourthedition/StreamOfLife.java
index 8c2463ea0e..626deeb90a 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SunglassesOfUrza.java b/Mage.Sets/src/mage/sets/fourthedition/SunglassesOfUrza.java
index 2189821708..1f28e1eee5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SunglassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SunglassesOfUrza.java
@@ -37,7 +37,7 @@ public class SunglassesOfUrza extends mage.sets.limitedalpha.SunglassesOfUrza {
 
     public SunglassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 365;
+        this.cardNumber = "365";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SunkenCity.java b/Mage.Sets/src/mage/sets/fourthedition/SunkenCity.java
index 7060d2db1d..2af06ead04 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SunkenCity.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SunkenCity.java
@@ -38,7 +38,7 @@ public class SunkenCity extends mage.sets.mastersedition.SunkenCity {
 
     public SunkenCity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/SylvanLibrary.java b/Mage.Sets/src/mage/sets/fourthedition/SylvanLibrary.java
index 5fb093329f..2770b41651 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/SylvanLibrary.java
@@ -37,7 +37,7 @@ public class SylvanLibrary extends mage.sets.fifthedition.SylvanLibrary {
 
     public SylvanLibrary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/TawnossWand.java b/Mage.Sets/src/mage/sets/fourthedition/TawnossWand.java
index 9a13cd55c8..0e91521b7d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/TawnossWand.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/TawnossWand.java
@@ -37,7 +37,7 @@ public class TawnossWand extends mage.sets.antiquities.TawnossWand {
 
     public TawnossWand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 366;
+        this.cardNumber = "366";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/TawnossWeaponry.java b/Mage.Sets/src/mage/sets/fourthedition/TawnossWeaponry.java
index d744816653..670110ddd8 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/TawnossWeaponry.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/TawnossWeaponry.java
@@ -37,7 +37,7 @@ public class TawnossWeaponry extends mage.sets.fifthedition.TawnossWeaponry {
 
     public TawnossWeaponry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 367;
+        this.cardNumber = "367";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Terror.java b/Mage.Sets/src/mage/sets/fourthedition/Terror.java
index a8cf41e5f4..8ccd35af44 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Terror.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Tetravus.java b/Mage.Sets/src/mage/sets/fourthedition/Tetravus.java
index 824f4f2b00..17ee38da6b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Tetravus.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Tetravus.java
@@ -37,7 +37,7 @@ public class Tetravus extends mage.sets.antiquities.Tetravus {
 
     public Tetravus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 368;
+        this.cardNumber = "368";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/TheHive.java b/Mage.Sets/src/mage/sets/fourthedition/TheHive.java
index 0d14a8964e..93edad1eac 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/TheHive.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 369;
+        this.cardNumber = "369";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/fourthedition/ThicketBasilisk.java
index 948189c45b..d5715cb245 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Thoughtlace.java b/Mage.Sets/src/mage/sets/fourthedition/Thoughtlace.java
index 19f9d3bcc3..1604419a2b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Thoughtlace.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Thoughtlace.java
@@ -37,7 +37,7 @@ public class Thoughtlace extends mage.sets.limitedbeta.Thoughtlace {
 
     public Thoughtlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/fourthedition/ThroneOfBone.java
index ae5641b29f..7259aeea55 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 371;
+        this.cardNumber = "371";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Tranquility.java b/Mage.Sets/src/mage/sets/fourthedition/Tranquility.java
index e215fdefc0..198be49a22 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Triskelion.java b/Mage.Sets/src/mage/sets/fourthedition/Triskelion.java
index 634efe834e..a49c41c356 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Triskelion.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Triskelion.java
@@ -37,7 +37,7 @@ public class Triskelion extends mage.sets.magic2011.Triskelion {
 
     public Triskelion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 372;
+        this.cardNumber = "372";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/TundraWolves.java b/Mage.Sets/src/mage/sets/fourthedition/TundraWolves.java
index 66c07d778c..9071a6a209 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/TundraWolves.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/TundraWolves.java
@@ -37,7 +37,7 @@ public class TundraWolves extends mage.sets.tenthedition.TundraWolves {
 
     public TundraWolves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java b/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java
index b5b935e611..4c8070dc03 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java
@@ -37,7 +37,7 @@ public class Tunnel extends mage.sets.revisededition.Tunnel {
 
     public Tunnel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Twiddle.java b/Mage.Sets/src/mage/sets/fourthedition/Twiddle.java
index 3d0ed49f75..7976eabe9e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Twiddle.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Twiddle.java
@@ -37,7 +37,7 @@ public class Twiddle extends mage.sets.unlimitededition.Twiddle {
 
     public Twiddle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/UncleIstvan.java b/Mage.Sets/src/mage/sets/fourthedition/UncleIstvan.java
index ab2ba30360..36ff7fb57b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/UncleIstvan.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/UncleIstvan.java
@@ -37,7 +37,7 @@ public class UncleIstvan extends mage.sets.thedark.UncleIstvan {
 
     public UncleIstvan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/UnholyStrength.java b/Mage.Sets/src/mage/sets/fourthedition/UnholyStrength.java
index abda782bfd..8375e6ea12 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/UnstableMutation.java b/Mage.Sets/src/mage/sets/fourthedition/UnstableMutation.java
index d20d106a00..02c06ccd22 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/UnstableMutation.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/UnstableMutation.java
@@ -38,7 +38,7 @@ public class UnstableMutation extends mage.sets.arabiannights.UnstableMutation {
 
     public UnstableMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Unsummon.java b/Mage.Sets/src/mage/sets/fourthedition/Unsummon.java
index 418f1b08f8..b795ff4df2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/UntamedWilds.java b/Mage.Sets/src/mage/sets/fourthedition/UntamedWilds.java
index 0d36c99efa..68fe4c42f6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/UthdenTroll.java b/Mage.Sets/src/mage/sets/fourthedition/UthdenTroll.java
index 8447ab6147..b47b91852d 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/UthdenTroll.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/UthdenTroll.java
@@ -37,7 +37,7 @@ public class UthdenTroll extends mage.sets.limitedalpha.UthdenTroll {
 
     public UthdenTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/VampireBats.java b/Mage.Sets/src/mage/sets/fourthedition/VampireBats.java
index 90dcff15f5..e0b56b2d9f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/VampireBats.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/VampireBats.java
@@ -37,7 +37,7 @@ public class VampireBats extends mage.sets.fifthedition.VampireBats {
 
     public VampireBats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Venom.java b/Mage.Sets/src/mage/sets/fourthedition/Venom.java
index 5da48f9e07..76ccd8d4ee 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Venom.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Venom.java
@@ -37,7 +37,7 @@ public class Venom extends mage.sets.thedark.Venom {
 
     public Venom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/fourthedition/VerduranEnchantress.java
index e46242d00d..5041ecbe7e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/VolcanicEruption.java b/Mage.Sets/src/mage/sets/fourthedition/VolcanicEruption.java
index 95f773407c..fe71a0bf05 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/VolcanicEruption.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/VolcanicEruption.java
@@ -37,7 +37,7 @@ public class VolcanicEruption extends mage.sets.unlimitededition.VolcanicEruptio
 
     public VolcanicEruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfAir.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfAir.java
index 93caebbe66..372acd787c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfBone.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfBone.java
index 85f4a28f2a..3daeea1e08 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfBrambles.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfBrambles.java
index 23a1aae1a1..5d2055eb45 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfBrambles.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfBrambles.java
@@ -37,7 +37,7 @@ public class WallOfBrambles extends mage.sets.limitedalpha.WallOfBrambles {
 
     public WallOfBrambles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfFire.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfFire.java
index 4f885d7257..f40600fd40 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfSpears.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfSpears.java
index 1ba455cc2f..005e8b9ea4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfSpears.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfSpears.java
@@ -37,7 +37,7 @@ public class WallOfSpears extends mage.sets.fifthedition.WallOfSpears {
 
     public WallOfSpears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 374;
+        this.cardNumber = "374";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfStone.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfStone.java
index b9886140c9..724f7f1dd2 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfStone.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfStone.java
@@ -37,7 +37,7 @@ public class WallOfStone extends mage.sets.fifthedition.WallOfStone {
 
     public WallOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfSwords.java
index 2830db4c87..05e3d29441 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java
index 30d71e94e9..745bf79ba6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java
@@ -38,7 +38,7 @@ public class WallOfWater extends mage.sets.limitedalpha.WallOfWater {
 
     public WallOfWater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfWood.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfWood.java
index ad8370b3b9..052d1285dc 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WallOfWood.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfWood.java
@@ -37,7 +37,7 @@ public class WallOfWood extends mage.sets.tenthedition.WallOfWood {
 
     public WallOfWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Wanderlust.java b/Mage.Sets/src/mage/sets/fourthedition/Wanderlust.java
index 4fdf52e78e..ba0961317f 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Wanderlust.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Wanderlust.java
@@ -37,7 +37,7 @@ public class Wanderlust extends mage.sets.unlimitededition.Wanderlust {
 
     public Wanderlust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WarMammoth.java b/Mage.Sets/src/mage/sets/fourthedition/WarMammoth.java
index 46f94ba360..79ca1820f4 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WarMammoth.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WarMammoth.java
@@ -37,7 +37,7 @@ public class WarMammoth extends mage.sets.fifthedition.WarMammoth {
 
     public WarMammoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WarpArtifact.java b/Mage.Sets/src/mage/sets/fourthedition/WarpArtifact.java
index 3c27f6a133..2c9c7b456c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WarpArtifact.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WarpArtifact.java
@@ -37,7 +37,7 @@ public class WarpArtifact extends mage.sets.fifthedition.WarpArtifact {
 
     public WarpArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Weakness.java b/Mage.Sets/src/mage/sets/fourthedition/Weakness.java
index 11b636c12d..405d1c9f3e 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Weakness.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Web.java b/Mage.Sets/src/mage/sets/fourthedition/Web.java
index 8ae973db6b..05001baf70 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Web.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Web.java
@@ -38,7 +38,7 @@ public class Web extends mage.sets.limitedalpha.Web {
 
     public Web(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java b/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java
index 469248fe68..85d2e736d6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java
@@ -38,7 +38,7 @@ public class WhirlingDervish extends mage.sets.timeshifted.WhirlingDervish {
 
     public WhirlingDervish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WhiteKnight.java b/Mage.Sets/src/mage/sets/fourthedition/WhiteKnight.java
index 0397684158..e7c77806c3 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WhiteWard.java b/Mage.Sets/src/mage/sets/fourthedition/WhiteWard.java
index 720e8052c9..93c0708fd6 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WhiteWard.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WhiteWard.java
@@ -37,7 +37,7 @@ public class WhiteWard extends mage.sets.limitedbeta.WhiteWard {
 
     public WhiteWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WildGrowth.java b/Mage.Sets/src/mage/sets/fourthedition/WildGrowth.java
index 7b012ed18e..1d44995d43 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WillOTheWisp.java b/Mage.Sets/src/mage/sets/fourthedition/WillOTheWisp.java
index c959eb89e3..524e7c8399 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WillOTheWisp.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WillOTheWisp.java
@@ -37,7 +37,7 @@ public class WillOTheWisp extends mage.sets.limitedalpha.WillOTheWisp {
 
     public WillOTheWisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WindsOfChange.java b/Mage.Sets/src/mage/sets/fourthedition/WindsOfChange.java
index e9f6e9586f..1f8b175300 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WindsOfChange.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WindsOfChange.java
@@ -37,7 +37,7 @@ public class WindsOfChange extends mage.sets.fifthedition.WindsOfChange {
 
     public WindsOfChange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WinterOrb.java b/Mage.Sets/src/mage/sets/fourthedition/WinterOrb.java
index 31f8ae26dd..f15eed9976 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WinterOrb.java
@@ -37,7 +37,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 376;
+        this.cardNumber = "376";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WoodenSphere.java b/Mage.Sets/src/mage/sets/fourthedition/WoodenSphere.java
index bb6b8e3328..bfa66f713b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 377;
+        this.cardNumber = "377";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/fourthedition/WrathOfGod.java
index 2d560e2c00..047335f881 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/XenicPoltergeist.java b/Mage.Sets/src/mage/sets/fourthedition/XenicPoltergeist.java
index 0208a87802..95e648cbb9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/XenicPoltergeist.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/XenicPoltergeist.java
@@ -38,7 +38,7 @@ public class XenicPoltergeist extends mage.sets.masterseditioniv.XenicPoltergeis
 
     public XenicPoltergeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "4ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/YotianSoldier.java b/Mage.Sets/src/mage/sets/fourthedition/YotianSoldier.java
index 0655f77ede..556a30afa9 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/YotianSoldier.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/YotianSoldier.java
@@ -37,7 +37,7 @@ public class YotianSoldier extends mage.sets.mirrodin.YotianSoldier {
 
     public YotianSoldier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 378;
+        this.cardNumber = "378";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ZephyrFalcon.java b/Mage.Sets/src/mage/sets/fourthedition/ZephyrFalcon.java
index b4c2e57450..589af71d6b 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ZephyrFalcon.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ZephyrFalcon.java
@@ -37,7 +37,7 @@ public class ZephyrFalcon extends mage.sets.fifthedition.ZephyrFalcon {
 
     public ZephyrFalcon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ZombieMaster.java b/Mage.Sets/src/mage/sets/fourthedition/ZombieMaster.java
index 514213aaf8..bc3676b125 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "4ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AbzanBeastmaster.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AbzanBeastmaster.java
index e94bec8845..0f0cb4a36a 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AbzanBeastmaster.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AbzanBeastmaster.java
@@ -37,7 +37,7 @@ public class AbzanBeastmaster extends mage.sets.fatereforged.AbzanBeastmaster {
 
     public AbzanBeastmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AccumulatedKnowledge.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AccumulatedKnowledge.java
index 49e96e7e44..be729c8ce1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AccumulatedKnowledge.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AccumulatedKnowledge.java
@@ -38,7 +38,7 @@ public class AccumulatedKnowledge extends mage.sets.nemesis.AccumulatedKnowledge
 
     public AccumulatedKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AcidicSlime.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AcidicSlime.java
index 54ce7f93de..ba8e80dfe9 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AlbinoTroll.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AlbinoTroll.java
index 3eca0fb24d..c8140200f5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AlbinoTroll.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AlbinoTroll.java
@@ -38,7 +38,7 @@ public class AlbinoTroll extends mage.sets.urzassaga.AlbinoTroll {
 
     public AlbinoTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Anathemancer.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Anathemancer.java
index 9fb06f41da..e40684f673 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Anathemancer.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Anathemancer.java
@@ -37,7 +37,7 @@ public class Anathemancer extends mage.sets.alarareborn.Anathemancer {
 
     public Anathemancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AncientGrudge.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AncientGrudge.java
index b55c0c4265..0103e1d20e 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AncientGrudge.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AncientGrudge.java
@@ -38,7 +38,7 @@ public class AncientGrudge extends mage.sets.innistrad.AncientGrudge {
 
     public AncientGrudge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AncientZiggurat.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AncientZiggurat.java
index 14401ccda9..37baab77a5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AncientZiggurat.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AncientZiggurat.java
@@ -37,7 +37,7 @@ public class AncientZiggurat extends mage.sets.conflux.AncientZiggurat {
 
     public AncientZiggurat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Anticipate.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Anticipate.java
index 407e8e35a3..085b333144 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Anticipate.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Anticipate.java
@@ -37,7 +37,7 @@ public class Anticipate extends mage.sets.dragonsoftarkir.Anticipate {
 
     public Anticipate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ArmadilloCloak.java
index 693a8e9aae..14b7351a11 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ArmadilloCloak.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ArmadilloCloak.java
@@ -38,7 +38,7 @@ public class ArmadilloCloak extends mage.sets.invasion.ArmadilloCloak {
 
     public ArmadilloCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ArrogantWurm.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ArrogantWurm.java
index 6e4b783a11..ec5358d921 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ArrogantWurm.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ArrogantWurm.java
@@ -37,7 +37,7 @@ public class ArrogantWurm extends mage.sets.torment.ArrogantWurm {
 
     public ArrogantWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ArtisanOfKozilek.java
index 9fc9d2920e..cc9391d0f6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ArtisanOfKozilek.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ArtisanOfKozilek.java
@@ -37,7 +37,7 @@ public class ArtisanOfKozilek extends mage.sets.riseoftheeldrazi.ArtisanOfKozile
 
     public ArtisanOfKozilek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AstralSlide.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AstralSlide.java
index d123f391b0..9d723d4df0 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AstralSlide.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AstralSlide.java
@@ -37,7 +37,7 @@ public class AstralSlide extends mage.sets.onslaught.AstralSlide {
 
     public AstralSlide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AuraOfSilence.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AuraOfSilence.java
index 15c9cb63e6..293fa369f9 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AuraOfSilence.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AuraOfSilence.java
@@ -37,7 +37,7 @@ public class AuraOfSilence extends mage.sets.weatherlight.AuraOfSilence {
 
     public AuraOfSilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AvacynsPilgrim.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AvacynsPilgrim.java
index 93a730ddde..f44b180b3f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AvacynsPilgrim.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AvacynsPilgrim.java
@@ -38,7 +38,7 @@ public class AvacynsPilgrim extends mage.sets.innistrad.AvacynsPilgrim {
 
     public AvacynsPilgrim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/AvalancheRiders.java b/Mage.Sets/src/mage/sets/fridaynightmagic/AvalancheRiders.java
index ac435fb6d6..21979d3cad 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/AvalancheRiders.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/AvalancheRiders.java
@@ -37,7 +37,7 @@ public class AvalancheRiders extends mage.sets.urzaslegacy.AvalancheRiders {
 
     public AvalancheRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BanisherPriest.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BanisherPriest.java
index 9e168ed14b..8a79d89f26 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BanisherPriest.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BanisherPriest.java
@@ -37,7 +37,7 @@ public class BanisherPriest extends mage.sets.magic2014.BanisherPriest {
 
     public BanisherPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BanishingLight.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BanishingLight.java
index 085821b03c..a6bbda5847 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BanishingLight.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BanishingLight.java
@@ -37,7 +37,7 @@ public class BanishingLight extends mage.sets.journeyintonyx.BanishingLight {
 
     public BanishingLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BaskingRootwalla.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BaskingRootwalla.java
index e410a6e9d7..058574c3b1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BaskingRootwalla.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BaskingRootwalla.java
@@ -38,7 +38,7 @@ public class BaskingRootwalla extends mage.sets.torment.BaskingRootwalla {
 
     public BaskingRootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BileBlight.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BileBlight.java
index a0a4ced4a0..a51f51ab5b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BileBlight.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BileBlight.java
@@ -37,7 +37,7 @@ public class BileBlight extends mage.sets.bornofthegods.BileBlight {
 
     public BileBlight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BlackKnight.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BlackKnight.java
index 50fd2e2820..467b7b5cbb 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Blastoderm.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Blastoderm.java
index 0a944b746a..d2d59e72ac 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Blastoderm.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Blastoderm.java
@@ -38,7 +38,7 @@ public class Blastoderm extends mage.sets.nemesis.Blastoderm {
 
     public Blastoderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BlightedFen.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BlightedFen.java
index dcff03d9cc..366ea69fd7 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BlightedFen.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BlightedFen.java
@@ -37,7 +37,7 @@ public class BlightedFen extends mage.sets.battleforzendikar.BlightedFen {
 
     public BlightedFen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BloodbraidElf.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BloodbraidElf.java
index 515133035f..8b1d35350c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BloodbraidElf.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BloodbraidElf.java
@@ -37,7 +37,7 @@ public class BloodbraidElf extends mage.sets.alarareborn.BloodbraidElf {
 
     public BloodbraidElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BottleGnomes.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BottleGnomes.java
index 7b4eecb522..12a33d2438 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/BrainMaggot.java b/Mage.Sets/src/mage/sets/fridaynightmagic/BrainMaggot.java
index 7963d27e9c..79ff6433cc 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/BrainMaggot.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/BrainMaggot.java
@@ -38,7 +38,7 @@ public class BrainMaggot extends mage.sets.journeyintonyx.BrainMaggot {
 
     public BrainMaggot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Brainstorm.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Brainstorm.java
index 2835a5bf38..2f745f0aa8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Brainstorm.java
@@ -38,7 +38,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Browbeat.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Browbeat.java
index 788a0bc502..6d9621901b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Browbeat.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Browbeat.java
@@ -37,7 +37,7 @@ public class Browbeat extends mage.sets.judgment.Browbeat {
 
     public Browbeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CabalCoffers.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CabalCoffers.java
index b827c5a8ff..20751041f3 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CabalCoffers.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CabalCoffers.java
@@ -37,7 +37,7 @@ public class CabalCoffers extends mage.sets.planechase.CabalCoffers {
 
     public CabalCoffers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CabalTherapy.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CabalTherapy.java
index 62aa2122eb..eccc968ebe 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CabalTherapy.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CabalTherapy.java
@@ -37,7 +37,7 @@ public class CabalTherapy extends mage.sets.judgment.CabalTherapy {
 
     public CabalTherapy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CallOfTheConclave.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CallOfTheConclave.java
index 01ce7298fc..58204620f1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CallOfTheConclave.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CallOfTheConclave.java
@@ -37,7 +37,7 @@ public class CallOfTheConclave extends mage.sets.returntoravnica.CallOfTheConcla
        
     public CallOfTheConclave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "FNMP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Capsize.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Capsize.java
index 28506572eb..5b7670e2c4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Capsize.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Capsize.java
@@ -38,7 +38,7 @@ public class Capsize extends mage.sets.tempest.Capsize {
 
     public Capsize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Carnophage.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Carnophage.java
index 76096940f7..981f381a53 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Carnophage.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Carnophage.java
@@ -38,7 +38,7 @@ public class Carnophage extends mage.sets.exodus.Carnophage {
 
     public Carnophage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CarrionFeeder.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CarrionFeeder.java
index 15f31ac585..cd4792bec5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CarrionFeeder.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CarrionFeeder.java
@@ -38,7 +38,7 @@ public class CarrionFeeder extends mage.sets.scourge.CarrionFeeder {
 
     public CarrionFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ChainersEdict.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ChainersEdict.java
index cd71809f38..de0dbcbd0f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ChainersEdict.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ChainersEdict.java
@@ -38,7 +38,7 @@ public class ChainersEdict extends mage.sets.vintagemasters.ChainersEdict {
 
     public ChainersEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CircleOfProtectionRed.java
index 89521a6f0d..7581aeedc5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CircularLogic.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CircularLogic.java
index 0835c97e7e..f38651ec9f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CircularLogic.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CircularLogic.java
@@ -37,7 +37,7 @@ public class CircularLogic extends mage.sets.torment.CircularLogic {
 
     public CircularLogic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java
index 7436107c49..7ba3dd1073 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java
@@ -37,7 +37,7 @@ public class ClashOfWills extends mage.sets.magicorigins.ClashOfWills {
 
     public ClashOfWills(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Cloudpost.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Cloudpost.java
index c82d6abbee..b08e6480e1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Cloudpost.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Cloudpost.java
@@ -38,7 +38,7 @@ public class Cloudpost extends mage.sets.mirrodin.Cloudpost {
 
     public Cloudpost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ContagionClasp.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ContagionClasp.java
index d33cbf4df6..855413a29c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ContagionClasp.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ContagionClasp.java
@@ -37,7 +37,7 @@ public class ContagionClasp extends mage.sets.scarsofmirrodin.ContagionClasp {
 
     public ContagionClasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Counterspell.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Counterspell.java
index 3d5bfd246e..10425e353f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CrumblingVestige.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CrumblingVestige.java
index 8b2dc64aea..5f7f108365 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CrumblingVestige.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CrumblingVestige.java
@@ -37,7 +37,7 @@ public class CrumblingVestige extends mage.sets.oathofthegatewatch.CrumblingVest
 
     public CrumblingVestige(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/CrystallineSliver.java b/Mage.Sets/src/mage/sets/fridaynightmagic/CrystallineSliver.java
index be4876045c..9e0092f291 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/CrystallineSliver.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/CrystallineSliver.java
@@ -37,7 +37,7 @@ public class CrystallineSliver extends mage.sets.stronghold.CrystallineSliver {
 
     public CrystallineSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Cultivate.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Cultivate.java
index 878db42dab..68ac6c5cd4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Cultivate.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Cultivate.java
@@ -38,7 +38,7 @@ public class Cultivate extends mage.sets.magic2011.Cultivate {
 
     public Cultivate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/DeepAnalysis.java b/Mage.Sets/src/mage/sets/fridaynightmagic/DeepAnalysis.java
index c7dca9075a..39da88d040 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/DeepAnalysis.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/DeepAnalysis.java
@@ -38,7 +38,7 @@ public class DeepAnalysis extends mage.sets.torment.DeepAnalysis {
 
     public DeepAnalysis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Desert.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Desert.java
index 27e7733ad7..4f13bbd672 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Desert.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Desert.java
@@ -38,7 +38,7 @@ public class Desert extends mage.sets.timeshifted.Desert {
 
     public Desert(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Despise.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Despise.java
index a985a42951..2469a99b09 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Despise.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Despise.java
@@ -37,7 +37,7 @@ public class Despise extends mage.sets.newphyrexia.Despise {
 
     public Despise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/DimirCharm.java b/Mage.Sets/src/mage/sets/fridaynightmagic/DimirCharm.java
index 4a3ebd3747..a0dddd643b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/DimirCharm.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/DimirCharm.java
@@ -37,7 +37,7 @@ public class DimirCharm extends mage.sets.gatecrash.DimirCharm {
 
     public DimirCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/DisdainfulStroke.java b/Mage.Sets/src/mage/sets/fridaynightmagic/DisdainfulStroke.java
index a4f09792d2..854137e25c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/DisdainfulStroke.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/DisdainfulStroke.java
@@ -38,7 +38,7 @@ public class DisdainfulStroke extends mage.sets.khansoftarkir.DisdainfulStroke {
     
     public DisdainfulStroke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Disenchant.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Disenchant.java
index 6baf6ede7f..a1613dff74 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Disenchant.java
@@ -38,7 +38,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Dismember.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Dismember.java
index 38a9e90058..fec7d4387d 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Dismember.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Dismember.java
@@ -37,7 +37,7 @@ public class Dismember extends mage.sets.newphyrexia.Dismember {
 
     public Dismember(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Dissipate.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Dissipate.java
index 3f22ecb28b..18959ad6fd 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Dissipate.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Dissipate.java
@@ -37,7 +37,7 @@ public class Dissipate extends mage.sets.innistrad.Dissipate {
 
     public Dissipate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Dissolve.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Dissolve.java
index 335569e124..e18aa99df3 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Dissolve.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Dissolve.java
@@ -37,7 +37,7 @@ public class Dissolve extends mage.sets.theros.Dissolve {
 
     public Dissolve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/DrainLife.java b/Mage.Sets/src/mage/sets/fridaynightmagic/DrainLife.java
index f1687aaf83..5ed60c3796 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Duress.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Duress.java
index 0f639d0bbd..92e2d2f447 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Duress.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Duress.java
@@ -38,7 +38,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ElvesOfDeepShadow.java
index 18b5cfdc04..ea405be0a1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ElvesOfDeepShadow.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ElvesOfDeepShadow.java
@@ -38,7 +38,7 @@ public class ElvesOfDeepShadow extends mage.sets.ravnica.ElvesOfDeepShadow {
 
     public ElvesOfDeepShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishMystic.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishMystic.java
index 8527d63b0e..1b42c7bb90 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishMystic.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishMystic.java
@@ -38,7 +38,7 @@ public class ElvishMystic extends mage.sets.magic2014.ElvishMystic {
 
     public ElvishMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishVisionary.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishVisionary.java
index e2a99079b4..0290c9815f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishVisionary.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ElvishVisionary.java
@@ -38,7 +38,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
 
     public ElvishVisionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/EncroachingWastes.java b/Mage.Sets/src/mage/sets/fridaynightmagic/EncroachingWastes.java
index e6b42a9919..5fe16dee09 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/EncroachingWastes.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/EncroachingWastes.java
@@ -37,7 +37,7 @@ public class EncroachingWastes extends mage.sets.magic2014.EncroachingWastes {
 
     public EncroachingWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/EngineeredPlague.java b/Mage.Sets/src/mage/sets/fridaynightmagic/EngineeredPlague.java
index 8cb54b6bea..285b69770a 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/EngineeredPlague.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/EngineeredPlague.java
@@ -37,7 +37,7 @@ public class EngineeredPlague extends mage.sets.urzaslegacy.EngineeredPlague {
 
     public EngineeredPlague(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/EternalWitness.java b/Mage.Sets/src/mage/sets/fridaynightmagic/EternalWitness.java
index b30ba8960e..3cf66839cc 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/EternalWitness.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/EternalWitness.java
@@ -37,7 +37,7 @@ public class EternalWitness extends mage.sets.fifthdawn.EternalWitness {
 
     public EternalWitness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/EverflowingChalice.java b/Mage.Sets/src/mage/sets/fridaynightmagic/EverflowingChalice.java
index 81a97d649d..7bf402829f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/EverflowingChalice.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/EverflowingChalice.java
@@ -37,7 +37,7 @@ public class EverflowingChalice extends mage.sets.worldwake.EverflowingChalice {
 
     public EverflowingChalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/EvolvingWilds.java b/Mage.Sets/src/mage/sets/fridaynightmagic/EvolvingWilds.java
index 77cc462fea..fe8c27267d 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/EvolvingWilds.java
@@ -38,7 +38,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ExperimentOne.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ExperimentOne.java
index dd41533958..22e823a271 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ExperimentOne.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ExperimentOne.java
@@ -37,7 +37,7 @@ public class ExperimentOne extends mage.sets.gatecrash.ExperimentOne {
 
     public ExperimentOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FactOrFiction.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FactOrFiction.java
index 47cd2b7195..59fea15a40 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FanaticOfXenagos.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FanaticOfXenagos.java
index 96d00fc830..ee4c287745 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FanaticOfXenagos.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FanaticOfXenagos.java
@@ -37,7 +37,7 @@ public class FanaticOfXenagos extends mage.sets.bornofthegods.FanaticOfXenagos {
 
     public FanaticOfXenagos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Farseek.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Farseek.java
index 69b92d1625..b3146e89c5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Farseek.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Farseek.java
@@ -38,7 +38,7 @@ public class Farseek extends mage.sets.ravnica.Farseek {
 
     public Farseek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FireIce.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FireIce.java
index 23cc1e523b..8edd2d8083 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FireIce.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FireIce.java
@@ -37,7 +37,7 @@ public class FireIce extends mage.sets.apocalypse.FireIce {
     
     public FireIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "FNMP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Fireblast.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Fireblast.java
index b7dbf99043..3d0f7c8cf6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Fireblast.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Fireblast.java
@@ -38,7 +38,7 @@ public class Fireblast extends mage.sets.visions.Fireblast {
 
     public Fireblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Firebolt.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Firebolt.java
index 21d2eb2b48..e491d2554f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Firebolt.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Firebolt.java
@@ -38,7 +38,7 @@ public class Firebolt extends mage.sets.odyssey.Firebolt {
 
     public Firebolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Fireslinger.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Fireslinger.java
index be83e0e2a1..cb92f22914 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Fireslinger.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Fireslinger.java
@@ -38,7 +38,7 @@ public class Fireslinger extends mage.sets.tempest.Fireslinger {
 
     public Fireslinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FlametongueKavu.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FlametongueKavu.java
index c85ece8b68..529359b81a 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FlayingTendrils.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FlayingTendrils.java
index 9a3f81e4a0..0aeee947b3 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FlayingTendrils.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FlayingTendrils.java
@@ -37,7 +37,7 @@ public class FlayingTendrils extends mage.sets.oathofthegatewatch.FlayingTendril
 
     public FlayingTendrils(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Forbid.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Forbid.java
index 0dc52d31fe..c2cb980f60 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Forbid.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Forbid.java
@@ -37,7 +37,7 @@ public class Forbid extends mage.sets.exodus.Forbid {
 
     public Forbid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ForbiddenAlchemy.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ForbiddenAlchemy.java
index bd41ae6e6c..ccba42c2d9 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ForbiddenAlchemy.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ForbiddenAlchemy.java
@@ -38,7 +38,7 @@ public class ForbiddenAlchemy extends mage.sets.innistrad.ForbiddenAlchemy {
 
     public ForbiddenAlchemy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ForceSpike.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ForceSpike.java
index 26100f6b95..6da24d59de 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ForceSpike.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ForceSpike.java
@@ -38,7 +38,7 @@ public class ForceSpike extends mage.sets.seventhedition.ForceSpike {
 
     public ForceSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FrenziedGoblin.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FrenziedGoblin.java
index 124505e414..157daacfb4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FrenziedGoblin.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FrenziedGoblin.java
@@ -37,7 +37,7 @@ public class FrenziedGoblin extends mage.sets.magic2015.FrenziedGoblin {
     
     public FrenziedGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "FNMP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/FrostWalker.java b/Mage.Sets/src/mage/sets/fridaynightmagic/FrostWalker.java
index 9546267fe1..9978289d37 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/FrostWalker.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/FrostWalker.java
@@ -37,7 +37,7 @@ public class FrostWalker extends mage.sets.fatereforged.FrostWalker {
 
     public FrostWalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GatekeeperOfMalakir.java
index 2f48369d56..7facfa51f8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GatekeeperOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GatekeeperOfMalakir.java
@@ -37,7 +37,7 @@ public class GatekeeperOfMalakir extends mage.sets.zendikar.GatekeeperOfMalakir
 
     public GatekeeperOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GerrardsVerdict.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GerrardsVerdict.java
index 65c9fb3251..1857ff839d 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GerrardsVerdict.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GerrardsVerdict.java
@@ -37,7 +37,7 @@ public class GerrardsVerdict extends mage.sets.apocalypse.GerrardsVerdict {
 
     public GerrardsVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GhorClanRampager.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GhorClanRampager.java
index 32a706a182..4727781bda 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GhorClanRampager.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GhorClanRampager.java
@@ -37,7 +37,7 @@ public class GhorClanRampager extends mage.sets.gatecrash.GhorClanRampager {
 
     public GhorClanRampager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GhostlyPrison.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GhostlyPrison.java
index 08c590e057..cb581f91b0 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GhostlyPrison.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GhostlyPrison.java
@@ -37,7 +37,7 @@ public class GhostlyPrison extends mage.sets.championsofkamigawa.GhostlyPrison {
 
     public GhostlyPrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GiantGrowth.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GiantGrowth.java
index 91b2e7b6ae..d528f8a9f1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GiantGrowth.java
@@ -38,7 +38,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GitaxianProbe.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GitaxianProbe.java
index fe57786fe2..eeaab0fa1b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GitaxianProbe.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GitaxianProbe.java
@@ -38,7 +38,7 @@ public class GitaxianProbe extends mage.sets.newphyrexia.GitaxianProbe {
 
     public GitaxianProbe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GlistenerElf.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GlistenerElf.java
index 411ba5bf7f..ae88f891b6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GlistenerElf.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GlistenerElf.java
@@ -38,7 +38,7 @@ public class GlistenerElf extends mage.sets.newphyrexia.GlistenerElf {
 
     public GlistenerElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GoForTheThroat.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GoForTheThroat.java
index a4f45b993b..232131ce39 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GoForTheThroat.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GoForTheThroat.java
@@ -37,7 +37,7 @@ public class GoForTheThroat extends mage.sets.mirrodinbesieged.GoForTheThroat {
 
     public GoForTheThroat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinBombardment.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinBombardment.java
index e597e211dc..5676e78f04 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinBombardment.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinBombardment.java
@@ -37,7 +37,7 @@ public class GoblinBombardment extends mage.sets.tempest.GoblinBombardment {
 
     public GoblinBombardment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinLegionnaire.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinLegionnaire.java
index a7b897b1cc..988a988bbc 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinLegionnaire.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinLegionnaire.java
@@ -38,7 +38,7 @@ public class GoblinLegionnaire extends mage.sets.apocalypse.GoblinLegionnaire {
 
     public GoblinLegionnaire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinRingleader.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinRingleader.java
index 044617e0d4..3cece3a2b8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinRingleader.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinRingleader.java
@@ -37,7 +37,7 @@ public class GoblinRingleader extends mage.sets.apocalypse.GoblinRingleader {
 
     public GoblinRingleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief1.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief1.java
index 28f5c15b1c..119500a74c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief1.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief1.java
@@ -37,7 +37,7 @@ public class GoblinWarchief1 extends mage.sets.scourge.GoblinWarchief {
 
     public GoblinWarchief1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief2.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief2.java
index 2335e7b814..416b17a575 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief2.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GoblinWarchief2.java
@@ -37,7 +37,7 @@ public class GoblinWarchief2 extends mage.sets.scourge.GoblinWarchief {
 
     public GoblinWarchief2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/GrislySalvage.java b/Mage.Sets/src/mage/sets/fridaynightmagic/GrislySalvage.java
index 0934a1a3d4..36a6287787 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/GrislySalvage.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/GrislySalvage.java
@@ -38,7 +38,7 @@ public class GrislySalvage extends mage.sets.returntoravnica.GrislySalvage {
 
     public GrislySalvage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/HordelingOutburst.java b/Mage.Sets/src/mage/sets/fridaynightmagic/HordelingOutburst.java
index c8346860d2..f456545583 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/HordelingOutburst.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/HordelingOutburst.java
@@ -37,7 +37,7 @@ public class HordelingOutburst extends mage.sets.khansoftarkir.HordelingOutburst
 
     public HordelingOutburst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/IcyManipulator.java b/Mage.Sets/src/mage/sets/fridaynightmagic/IcyManipulator.java
index c416e684f8..78356d9bd1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Impulse.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Impulse.java
index 22d5b80446..f2cd23ed94 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Impulse.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Impulse.java
@@ -38,7 +38,7 @@ public class Impulse extends mage.sets.visions.Impulse {
 
     public Impulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/IsochronScepter.java b/Mage.Sets/src/mage/sets/fridaynightmagic/IsochronScepter.java
index d9da1f1dcd..54dc4bdce5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/IsochronScepter.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/IsochronScepter.java
@@ -37,7 +37,7 @@ public class IsochronScepter extends mage.sets.mirrodin.IsochronScepter {
 
     public IsochronScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/IzzetCharm.java b/Mage.Sets/src/mage/sets/fridaynightmagic/IzzetCharm.java
index 8987232e66..c65a8a11c8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/IzzetCharm.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/IzzetCharm.java
@@ -37,7 +37,7 @@ public class IzzetCharm extends mage.sets.returntoravnica.IzzetCharm {
 
     public IzzetCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/JacesIngenuity.java b/Mage.Sets/src/mage/sets/fridaynightmagic/JacesIngenuity.java
index 9e45fd4561..14d911e646 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/JacesIngenuity.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/JacesIngenuity.java
@@ -37,7 +37,7 @@ public class JacesIngenuity extends mage.sets.magic2011.JacesIngenuity {
 
     public JacesIngenuity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/JackalPup.java b/Mage.Sets/src/mage/sets/fridaynightmagic/JackalPup.java
index 6745cd5a3e..10dd517a84 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/JackalPup.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/JackalPup.java
@@ -37,7 +37,7 @@ public class JackalPup extends mage.sets.tempest.JackalPup {
 
     public JackalPup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/JudgesFamiliar.java b/Mage.Sets/src/mage/sets/fridaynightmagic/JudgesFamiliar.java
index eb37459766..92eaaa5ccd 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/JudgesFamiliar.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/JudgesFamiliar.java
@@ -37,7 +37,7 @@ public class JudgesFamiliar extends mage.sets.returntoravnica.JudgesFamiliar {
 
     public JudgesFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Juggernaut.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Juggernaut.java
index d3b982aae3..328763b8a6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/KirdApe.java b/Mage.Sets/src/mage/sets/fridaynightmagic/KirdApe.java
index 70566c87e9..817def83b8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/KirdApe.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/KirdApe.java
@@ -38,7 +38,7 @@ public class KirdApe extends mage.sets.ninthedition.KirdApe {
 
     public KirdApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/KitchenFinks.java b/Mage.Sets/src/mage/sets/fridaynightmagic/KitchenFinks.java
index f6b8b40ae4..a66776250f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/KitchenFinks.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/KitchenFinks.java
@@ -37,7 +37,7 @@ public class KitchenFinks extends mage.sets.shadowmoor.KitchenFinks {
 
     public KitchenFinks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanGrip.java b/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanGrip.java
index 75056a5687..6536c70947 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanGrip.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanGrip.java
@@ -37,7 +37,7 @@ public class KrosanGrip extends mage.sets.timespiral.KrosanGrip {
 
     public KrosanGrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanTusker.java b/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanTusker.java
index 5c57a79286..c71f10ec3c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanTusker.java
@@ -38,7 +38,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanWarchief.java b/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanWarchief.java
index 66faa8015d..7a63acd360 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanWarchief.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/KrosanWarchief.java
@@ -37,7 +37,7 @@ public class KrosanWarchief extends mage.sets.scourge.KrosanWarchief {
 
     public KrosanWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/LifeDeath.java b/Mage.Sets/src/mage/sets/fridaynightmagic/LifeDeath.java
index 54210185f2..2f5055444b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/LifeDeath.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/LifeDeath.java
@@ -37,7 +37,7 @@ public class LifeDeath extends mage.sets.apocalypse.LifeDeath {
     
     public LifeDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "FNMP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/LightningGreaves.java b/Mage.Sets/src/mage/sets/fridaynightmagic/LightningGreaves.java
index d07374c86c..b91e1bca42 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/LightningGreaves.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/LightningGreaves.java
@@ -37,7 +37,7 @@ public class LightningGreaves extends mage.sets.mirrodin.LightningGreaves {
 
     public LightningGreaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/LightningRift.java b/Mage.Sets/src/mage/sets/fridaynightmagic/LightningRift.java
index bfa0ee3717..346c2fb556 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/LightningRift.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/LightningRift.java
@@ -37,7 +37,7 @@ public class LightningRift extends mage.sets.onslaught.LightningRift {
 
     public LightningRift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/LingeringSouls.java b/Mage.Sets/src/mage/sets/fridaynightmagic/LingeringSouls.java
index 50dc77cd25..4c24bc37c7 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/LingeringSouls.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/LingeringSouls.java
@@ -37,7 +37,7 @@ public class LingeringSouls extends mage.sets.darkascension.LingeringSouls {
 
     public LingeringSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/LlanowarElves.java b/Mage.Sets/src/mage/sets/fridaynightmagic/LlanowarElves.java
index 7dd3c27175..63dd9bdb7d 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/LlanowarElves.java
@@ -38,7 +38,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Lobotomy.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Lobotomy.java
index 56464bad7a..af89e45079 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Lobotomy.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Lobotomy.java
@@ -37,7 +37,7 @@ public class Lobotomy extends mage.sets.tempest.Lobotomy {
 
     public Lobotomy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/LongbowArcher.java b/Mage.Sets/src/mage/sets/fridaynightmagic/LongbowArcher.java
index ec94f85548..aab25b52f4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/LongbowArcher.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/LongbowArcher.java
@@ -37,7 +37,7 @@ public class LongbowArcher extends mage.sets.seventhedition.LongbowArcher {
 
     public LongbowArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaJet.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaJet.java
index 4a6045bd23..a8379c72e6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaJet.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaJet.java
@@ -37,7 +37,7 @@ public class MagmaJet extends mage.sets.fifthdawn.MagmaJet {
 
     public MagmaJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaSpray.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaSpray.java
index a88f3b77e5..6d9b9312e1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaSpray.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MagmaSpray.java
@@ -38,7 +38,7 @@ public class MagmaSpray extends mage.sets.shardsofalara.MagmaSpray {
 
     public MagmaSpray(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MerrowReejerey.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MerrowReejerey.java
index 60b6492e7e..eb8e68c710 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MerrowReejerey.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MerrowReejerey.java
@@ -37,7 +37,7 @@ public class MerrowReejerey extends mage.sets.lorwyn.MerrowReejerey {
 
     public MerrowReejerey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MindWarp.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MindWarp.java
index d23e76325e..c7288acc3b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MindWarp.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MindWarp.java
@@ -37,7 +37,7 @@ public class MindWarp extends mage.sets.iceage.MindWarp {
 
     public MindWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MoggFanatic.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MoggFanatic.java
index 14f64c27f0..f2f006e53f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MotherOfRunes.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MotherOfRunes.java
index 07866b4c02..3e2187292b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MotherOfRunes.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MotherOfRunes.java
@@ -37,7 +37,7 @@ public class MotherOfRunes extends mage.sets.urzaslegacy.MotherOfRunes {
 
     public MotherOfRunes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Mulldrifter.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Mulldrifter.java
index e047522ee2..1ab2013c9b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Mulldrifter.java
@@ -38,7 +38,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MurderousRedcap.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MurderousRedcap.java
index 3030cbd9a1..b50a566ed8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MurderousRedcap.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MurderousRedcap.java
@@ -37,7 +37,7 @@ public class MurderousRedcap extends mage.sets.shadowmoor.MurderousRedcap {
 
     public MurderousRedcap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MuscleSliver.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MuscleSliver.java
index e32712d69d..364bb835f7 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MuscleSliver.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MuscleSliver.java
@@ -38,7 +38,7 @@ public class MuscleSliver extends mage.sets.tempest.MuscleSliver {
 
     public MuscleSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/MyrEnforcer.java b/Mage.Sets/src/mage/sets/fridaynightmagic/MyrEnforcer.java
index 21627688be..59df72d07e 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/MyrEnforcer.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/MyrEnforcer.java
@@ -38,7 +38,7 @@ public class MyrEnforcer extends mage.sets.planechase.MyrEnforcer {
 
     public MyrEnforcer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java b/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java
index e5c2c2ac77..15c21c483b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java
@@ -37,7 +37,7 @@ public class NissasPilgrimage extends mage.sets.magicorigins.NissasPilgrimage {
 
     public NissasPilgrimage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/OblivionRing.java b/Mage.Sets/src/mage/sets/fridaynightmagic/OblivionRing.java
index 86e84225e2..2b64b38525 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/OblivionRing.java
@@ -38,7 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Ophidian.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Ophidian.java
index e880a43804..38514c6d7f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Ophidian.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Ophidian.java
@@ -38,7 +38,7 @@ public class Ophidian extends mage.sets.vintagemasters.Ophidian {
 
     public Ophidian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/OratorOfOjutai.java b/Mage.Sets/src/mage/sets/fridaynightmagic/OratorOfOjutai.java
index 37316f8bf7..a8e75f695e 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/OratorOfOjutai.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/OratorOfOjutai.java
@@ -37,7 +37,7 @@ public class OratorOfOjutai extends mage.sets.dragonsoftarkir.OratorOfOjutai {
 
     public OratorOfOjutai(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java b/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java
index 5a5e9dbe4e..3b62241ab2 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java
@@ -37,7 +37,7 @@ public class PathToExile extends mage.sets.conflux.PathToExile {
 
     public PathToExile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Pendelhaven.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Pendelhaven.java
index 3239670821..55c1451c6f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Pendelhaven.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Pendelhaven.java
@@ -38,7 +38,7 @@ public class Pendelhaven extends mage.sets.timeshifted.Pendelhaven {
 
     public Pendelhaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/PillarOfFlame.java b/Mage.Sets/src/mage/sets/fridaynightmagic/PillarOfFlame.java
index 877983694c..c25ed99150 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/PillarOfFlame.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/PillarOfFlame.java
@@ -38,7 +38,7 @@ public class PillarOfFlame extends mage.sets.avacynrestored.PillarOfFlame {
 
     public PillarOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/PriestOfTitania.java b/Mage.Sets/src/mage/sets/fridaynightmagic/PriestOfTitania.java
index fbcea75711..b0c4538d1d 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/PriestOfTitania.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/PriestOfTitania.java
@@ -38,7 +38,7 @@ public class PriestOfTitania extends mage.sets.urzassaga.PriestOfTitania {
 
     public PriestOfTitania(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ProdigalSorcerer.java
index 690e70321b..db131068e5 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/QasaliPridemage.java b/Mage.Sets/src/mage/sets/fridaynightmagic/QasaliPridemage.java
index 72be7fac62..579efaad89 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/QasaliPridemage.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/QasaliPridemage.java
@@ -38,7 +38,7 @@ public class QasaliPridemage extends mage.sets.alarareborn.QasaliPridemage {
 
     public QasaliPridemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/QuirionRanger.java b/Mage.Sets/src/mage/sets/fridaynightmagic/QuirionRanger.java
index f10501ef55..9d19970406 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/QuirionRanger.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/QuirionRanger.java
@@ -38,7 +38,7 @@ public class QuirionRanger extends mage.sets.visions.QuirionRanger {
 
     public QuirionRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/RakdosCackler.java b/Mage.Sets/src/mage/sets/fridaynightmagic/RakdosCackler.java
index f936d94d42..a560e37f05 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/RakdosCackler.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/RakdosCackler.java
@@ -37,7 +37,7 @@ public class RakdosCackler extends mage.sets.returntoravnica.RakdosCackler {
 
     public RakdosCackler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Rancor.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Rancor.java
index ea2553ed72..c2515a1856 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Rancor.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Rancor.java
@@ -38,7 +38,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Reanimate.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Reanimate.java
index e4e68cbe8f..0db1e3cb5c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Reanimate.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Reanimate.java
@@ -37,7 +37,7 @@ public class Reanimate extends mage.sets.tempest.Reanimate {
 
     public Reanimate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ReliquaryTower.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ReliquaryTower.java
index ca26c4c5fb..14920622d8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ReliquaryTower.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ReliquaryTower.java
@@ -37,7 +37,7 @@ public class ReliquaryTower extends mage.sets.conflux.ReliquaryTower {
 
     public ReliquaryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Remand.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Remand.java
index 7947d7fbaf..118252aff4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Remand.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Remand.java
@@ -37,7 +37,7 @@ public class Remand extends mage.sets.ravnica.Remand {
 
     public Remand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Resurrection.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Resurrection.java
index 495245f3ba..7c8f66e577 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Resurrection.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Resurrection.java
@@ -37,7 +37,7 @@ public class Resurrection extends mage.sets.limitedalpha.Resurrection {
 
     public Resurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/RhoxWarMonk.java b/Mage.Sets/src/mage/sets/fridaynightmagic/RhoxWarMonk.java
index 8b3fb17c59..06cf80a273 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/RhoxWarMonk.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/RhoxWarMonk.java
@@ -37,7 +37,7 @@ public class RhoxWarMonk extends mage.sets.shardsofalara.RhoxWarMonk {
 
     public RhoxWarMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/RiftBolt.java b/Mage.Sets/src/mage/sets/fridaynightmagic/RiftBolt.java
index 30f3bff2e1..af4ea73c22 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/RiftBolt.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/RiftBolt.java
@@ -38,7 +38,7 @@ public class RiftBolt extends mage.sets.timespiral.RiftBolt {
 
     public RiftBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/RiverBoa.java b/Mage.Sets/src/mage/sets/fridaynightmagic/RiverBoa.java
index 00454ca1e1..430c51c820 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/RiverBoa.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/RiverBoa.java
@@ -37,7 +37,7 @@ public class RiverBoa extends mage.sets.zendikar.RiverBoa {
 
     public RiverBoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/RoarOfTheWurm.java b/Mage.Sets/src/mage/sets/fridaynightmagic/RoarOfTheWurm.java
index 025d509cfb..356206ffd4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/RoarOfTheWurm.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/RoarOfTheWurm.java
@@ -37,7 +37,7 @@ public class RoarOfTheWurm extends mage.sets.odyssey.RoarOfTheWurm {
 
     public RoarOfTheWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Roast.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Roast.java
index f3a5c42eb4..9c437bd7f6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Roast.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Roast.java
@@ -37,7 +37,7 @@ public class Roast extends mage.sets.dragonsoftarkir.Roast {
 
     public Roast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SakuraTribeElder.java
index 2981cced53..db5a5b033d 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SakuraTribeElder.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SakuraTribeElder.java
@@ -38,7 +38,7 @@ public class SakuraTribeElder extends mage.sets.championsofkamigawa.SakuraTribeE
 
     public SakuraTribeElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SavageLands.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SavageLands.java
index 6a1fb3c099..d0750cb597 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SavageLands.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SavageLands.java
@@ -37,7 +37,7 @@ public class SavageLands extends mage.sets.shardsofalara.SavageLands {
 
     public SavageLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Scragnoth.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Scragnoth.java
index ee3654bcb9..cc601df105 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Scragnoth.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Scragnoth.java
@@ -37,7 +37,7 @@ public class Scragnoth extends mage.sets.tempest.Scragnoth {
 
     public Scragnoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SealOfCleansing.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SealOfCleansing.java
index 1bb06c7343..bce19a2ac1 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SealOfCleansing.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SealOfCleansing.java
@@ -38,7 +38,7 @@ public class SealOfCleansing extends mage.sets.nemesis.SealOfCleansing {
 
     public SealOfCleansing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SearingSpear.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SearingSpear.java
index 97a125a2dd..d31f7967de 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SearingSpear.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SearingSpear.java
@@ -38,7 +38,7 @@ public class SearingSpear extends mage.sets.magic2013.SearingSpear {
 
     public SearingSpear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SerratedArrows.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SerratedArrows.java
index fc90c72527..48ebcf608a 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SerratedArrows.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SerratedArrows.java
@@ -38,7 +38,7 @@ public class SerratedArrows extends mage.sets.homelands.SerratedArrows {
 
     public SerratedArrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java
index 4a98857ee0..d110faad4c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java
@@ -37,7 +37,7 @@ public class SerumVisions extends mage.sets.fifthdawn.SerumVisions {
 
     public SerumVisions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Shock.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Shock.java
index 4efdc2bdd2..c89378bd42 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Shock.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Shock.java
@@ -38,7 +38,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ShrapnelBlast.java
index 8b43c46f3e..13ef6c344a 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ShrapnelBlast.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ShrapnelBlast.java
@@ -37,7 +37,7 @@ public class ShrapnelBlast extends mage.sets.mirrodin.ShrapnelBlast {
 
     public ShrapnelBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SilverKnight.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SilverKnight.java
index eea630985a..b6405f3171 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SilverKnight.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SilverKnight.java
@@ -37,7 +37,7 @@ public class SilverKnight extends mage.sets.knightsvsdragons.SilverKnight {
 
     public SilverKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SinCollector.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SinCollector.java
index 8e773ca27f..14918d042c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SinCollector.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SinCollector.java
@@ -37,7 +37,7 @@ public class SinCollector extends mage.sets.dragonsmaze.SinCollector {
     
     public SinCollector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "FNMP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SliceAndDice.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SliceAndDice.java
index d953ffa606..e9ba043ffd 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SliceAndDice.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SliceAndDice.java
@@ -37,7 +37,7 @@ public class SliceAndDice extends mage.sets.onslaught.SliceAndDice {
 
     public SliceAndDice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java
index f7713432a2..39b3a83690 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java
@@ -37,7 +37,7 @@ public class SmashToSmithereens extends mage.sets.shadowmoor.SmashToSmithereens
 
     public SmashToSmithereens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Smother.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Smother.java
index 62be0c8039..118b6c8e03 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Smother.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Smother.java
@@ -37,7 +37,7 @@ public class Smother extends mage.sets.worldwake.Smother {
 
     public Smother(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SoltariPriest.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SoltariPriest.java
index 0fbbc602a0..02c99721fd 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SoltariPriest.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SoltariPriest.java
@@ -37,7 +37,7 @@ public class SoltariPriest extends mage.sets.tempest.SoltariPriest {
 
     public SoltariPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Sparksmith.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Sparksmith.java
index 159517ebfa..96f6ccb448 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Sparksmith.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Sparksmith.java
@@ -38,7 +38,7 @@ public class Sparksmith extends mage.sets.onslaught.Sparksmith {
 
     public Sparksmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SpatialContortion.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SpatialContortion.java
index 7b615aa800..c6c2a88e1c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SpatialContortion.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SpatialContortion.java
@@ -37,7 +37,7 @@ public class SpatialContortion extends mage.sets.oathofthegatewatch.SpatialConto
 
     public SpatialContortion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SpellstutterSprite.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SpellstutterSprite.java
index 91ffc006e9..54ee495501 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SpellstutterSprite.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SpellstutterSprite.java
@@ -38,7 +38,7 @@ public class SpellstutterSprite extends mage.sets.lorwyn.SpellstutterSprite {
 
     public SpellstutterSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SpikeFeeder.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SpikeFeeder.java
index 3329abf389..944402f2d2 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SpikeFeeder.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SpikeFeeder.java
@@ -38,7 +38,7 @@ public class SpikeFeeder extends mage.sets.timeshifted.SpikeFeeder {
 
     public SpikeFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SquadronHawk.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SquadronHawk.java
index 8820253ebf..aee98ab934 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SquadronHawk.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SquadronHawk.java
@@ -38,7 +38,7 @@ public class SquadronHawk extends mage.sets.magic2011.SquadronHawk {
 
     public SquadronHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/StaunchDefenders.java b/Mage.Sets/src/mage/sets/fridaynightmagic/StaunchDefenders.java
index c4889262c2..04ab42fb47 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/StaunchDefenders.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/StaunchDefenders.java
@@ -37,7 +37,7 @@ public class StaunchDefenders extends mage.sets.tempest.StaunchDefenders {
 
     public StaunchDefenders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/StokeTheFlames.java b/Mage.Sets/src/mage/sets/fridaynightmagic/StokeTheFlames.java
index 2e875000fd..61d183331b 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/StokeTheFlames.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/StokeTheFlames.java
@@ -37,7 +37,7 @@ public class StokeTheFlames extends mage.sets.magic2015.StokeTheFlames {
 
     public StokeTheFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/StoneRain.java b/Mage.Sets/src/mage/sets/fridaynightmagic/StoneRain.java
index 9149f32de7..94233189c8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/StoneRain.java
@@ -38,7 +38,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SuspensionField.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SuspensionField.java
index a758f38654..50d48c7c57 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SuspensionField.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SuspensionField.java
@@ -37,7 +37,7 @@ public class SuspensionField extends mage.sets.khansoftarkir.SuspensionField {
 
     public SuspensionField(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SwordsToPlowshares.java
index f96f63bd39..803b2f9304 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SylvanScrying.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SylvanScrying.java
index 8f2f989672..031e1d8505 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/SylvanScrying.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SylvanScrying.java
@@ -37,7 +37,7 @@ public class SylvanScrying extends mage.sets.tenthedition.SylvanScrying {
 
     public SylvanScrying(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TectonicEdge.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TectonicEdge.java
index 5af5ba344e..2cecd30632 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TectonicEdge.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TectonicEdge.java
@@ -37,7 +37,7 @@ public class TectonicEdge extends mage.sets.worldwake.TectonicEdge {
 
     public TectonicEdge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TeeteringPeaks.java
index 4d141bcb9a..b064c78570 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TeeteringPeaks.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TeeteringPeaks.java
@@ -38,7 +38,7 @@ public class TeeteringPeaks extends mage.sets.zendikar.TeeteringPeaks {
 
     public TeeteringPeaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TendrilsOfAgony.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TendrilsOfAgony.java
index 3c0d8c4f64..bf4bc2f8b4 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TendrilsOfAgony.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TendrilsOfAgony.java
@@ -37,7 +37,7 @@ public class TendrilsOfAgony extends mage.sets.scourge.TendrilsOfAgony {
 
     public TendrilsOfAgony(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Terminate.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Terminate.java
index f2ae8e6e97..c8d0b256bb 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Terminate.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Terminate.java
@@ -38,7 +38,7 @@ public class Terminate extends mage.sets.alarareborn.Terminate {
 
     public Terminate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Terror.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Terror.java
index fe98b38586..e76d25c93f 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Terror.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Terror.java
@@ -38,7 +38,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ThirstForKnowledge.java
index 8283e602ef..82cef97352 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/ThirstForKnowledge.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ThirstForKnowledge.java
@@ -37,7 +37,7 @@ public class ThirstForKnowledge extends mage.sets.planechase.ThirstForKnowledge
 
     public ThirstForKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TidehollowSculler.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TidehollowSculler.java
index e6a36e0f5d..4c0232e5a6 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TidehollowSculler.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TidehollowSculler.java
@@ -37,7 +37,7 @@ public class TidehollowSculler extends mage.sets.shardsofalara.TidehollowSculler
 
     public TidehollowSculler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TormentedHero.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TormentedHero.java
index 10c9d0ec0f..11dc45db31 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TormentedHero.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TormentedHero.java
@@ -37,7 +37,7 @@ public class TormentedHero extends mage.sets.theros.TormentedHero {
 
     public TormentedHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TormodsCrypt.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TormodsCrypt.java
index 6535d7f380..b3cad283c0 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TormodsCrypt.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TormodsCrypt.java
@@ -38,7 +38,7 @@ public class TormodsCrypt extends mage.sets.timeshifted.TormodsCrypt {
 
     public TormodsCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/TreetopVillage.java b/Mage.Sets/src/mage/sets/fridaynightmagic/TreetopVillage.java
index bca2880e86..0414036a46 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/TreetopVillage.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/TreetopVillage.java
@@ -37,7 +37,7 @@ public class TreetopVillage extends mage.sets.tenthedition.TreetopVillage {
 
     public TreetopVillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/UltimatePrice.java b/Mage.Sets/src/mage/sets/fridaynightmagic/UltimatePrice.java
index a4e9057911..3f10a5f000 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/UltimatePrice.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/UltimatePrice.java
@@ -37,7 +37,7 @@ public class UltimatePrice extends mage.sets.returntoravnica.UltimatePrice {
 
     public UltimatePrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/fridaynightmagic/VolcanicGeyser.java
index bd34ba6d5a..1811ceecf0 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/VolcanicGeyser.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/VolcanicGeyser.java
@@ -37,7 +37,7 @@ public class VolcanicGeyser extends mage.sets.magic2013.VolcanicGeyser {
 
     public VolcanicGeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfBlossoms.java
index a4cfc9c55e..eb818a8309 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfBlossoms.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfBlossoms.java
@@ -37,7 +37,7 @@ public class WallOfBlossoms extends mage.sets.stronghold.WallOfBlossoms {
 
     public WallOfBlossoms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfOmens.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfOmens.java
index c7048a2767..8adfada308 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfOmens.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfOmens.java
@@ -37,7 +37,7 @@ public class WallOfOmens extends mage.sets.riseoftheeldrazi.WallOfOmens {
 
     public WallOfOmens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfRoots.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfRoots.java
index fbd723b2fa..a72084df97 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfRoots.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WallOfRoots.java
@@ -38,7 +38,7 @@ public class WallOfRoots extends mage.sets.timeshifted.WallOfRoots {
 
     public WallOfRoots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WarleadersHelix.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WarleadersHelix.java
index 89a0754020..16be62320c 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WarleadersHelix.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WarleadersHelix.java
@@ -37,7 +37,7 @@ public class WarleadersHelix extends mage.sets.dragonsmaze.WarleadersHelix {
 
     public WarleadersHelix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Watchwolf.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Watchwolf.java
index a7c990e918..79c7f08f46 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Watchwolf.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Watchwolf.java
@@ -37,7 +37,7 @@ public class Watchwolf extends mage.sets.ravnica.Watchwolf {
 
     public Watchwolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Whipcorder.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Whipcorder.java
index f987f8d353..3501da4b8a 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Whipcorder.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Whipcorder.java
@@ -37,7 +37,7 @@ public class Whipcorder extends mage.sets.onslaught.Whipcorder {
 
     public Whipcorder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WhiteKnight.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WhiteKnight.java
index c45dcd2e0d..b96ec4e072 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WildMongrel.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WildMongrel.java
index 6bc49b2d61..091a19f512 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WildMongrel.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WildMongrel.java
@@ -38,7 +38,7 @@ public class WildMongrel extends mage.sets.odyssey.WildMongrel {
 
     public WildMongrel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WildNacatl.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WildNacatl.java
index ec8b13d0de..c6b99137b8 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WildNacatl.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WildNacatl.java
@@ -38,7 +38,7 @@ public class WildNacatl extends mage.sets.shardsofalara.WildNacatl {
 
     public WildNacatl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "FNMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Willbender.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Willbender.java
index 7494cc5255..5603939f18 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Willbender.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Willbender.java
@@ -37,7 +37,7 @@ public class Willbender extends mage.sets.commander2014.Willbender {
 
     public Willbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WingShards.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WingShards.java
index 895006c3d9..b3207d1e28 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WingShards.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WingShards.java
@@ -37,7 +37,7 @@ public class WingShards extends mage.sets.scourge.WingShards {
 
     public WingShards(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WitheredWretch.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WitheredWretch.java
index 150fb0a151..c1c943b386 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WitheredWretch.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WitheredWretch.java
@@ -37,7 +37,7 @@ public class WitheredWretch extends mage.sets.planechase.WitheredWretch {
 
     public WitheredWretch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/Wonder.java b/Mage.Sets/src/mage/sets/fridaynightmagic/Wonder.java
index 4573b403c2..6c651a7afa 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/Wonder.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/Wonder.java
@@ -37,7 +37,7 @@ public class Wonder extends mage.sets.judgment.Wonder {
 
     public Wonder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/WrensRunVanquisher.java b/Mage.Sets/src/mage/sets/fridaynightmagic/WrensRunVanquisher.java
index 87b6414e74..1df5bbd725 100644
--- a/Mage.Sets/src/mage/sets/fridaynightmagic/WrensRunVanquisher.java
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/WrensRunVanquisher.java
@@ -37,7 +37,7 @@ public class WrensRunVanquisher extends mage.sets.lorwyn.WrensRunVanquisher {
 
     public WrensRunVanquisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "FNMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfFury.java b/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfFury.java
index fef9a68257..21b0991b75 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfFury.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfFury.java
@@ -38,7 +38,7 @@ public class AkromaAngelOfFury extends mage.sets.commander.AkromaAngelOfFury {
 
     public AkromaAngelOfFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfWrath.java
index 79849812f9..3d1082fc00 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfWrath.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/AkromaAngelOfWrath.java
@@ -38,7 +38,7 @@ public class AkromaAngelOfWrath extends mage.sets.timeshifted.AkromaAngelOfWrath
 
     public AkromaAngelOfWrath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/AureliaTheWarleader.java b/Mage.Sets/src/mage/sets/ftvangels/AureliaTheWarleader.java
index d52f76988d..eb457f41de 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/AureliaTheWarleader.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/AureliaTheWarleader.java
@@ -37,7 +37,7 @@ public class AureliaTheWarleader extends mage.sets.gatecrash.AureliaTheWarleader
 
     public AureliaTheWarleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/AvacynAngelOfHope.java b/Mage.Sets/src/mage/sets/ftvangels/AvacynAngelOfHope.java
index 15fe6961ab..7d0c616466 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/AvacynAngelOfHope.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/AvacynAngelOfHope.java
@@ -37,7 +37,7 @@ public class AvacynAngelOfHope extends mage.sets.avacynrestored.AvacynAngelOfHop
 
     public AvacynAngelOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/ftvangels/BaneslayerAngel.java
index 638203f7bd..0e3189d0aa 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/BaneslayerAngel.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/BaneslayerAngel.java
@@ -37,7 +37,7 @@ public class BaneslayerAngel extends mage.sets.magic2010.BaneslayerAngel {
 
     public BaneslayerAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/EntreatTheAngels.java b/Mage.Sets/src/mage/sets/ftvangels/EntreatTheAngels.java
index e0551dd032..4ab66c0151 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/EntreatTheAngels.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/EntreatTheAngels.java
@@ -37,7 +37,7 @@ public class EntreatTheAngels extends mage.sets.avacynrestored.EntreatTheAngels
 
     public EntreatTheAngels(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/ExaltedAngel.java b/Mage.Sets/src/mage/sets/ftvangels/ExaltedAngel.java
index c5536b6cb3..69e2abf3b5 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/ExaltedAngel.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/ExaltedAngel.java
@@ -38,7 +38,7 @@ public class ExaltedAngel extends mage.sets.onslaught.ExaltedAngel {
 
     public ExaltedAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/sets/ftvangels/IonaShieldOfEmeria.java
index 498697ebd3..8ddd649641 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/IonaShieldOfEmeria.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/IonaShieldOfEmeria.java
@@ -37,7 +37,7 @@ public class IonaShieldOfEmeria extends mage.sets.zendikar.IonaShieldOfEmeria {
 
     public IonaShieldOfEmeria(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/IridescentAngel.java b/Mage.Sets/src/mage/sets/ftvangels/IridescentAngel.java
index 6e1999d1cb..410660fb0e 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/IridescentAngel.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/IridescentAngel.java
@@ -38,7 +38,7 @@ public class IridescentAngel extends mage.sets.odyssey.IridescentAngel {
 
     public IridescentAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/JenaraAsuraOfWar.java b/Mage.Sets/src/mage/sets/ftvangels/JenaraAsuraOfWar.java
index 53c80937a6..0f6fa1497e 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/JenaraAsuraOfWar.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/JenaraAsuraOfWar.java
@@ -37,7 +37,7 @@ public class JenaraAsuraOfWar extends mage.sets.alarareborn.JenaraAsuraOfWar {
 
     public JenaraAsuraOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvangels/LightningAngel.java b/Mage.Sets/src/mage/sets/ftvangels/LightningAngel.java
index 1b78d96256..41869de72e 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/LightningAngel.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/LightningAngel.java
@@ -38,7 +38,7 @@ public class LightningAngel extends mage.sets.apocalypse.LightningAngel {
 
     public LightningAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/PlatinumAngel.java b/Mage.Sets/src/mage/sets/ftvangels/PlatinumAngel.java
index 7a4a5812c1..04e28101b7 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/PlatinumAngel.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/PlatinumAngel.java
@@ -38,7 +38,7 @@ public class PlatinumAngel extends mage.sets.tenthedition.PlatinumAngel {
 
     public PlatinumAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/SerraAngel.java b/Mage.Sets/src/mage/sets/ftvangels/SerraAngel.java
index f9db2c50cc..b889b64970 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V15";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvangels/TarielReckonerOfSouls.java b/Mage.Sets/src/mage/sets/ftvangels/TarielReckonerOfSouls.java
index e63b716a94..2901ecf334 100644
--- a/Mage.Sets/src/mage/sets/ftvangels/TarielReckonerOfSouls.java
+++ b/Mage.Sets/src/mage/sets/ftvangels/TarielReckonerOfSouls.java
@@ -37,7 +37,7 @@ public class TarielReckonerOfSouls extends mage.sets.commander.TarielReckonerOfS
 
     public TarielReckonerOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/Armageddon.java b/Mage.Sets/src/mage/sets/ftvannihilation/Armageddon.java
index a47d24d3bb..5e7c33fd85 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/Armageddon.java
@@ -38,7 +38,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/BurningOfXinye.java b/Mage.Sets/src/mage/sets/ftvannihilation/BurningOfXinye.java
index 3c8648373d..e1a4ac6300 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/BurningOfXinye.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/BurningOfXinye.java
@@ -38,7 +38,7 @@ public class BurningOfXinye extends mage.sets.portalthreekingdoms.BurningOfXinye
 
     public BurningOfXinye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/Cataclysm.java b/Mage.Sets/src/mage/sets/ftvannihilation/Cataclysm.java
index 602999494a..66891bba30 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/Cataclysm.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/Cataclysm.java
@@ -38,7 +38,7 @@ public class Cataclysm extends mage.sets.exodus.Cataclysm {
 
     public Cataclysm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/ChildOfAlara.java b/Mage.Sets/src/mage/sets/ftvannihilation/ChildOfAlara.java
index f7b3af2428..60cf9d0ce4 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/ChildOfAlara.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/ChildOfAlara.java
@@ -37,7 +37,7 @@ public class ChildOfAlara extends mage.sets.conflux.ChildOfAlara {
 
     public ChildOfAlara(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/DecreeOfAnnihilation.java b/Mage.Sets/src/mage/sets/ftvannihilation/DecreeOfAnnihilation.java
index 0b82487859..a999cf44b3 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/DecreeOfAnnihilation.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/DecreeOfAnnihilation.java
@@ -38,7 +38,7 @@ public class DecreeOfAnnihilation extends mage.sets.scourge.DecreeOfAnnihilation
 
     public DecreeOfAnnihilation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/Firespout.java b/Mage.Sets/src/mage/sets/ftvannihilation/Firespout.java
index 1c9f7a8597..b574333d7d 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/Firespout.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/Firespout.java
@@ -38,7 +38,7 @@ public class Firespout extends mage.sets.shadowmoor.Firespout {
 
     public Firespout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/FracturingGust.java b/Mage.Sets/src/mage/sets/ftvannihilation/FracturingGust.java
index 8ebde96faa..9b70048d21 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/FracturingGust.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/FracturingGust.java
@@ -38,7 +38,7 @@ public class FracturingGust extends mage.sets.shadowmoor.FracturingGust {
 
     public FracturingGust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/LivingDeath.java b/Mage.Sets/src/mage/sets/ftvannihilation/LivingDeath.java
index 9c8dcd4d9a..c895b0a7cf 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/LivingDeath.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/LivingDeath.java
@@ -38,7 +38,7 @@ public class LivingDeath extends mage.sets.tempest.LivingDeath {
 
     public LivingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/MartialCoup.java b/Mage.Sets/src/mage/sets/ftvannihilation/MartialCoup.java
index 925caa3b4d..7e5d8cbb42 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/MartialCoup.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/MartialCoup.java
@@ -38,7 +38,7 @@ public class MartialCoup extends mage.sets.conflux.MartialCoup {
 
     public MartialCoup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/RollingEarthquake.java b/Mage.Sets/src/mage/sets/ftvannihilation/RollingEarthquake.java
index 6c29c8666c..3ce3a1f698 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/RollingEarthquake.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/RollingEarthquake.java
@@ -38,7 +38,7 @@ public class RollingEarthquake extends mage.sets.portalthreekingdoms.RollingEart
 
     public RollingEarthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/Smokestack.java b/Mage.Sets/src/mage/sets/ftvannihilation/Smokestack.java
index 171931c2cf..4d4e5812bd 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/Smokestack.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/Smokestack.java
@@ -38,7 +38,7 @@ public class Smokestack extends mage.sets.urzassaga.Smokestack {
 
     public Smokestack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/Terminus.java b/Mage.Sets/src/mage/sets/ftvannihilation/Terminus.java
index d188a51c3c..46d6297cf6 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/Terminus.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/Terminus.java
@@ -38,7 +38,7 @@ public class Terminus extends mage.sets.avacynrestored.Terminus {
 
     public Terminus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/Upheaval.java b/Mage.Sets/src/mage/sets/ftvannihilation/Upheaval.java
index b945557129..15e0409cbc 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/Upheaval.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/Upheaval.java
@@ -38,7 +38,7 @@ public class Upheaval extends mage.sets.odyssey.Upheaval {
 
     public Upheaval(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/VirtuesRuin.java b/Mage.Sets/src/mage/sets/ftvannihilation/VirtuesRuin.java
index 44a7501e21..df673217b7 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/VirtuesRuin.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/VirtuesRuin.java
@@ -38,7 +38,7 @@ public class VirtuesRuin extends mage.sets.portal.VirtuesRuin {
 
     public VirtuesRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvannihilation/WrathOfGod.java b/Mage.Sets/src/mage/sets/ftvannihilation/WrathOfGod.java
index 363676fbdf..4cfda995fe 100644
--- a/Mage.Sets/src/mage/sets/ftvannihilation/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/ftvannihilation/WrathOfGod.java
@@ -38,7 +38,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/BladewingTheRisen.java b/Mage.Sets/src/mage/sets/ftvdragons/BladewingTheRisen.java
index e87b234706..46aba59122 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/BladewingTheRisen.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/BladewingTheRisen.java
@@ -37,7 +37,7 @@ public class BladewingTheRisen extends mage.sets.commander.BladewingTheRisen {
 
     public BladewingTheRisen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/BogardanHellkite.java b/Mage.Sets/src/mage/sets/ftvdragons/BogardanHellkite.java
index 8923a22d33..443f682d3a 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/BogardanHellkite.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/BogardanHellkite.java
@@ -38,7 +38,7 @@ public class BogardanHellkite extends mage.sets.magic2010.BogardanHellkite {
 
     public BogardanHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DRB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/DragonWhelp.java b/Mage.Sets/src/mage/sets/ftvdragons/DragonWhelp.java
index 42e9493711..3118a4feb8 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/DragonWhelp.java
@@ -38,7 +38,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DRB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/Dragonstorm.java b/Mage.Sets/src/mage/sets/ftvdragons/Dragonstorm.java
index e4f294c956..4cdd58c6bc 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/Dragonstorm.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/Dragonstorm.java
@@ -38,7 +38,7 @@ public class Dragonstorm extends mage.sets.timeshifted.Dragonstorm {
 
     public Dragonstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DRB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/FormOfTheDragon.java b/Mage.Sets/src/mage/sets/ftvdragons/FormOfTheDragon.java
index 20a0ff78f1..d2b2cb08c1 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/FormOfTheDragon.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/FormOfTheDragon.java
@@ -37,7 +37,7 @@ public class FormOfTheDragon extends mage.sets.scourge.FormOfTheDragon {
 
     public FormOfTheDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/HellkiteOverlord.java b/Mage.Sets/src/mage/sets/ftvdragons/HellkiteOverlord.java
index 47e5aa4160..38088376f4 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/HellkiteOverlord.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/HellkiteOverlord.java
@@ -38,7 +38,7 @@ public class HellkiteOverlord extends mage.sets.shardsofalara.HellkiteOverlord {
 
     public HellkiteOverlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DRB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/KokushoTheEveningStar.java b/Mage.Sets/src/mage/sets/ftvdragons/KokushoTheEveningStar.java
index c2905c3dd8..e8e62da2c9 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/KokushoTheEveningStar.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/KokushoTheEveningStar.java
@@ -37,7 +37,7 @@ public class KokushoTheEveningStar extends mage.sets.championsofkamigawa.Kokusho
 
     public KokushoTheEveningStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/NicolBolas.java b/Mage.Sets/src/mage/sets/ftvdragons/NicolBolas.java
index 4f732e7036..30d06a4dae 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/NicolBolas.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/NicolBolas.java
@@ -37,7 +37,7 @@ public class NicolBolas extends mage.sets.legends.NicolBolas {
 
     public NicolBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/ftvdragons/NivMizzetTheFiremind.java
index fdad374cb9..4f2379b21b 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/NivMizzetTheFiremind.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/NivMizzetTheFiremind.java
@@ -37,7 +37,7 @@ public class NivMizzetTheFiremind extends mage.sets.guildpact.NivMizzetTheFiremi
 
     public NivMizzetTheFiremind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/RithTheAwakener.java b/Mage.Sets/src/mage/sets/ftvdragons/RithTheAwakener.java
index dde9e08356..1b5337731d 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/RithTheAwakener.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/RithTheAwakener.java
@@ -37,7 +37,7 @@ public class RithTheAwakener extends mage.sets.invasion.RithTheAwakener {
 
     public RithTheAwakener(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/ShivanDragon.java b/Mage.Sets/src/mage/sets/ftvdragons/ShivanDragon.java
index 6d2e8ae3f3..5d16623838 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/ThunderDragon.java b/Mage.Sets/src/mage/sets/ftvdragons/ThunderDragon.java
index 14b026c5d5..0f66d9183e 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/ThunderDragon.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/ThunderDragon.java
@@ -37,7 +37,7 @@ public class ThunderDragon extends mage.sets.starter1999.ThunderDragon {
 
     public ThunderDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvdragons/TwoHeadedDragon.java b/Mage.Sets/src/mage/sets/ftvdragons/TwoHeadedDragon.java
index 00cf7d12dd..e7128020c2 100644
--- a/Mage.Sets/src/mage/sets/ftvdragons/TwoHeadedDragon.java
+++ b/Mage.Sets/src/mage/sets/ftvdragons/TwoHeadedDragon.java
@@ -37,7 +37,7 @@ public class TwoHeadedDragon extends mage.sets.mercadianmasques.TwoHeadedDragon
 
     public TwoHeadedDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DRB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Balance.java b/Mage.Sets/src/mage/sets/ftvexiled/Balance.java
index 962ea02889..f7981d8a77 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Balance.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Balance.java
@@ -38,7 +38,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Berserk.java b/Mage.Sets/src/mage/sets/ftvexiled/Berserk.java
index 160c2f3fb7..526aefb8d2 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Berserk.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Berserk.java
@@ -38,7 +38,7 @@ public class Berserk extends mage.sets.limitedalpha.Berserk {
 
     public Berserk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Channel.java b/Mage.Sets/src/mage/sets/ftvexiled/Channel.java
index fd4fd69816..73fce7455b 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Channel.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Channel.java
@@ -38,7 +38,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/GiftsUngiven.java b/Mage.Sets/src/mage/sets/ftvexiled/GiftsUngiven.java
index eb6e9df7fc..c67326c76b 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/GiftsUngiven.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/GiftsUngiven.java
@@ -38,7 +38,7 @@ public class GiftsUngiven extends mage.sets.championsofkamigawa.GiftsUngiven {
 
     public GiftsUngiven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/GoblinLackey.java b/Mage.Sets/src/mage/sets/ftvexiled/GoblinLackey.java
index 9890d31d18..bf31834443 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/GoblinLackey.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/GoblinLackey.java
@@ -38,7 +38,7 @@ public class GoblinLackey extends mage.sets.urzassaga.GoblinLackey {
 
     public GoblinLackey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/KirdApe.java b/Mage.Sets/src/mage/sets/ftvexiled/KirdApe.java
index 5b9edab54f..692210badc 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/KirdApe.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/KirdApe.java
@@ -38,7 +38,7 @@ public class KirdApe extends mage.sets.ninthedition.KirdApe {
 
     public KirdApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/LotusPetal.java b/Mage.Sets/src/mage/sets/ftvexiled/LotusPetal.java
index 8f5bb8d425..811d8a26ae 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/LotusPetal.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/LotusPetal.java
@@ -38,7 +38,7 @@ public class LotusPetal extends mage.sets.tempest.LotusPetal {
 
     public LotusPetal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/MysticalTutor.java b/Mage.Sets/src/mage/sets/ftvexiled/MysticalTutor.java
index c54fddd013..a31a68b452 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/MysticalTutor.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/MysticalTutor.java
@@ -38,7 +38,7 @@ public class MysticalTutor extends mage.sets.mirage.MysticalTutor {
 
     public MysticalTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Necropotence.java b/Mage.Sets/src/mage/sets/ftvexiled/Necropotence.java
index 4296fc13df..156b37529f 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Necropotence.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Necropotence.java
@@ -38,7 +38,7 @@ public class Necropotence extends mage.sets.iceage.Necropotence {
 
     public Necropotence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/SenseisDiviningTop.java b/Mage.Sets/src/mage/sets/ftvexiled/SenseisDiviningTop.java
index f98791661e..8b1d4b3782 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/SenseisDiviningTop.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/SenseisDiviningTop.java
@@ -38,7 +38,7 @@ public class SenseisDiviningTop extends mage.sets.championsofkamigawa.SenseisDiv
 
     public SenseisDiviningTop(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/SerendibEfreet.java b/Mage.Sets/src/mage/sets/ftvexiled/SerendibEfreet.java
index fd8fde59fb..a1ca06e638 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/SerendibEfreet.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/SerendibEfreet.java
@@ -38,7 +38,7 @@ public class SerendibEfreet extends mage.sets.vintagemasters.SerendibEfreet {
 
     public SerendibEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Skullclamp.java b/Mage.Sets/src/mage/sets/ftvexiled/Skullclamp.java
index f34aaf2970..fe891ff1cf 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Skullclamp.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Skullclamp.java
@@ -38,7 +38,7 @@ public class Skullclamp extends mage.sets.darksteel.Skullclamp {
 
     public Skullclamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/StripMine.java b/Mage.Sets/src/mage/sets/ftvexiled/StripMine.java
index ef5e64bd3e..6a9588fc17 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/StripMine.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/StripMine.java
@@ -38,7 +38,7 @@ public class StripMine extends mage.sets.fourthedition.StripMine {
 
     public StripMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Tinker.java b/Mage.Sets/src/mage/sets/ftvexiled/Tinker.java
index f47db2c3bd..5b77692471 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Tinker.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Tinker.java
@@ -38,7 +38,7 @@ public class Tinker extends mage.sets.urzaslegacy.Tinker {
 
     public Tinker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvexiled/Trinisphere.java b/Mage.Sets/src/mage/sets/ftvexiled/Trinisphere.java
index c49fb08183..c32802145c 100644
--- a/Mage.Sets/src/mage/sets/ftvexiled/Trinisphere.java
+++ b/Mage.Sets/src/mage/sets/ftvexiled/Trinisphere.java
@@ -38,7 +38,7 @@ public class Trinisphere extends mage.sets.darksteel.Trinisphere {
 
     public Trinisphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/CaoCaoLordOfWei.java b/Mage.Sets/src/mage/sets/ftvlegends/CaoCaoLordOfWei.java
index 920543528f..e0cd0e79d7 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/CaoCaoLordOfWei.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/CaoCaoLordOfWei.java
@@ -38,7 +38,7 @@ public class CaoCaoLordOfWei extends mage.sets.portalthreekingdoms.CaoCaoLordOfW
 
     public CaoCaoLordOfWei(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/CaptainSisay.java b/Mage.Sets/src/mage/sets/ftvlegends/CaptainSisay.java
index 49c88665f3..89a1537e88 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/CaptainSisay.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/CaptainSisay.java
@@ -38,7 +38,7 @@ public class CaptainSisay extends mage.sets.invasion.CaptainSisay {
 
     public CaptainSisay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/DoranTheSiegeTower.java b/Mage.Sets/src/mage/sets/ftvlegends/DoranTheSiegeTower.java
index 2f21355fcf..bb577c5ef6 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/DoranTheSiegeTower.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/DoranTheSiegeTower.java
@@ -38,7 +38,7 @@ public class DoranTheSiegeTower extends mage.sets.lorwyn.DoranTheSiegeTower {
 
     public DoranTheSiegeTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/sets/ftvlegends/KikiJikiMirrorBreaker.java
index abe7103268..997f97f37b 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/KikiJikiMirrorBreaker.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/KikiJikiMirrorBreaker.java
@@ -38,7 +38,7 @@ public class KikiJikiMirrorBreaker extends mage.sets.championsofkamigawa.KikiJik
 
     public KikiJikiMirrorBreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/KreshTheBloodbraided.java b/Mage.Sets/src/mage/sets/ftvlegends/KreshTheBloodbraided.java
index aa164c2204..f6e3c0c68d 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/KreshTheBloodbraided.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/KreshTheBloodbraided.java
@@ -37,7 +37,7 @@ public class KreshTheBloodbraided extends mage.sets.shardsofalara.KreshTheBloodb
 
     public KreshTheBloodbraided(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/MikaeusTheLunarch.java b/Mage.Sets/src/mage/sets/ftvlegends/MikaeusTheLunarch.java
index 3c97e92939..e40fec3d0e 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/MikaeusTheLunarch.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/MikaeusTheLunarch.java
@@ -37,7 +37,7 @@ public class MikaeusTheLunarch extends mage.sets.innistrad.MikaeusTheLunarch {
 
     public MikaeusTheLunarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/OmnathLocusOfMana.java b/Mage.Sets/src/mage/sets/ftvlegends/OmnathLocusOfMana.java
index 4e0ca544e1..aac414cd99 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/OmnathLocusOfMana.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/OmnathLocusOfMana.java
@@ -37,7 +37,7 @@ public class OmnathLocusOfMana extends mage.sets.worldwake.OmnathLocusOfMana {
 
     public OmnathLocusOfMana(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/sets/ftvlegends/OonaQueenOfTheFae.java
index 43111261ba..a9f2941071 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/OonaQueenOfTheFae.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/OonaQueenOfTheFae.java
@@ -38,7 +38,7 @@ public class OonaQueenOfTheFae extends mage.sets.shadowmoor.OonaQueenOfTheFae {
 
     public OonaQueenOfTheFae(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/Progenitus.java b/Mage.Sets/src/mage/sets/ftvlegends/Progenitus.java
index a5b3739eae..5189541d19 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/Progenitus.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/Progenitus.java
@@ -37,7 +37,7 @@ public class Progenitus extends mage.sets.conflux.Progenitus {
 
     public Progenitus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/ftvlegends/RafiqOfTheMany.java
index 9b6a886551..70290620c2 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/RafiqOfTheMany.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/RafiqOfTheMany.java
@@ -37,7 +37,7 @@ public class RafiqOfTheMany extends mage.sets.shardsofalara.RafiqOfTheMany {
 
     public RafiqOfTheMany(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/SharuumTheHegemon.java b/Mage.Sets/src/mage/sets/ftvlegends/SharuumTheHegemon.java
index b8f2c7b585..2c9876dcb9 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/SharuumTheHegemon.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/SharuumTheHegemon.java
@@ -37,7 +37,7 @@ public class SharuumTheHegemon extends mage.sets.shardsofalara.SharuumTheHegemon
 
     public SharuumTheHegemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/SunQuanLordOfWu.java b/Mage.Sets/src/mage/sets/ftvlegends/SunQuanLordOfWu.java
index 9b9370bbbe..d79104fdb3 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/SunQuanLordOfWu.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/SunQuanLordOfWu.java
@@ -38,7 +38,7 @@ public class SunQuanLordOfWu extends mage.sets.portalthreekingdoms.SunQuanLordOf
 
     public SunQuanLordOfWu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/TeferiMageOfZhalfir.java b/Mage.Sets/src/mage/sets/ftvlegends/TeferiMageOfZhalfir.java
index 665932cb3e..e31898d1c4 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/TeferiMageOfZhalfir.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/TeferiMageOfZhalfir.java
@@ -38,7 +38,7 @@ public class TeferiMageOfZhalfir extends mage.sets.timespiral.TeferiMageOfZhalfi
 
     public TeferiMageOfZhalfir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/sets/ftvlegends/UlamogTheInfiniteGyre.java
index 88f3d30321..7a6791f378 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/UlamogTheInfiniteGyre.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/UlamogTheInfiniteGyre.java
@@ -37,7 +37,7 @@ public class UlamogTheInfiniteGyre extends mage.sets.riseoftheeldrazi.UlamogTheI
 
     public UlamogTheInfiniteGyre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvlegends/VisaraTheDreadful.java b/Mage.Sets/src/mage/sets/ftvlegends/VisaraTheDreadful.java
index 1489c760b0..bcb2662d7d 100644
--- a/Mage.Sets/src/mage/sets/ftvlegends/VisaraTheDreadful.java
+++ b/Mage.Sets/src/mage/sets/ftvlegends/VisaraTheDreadful.java
@@ -38,7 +38,7 @@ public class VisaraTheDreadful extends mage.sets.onslaught.VisaraTheDreadful {
 
     public VisaraTheDreadful(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/AncientTomb.java b/Mage.Sets/src/mage/sets/ftvrealms/AncientTomb.java
index 0025ee6d42..138432f0c9 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/AncientTomb.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/AncientTomb.java
@@ -38,7 +38,7 @@ public class AncientTomb extends mage.sets.tempest.AncientTomb {
 
     public AncientTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/BoseijuWhoSheltersAll.java b/Mage.Sets/src/mage/sets/ftvrealms/BoseijuWhoSheltersAll.java
index 9f021d4368..2b9bec615d 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/BoseijuWhoSheltersAll.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/BoseijuWhoSheltersAll.java
@@ -38,7 +38,7 @@ public class BoseijuWhoSheltersAll extends mage.sets.championsofkamigawa.Boseiju
 
     public BoseijuWhoSheltersAll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/CephalidColiseum.java b/Mage.Sets/src/mage/sets/ftvrealms/CephalidColiseum.java
index 2ebc510c41..70e69a03d2 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/CephalidColiseum.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/CephalidColiseum.java
@@ -38,7 +38,7 @@ public class CephalidColiseum extends mage.sets.odyssey.CephalidColiseum {
 
     public CephalidColiseum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/Desert.java b/Mage.Sets/src/mage/sets/ftvrealms/Desert.java
index 4d4f3426c5..daece255af 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/Desert.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/Desert.java
@@ -38,7 +38,7 @@ public class Desert extends mage.sets.timeshifted.Desert {
 
     public Desert(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/DryadArbor.java b/Mage.Sets/src/mage/sets/ftvrealms/DryadArbor.java
index 2bfc29dc19..aa90a4b285 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/DryadArbor.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/DryadArbor.java
@@ -38,7 +38,7 @@ public class DryadArbor extends mage.sets.futuresight.DryadArbor {
 
     public DryadArbor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/ForbiddenOrchard.java b/Mage.Sets/src/mage/sets/ftvrealms/ForbiddenOrchard.java
index 730a2b5bbd..0182b6175e 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/ForbiddenOrchard.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/ForbiddenOrchard.java
@@ -38,7 +38,7 @@ public class ForbiddenOrchard extends mage.sets.championsofkamigawa.ForbiddenOrc
 
     public ForbiddenOrchard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/GlacialChasm.java b/Mage.Sets/src/mage/sets/ftvrealms/GlacialChasm.java
index 9c24025121..c0316d162f 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/GlacialChasm.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/GlacialChasm.java
@@ -38,7 +38,7 @@ public class GlacialChasm extends mage.sets.iceage.GlacialChasm {
 
     public GlacialChasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/GroveOfTheBurnwillows.java b/Mage.Sets/src/mage/sets/ftvrealms/GroveOfTheBurnwillows.java
index 224a36db46..aa903e6e22 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/GroveOfTheBurnwillows.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/GroveOfTheBurnwillows.java
@@ -38,7 +38,7 @@ public class GroveOfTheBurnwillows extends mage.sets.futuresight.GroveOfTheBurnw
 
     public GroveOfTheBurnwillows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/HighMarket.java b/Mage.Sets/src/mage/sets/ftvrealms/HighMarket.java
index bb675c54bd..a632b3fa94 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/HighMarket.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/HighMarket.java
@@ -38,7 +38,7 @@ public class HighMarket extends mage.sets.mercadianmasques.HighMarket {
 
     public HighMarket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/MazeOfIth.java b/Mage.Sets/src/mage/sets/ftvrealms/MazeOfIth.java
index adde3f7a36..983c4a3d9f 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/MazeOfIth.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/MazeOfIth.java
@@ -38,7 +38,7 @@ public class MazeOfIth extends mage.sets.thedark.MazeOfIth {
 
     public MazeOfIth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/MurmuringBosk.java b/Mage.Sets/src/mage/sets/ftvrealms/MurmuringBosk.java
index 03fe0b6eb1..97031febf7 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/MurmuringBosk.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/MurmuringBosk.java
@@ -38,7 +38,7 @@ public class MurmuringBosk extends mage.sets.morningtide.MurmuringBosk {
 
     public MurmuringBosk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/ShivanGorge.java b/Mage.Sets/src/mage/sets/ftvrealms/ShivanGorge.java
index 2246bdb992..d395cf46d1 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/ShivanGorge.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/ShivanGorge.java
@@ -38,7 +38,7 @@ public class ShivanGorge extends mage.sets.urzassaga.ShivanGorge {
 
     public ShivanGorge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/UrborgTombOfYawgmoth.java b/Mage.Sets/src/mage/sets/ftvrealms/UrborgTombOfYawgmoth.java
index 72de46bb3a..be006b7aff 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/UrborgTombOfYawgmoth.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/UrborgTombOfYawgmoth.java
@@ -38,7 +38,7 @@ public class UrborgTombOfYawgmoth extends mage.sets.planarchaos.UrborgTombOfYawg
 
     public UrborgTombOfYawgmoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/Vesuva.java b/Mage.Sets/src/mage/sets/ftvrealms/Vesuva.java
index d59227f17f..69d7b0ed56 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/Vesuva.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/Vesuva.java
@@ -38,7 +38,7 @@ public class Vesuva extends mage.sets.timespiral.Vesuva {
 
     public Vesuva(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrealms/WindbriskHeights.java b/Mage.Sets/src/mage/sets/ftvrealms/WindbriskHeights.java
index 2bd3113198..955d68d9e8 100644
--- a/Mage.Sets/src/mage/sets/ftvrealms/WindbriskHeights.java
+++ b/Mage.Sets/src/mage/sets/ftvrealms/WindbriskHeights.java
@@ -38,7 +38,7 @@ public class WindbriskHeights extends mage.sets.lorwyn.WindbriskHeights {
 
     public WindbriskHeights(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V12";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java b/Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java
index 6d34970975..8bb4af5e0c 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java
@@ -38,7 +38,7 @@ public class AEtherVial extends mage.sets.darksteel.AEtherVial {
 
     public AEtherVial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/BlackVise.java b/Mage.Sets/src/mage/sets/ftvrelics/BlackVise.java
index 45efc20925..4771609be4 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/BlackVise.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/BlackVise.java
@@ -38,7 +38,7 @@ public class BlackVise extends mage.sets.limitedalpha.BlackVise {
 
     public BlackVise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/IsochronScepter.java b/Mage.Sets/src/mage/sets/ftvrelics/IsochronScepter.java
index adf1b9f6db..b1af1e141c 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/IsochronScepter.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/IsochronScepter.java
@@ -38,7 +38,7 @@ public class IsochronScepter extends mage.sets.mirrodin.IsochronScepter {
 
     public IsochronScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/IvoryTower.java b/Mage.Sets/src/mage/sets/ftvrelics/IvoryTower.java
index f91da07170..119822a53d 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/IvoryTower.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/IvoryTower.java
@@ -38,7 +38,7 @@ public class IvoryTower extends mage.sets.antiquities.IvoryTower {
 
     public IvoryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/JestersCap.java b/Mage.Sets/src/mage/sets/ftvrelics/JestersCap.java
index 0cbca1e3a9..4dcc47ae90 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/JestersCap.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/JestersCap.java
@@ -38,7 +38,7 @@ public class JestersCap extends mage.sets.fifthedition.JestersCap {
 
     public JestersCap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/KarnSilverGolem.java b/Mage.Sets/src/mage/sets/ftvrelics/KarnSilverGolem.java
index 96000dfb3a..7e5d0fdf07 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/KarnSilverGolem.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/KarnSilverGolem.java
@@ -38,7 +38,7 @@ public class KarnSilverGolem extends mage.sets.urzassaga.KarnSilverGolem {
 
     public KarnSilverGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/Masticore.java b/Mage.Sets/src/mage/sets/ftvrelics/Masticore.java
index b67ce86768..864d01c06f 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/Masticore.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/Masticore.java
@@ -38,7 +38,7 @@ public class Masticore extends mage.sets.urzasdestiny.Masticore {
 
     public Masticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/MemoryJar.java b/Mage.Sets/src/mage/sets/ftvrelics/MemoryJar.java
index f680ced54e..eeeb6c9090 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/MemoryJar.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/MemoryJar.java
@@ -38,7 +38,7 @@ public class MemoryJar extends mage.sets.urzaslegacy.MemoryJar {
 
     public MemoryJar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/Mirari.java b/Mage.Sets/src/mage/sets/ftvrelics/Mirari.java
index eb64701c79..e4411c7090 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/Mirari.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/Mirari.java
@@ -38,7 +38,7 @@ public class Mirari extends mage.sets.commander2013.Mirari {
 
     public Mirari(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/MoxDiamond.java b/Mage.Sets/src/mage/sets/ftvrelics/MoxDiamond.java
index cb65eb2c19..eaa7be27e9 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/MoxDiamond.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/MoxDiamond.java
@@ -38,7 +38,7 @@ public class MoxDiamond extends mage.sets.stronghold.MoxDiamond {
 
     public MoxDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/ftvrelics/NevinyrralsDisk.java
index 49285f93b1..c44f8a62cf 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/NevinyrralsDisk.java
@@ -38,7 +38,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/SolRing.java b/Mage.Sets/src/mage/sets/ftvrelics/SolRing.java
index b781e48155..d5dd29bc20 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/SolRing.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/SolRing.java
@@ -38,7 +38,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/SunderingTitan.java b/Mage.Sets/src/mage/sets/ftvrelics/SunderingTitan.java
index df89357ffd..50132606db 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/SunderingTitan.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/SunderingTitan.java
@@ -38,7 +38,7 @@ public class SunderingTitan extends mage.sets.darksteel.SunderingTitan {
 
     public SunderingTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/SwordOfBodyAndMind.java b/Mage.Sets/src/mage/sets/ftvrelics/SwordOfBodyAndMind.java
index b92eddf457..1057d02b8e 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/SwordOfBodyAndMind.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/SwordOfBodyAndMind.java
@@ -37,7 +37,7 @@ public class SwordOfBodyAndMind extends mage.sets.scarsofmirrodin.SwordOfBodyAnd
 
     public SwordOfBodyAndMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvrelics/ZuranOrb.java b/Mage.Sets/src/mage/sets/ftvrelics/ZuranOrb.java
index a6ad37e6fc..4348b5cf31 100644
--- a/Mage.Sets/src/mage/sets/ftvrelics/ZuranOrb.java
+++ b/Mage.Sets/src/mage/sets/ftvrelics/ZuranOrb.java
@@ -38,7 +38,7 @@ public class ZuranOrb extends mage.sets.iceage.ZuranOrb {
 
     public ZuranOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/AkromasVengeance.java b/Mage.Sets/src/mage/sets/ftvtwenty/AkromasVengeance.java
index e45e3af769..67824ac6b2 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/AkromasVengeance.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/AkromasVengeance.java
@@ -38,7 +38,7 @@ public class AkromasVengeance extends mage.sets.planechase.AkromasVengeance {
 
     public AkromasVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/ChainersEdict.java b/Mage.Sets/src/mage/sets/ftvtwenty/ChainersEdict.java
index ff2fbeaf59..c33a891568 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/ChainersEdict.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/ChainersEdict.java
@@ -38,7 +38,7 @@ public class ChainersEdict extends mage.sets.vintagemasters.ChainersEdict {
 
     public ChainersEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/ChameleonColossus.java b/Mage.Sets/src/mage/sets/ftvtwenty/ChameleonColossus.java
index 5717de45d5..1e272ad12c 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/ChameleonColossus.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/ChameleonColossus.java
@@ -38,7 +38,7 @@ public class ChameleonColossus extends mage.sets.morningtide.ChameleonColossus {
 
     public ChameleonColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/Char.java b/Mage.Sets/src/mage/sets/ftvtwenty/Char.java
index 4ccabbb427..1c0144bbd7 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/Char.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/Char.java
@@ -38,7 +38,7 @@ public class Char extends mage.sets.ravnica.Char {
 
     public Char(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/CruelUltimatum.java b/Mage.Sets/src/mage/sets/ftvtwenty/CruelUltimatum.java
index 5c089c9d5f..3159c70781 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/CruelUltimatum.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/CruelUltimatum.java
@@ -38,7 +38,7 @@ public class CruelUltimatum extends mage.sets.shardsofalara.CruelUltimatum {
 
     public CruelUltimatum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/DarkRitual.java b/Mage.Sets/src/mage/sets/ftvtwenty/DarkRitual.java
index 225e39f791..de9e1f1200 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/DarkRitual.java
@@ -38,7 +38,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/FactOrFiction.java b/Mage.Sets/src/mage/sets/ftvtwenty/FactOrFiction.java
index 2854b09987..d28484c031 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/FactOrFiction.java
@@ -38,7 +38,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/FyndhornElves.java b/Mage.Sets/src/mage/sets/ftvtwenty/FyndhornElves.java
index 1d033aad5c..c6f906644b 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/FyndhornElves.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/FyndhornElves.java
@@ -38,7 +38,7 @@ public class FyndhornElves extends mage.sets.iceage.FyndhornElves {
 
     public FyndhornElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/GildedLotus.java b/Mage.Sets/src/mage/sets/ftvtwenty/GildedLotus.java
index 3545b8e5de..b571147173 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/GildedLotus.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/GildedLotus.java
@@ -38,7 +38,7 @@ public class GildedLotus extends mage.sets.magic2013.GildedLotus {
 
     public GildedLotus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/GreenSunsZenith.java b/Mage.Sets/src/mage/sets/ftvtwenty/GreenSunsZenith.java
index f468219ba0..f97c4a64d1 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/GreenSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/GreenSunsZenith.java
@@ -38,7 +38,7 @@ public class GreenSunsZenith extends mage.sets.mirrodinbesieged.GreenSunsZenith
 
     public GreenSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/HymnToTourach.java b/Mage.Sets/src/mage/sets/ftvtwenty/HymnToTourach.java
index 7742547b87..8943f0a191 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/HymnToTourach.java
@@ -38,7 +38,7 @@ public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/Impulse.java b/Mage.Sets/src/mage/sets/ftvtwenty/Impulse.java
index b9396f1c15..8f71891b57 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/Impulse.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/Impulse.java
@@ -38,7 +38,7 @@ public class Impulse extends mage.sets.visions.Impulse {
 
     public Impulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/InkEyesServantOfOni.java b/Mage.Sets/src/mage/sets/ftvtwenty/InkEyesServantOfOni.java
index 5922a7d49d..c8ecde0735 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/InkEyesServantOfOni.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/InkEyesServantOfOni.java
@@ -38,7 +38,7 @@ public class InkEyesServantOfOni extends mage.sets.betrayersofkamigawa.InkEyesSe
 
     public InkEyesServantOfOni(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/ftvtwenty/JaceTheMindSculptor.java
index b08632ba73..4773cd243d 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/JaceTheMindSculptor.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/JaceTheMindSculptor.java
@@ -37,7 +37,7 @@ public class JaceTheMindSculptor extends mage.sets.worldwake.JaceTheMindSculptor
 
     public JaceTheMindSculptor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "V13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/KessigWolfRun.java b/Mage.Sets/src/mage/sets/ftvtwenty/KessigWolfRun.java
index 60bdd1254c..39ea68e823 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/KessigWolfRun.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/KessigWolfRun.java
@@ -38,7 +38,7 @@ public class KessigWolfRun extends mage.sets.innistrad.KessigWolfRun {
 
     public KessigWolfRun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/ftvtwenty/SwordsToPlowshares.java
index 2e3a5d5485..44bfcd4c99 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/SwordsToPlowshares.java
@@ -38,7 +38,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/TangleWire.java b/Mage.Sets/src/mage/sets/ftvtwenty/TangleWire.java
index 35f9a9220b..72519796ef 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/TangleWire.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/TangleWire.java
@@ -38,7 +38,7 @@ public class TangleWire extends mage.sets.nemesis.TangleWire {
 
     public TangleWire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/ThranDynamo.java b/Mage.Sets/src/mage/sets/ftvtwenty/ThranDynamo.java
index c6d9790b23..b1482b137a 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/ThranDynamo.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/ThranDynamo.java
@@ -38,7 +38,7 @@ public class ThranDynamo extends mage.sets.urzasdestiny.ThranDynamo {
 
     public ThranDynamo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/VenserShaperSavant.java b/Mage.Sets/src/mage/sets/ftvtwenty/VenserShaperSavant.java
index cd525cf972..e155359159 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/VenserShaperSavant.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/VenserShaperSavant.java
@@ -38,7 +38,7 @@ public class VenserShaperSavant extends mage.sets.futuresight.VenserShaperSavant
 
     public VenserShaperSavant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/ftvtwenty/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/ftvtwenty/WallOfBlossoms.java
index 39d3da845b..11bec9ae47 100644
--- a/Mage.Sets/src/mage/sets/ftvtwenty/WallOfBlossoms.java
+++ b/Mage.Sets/src/mage/sets/ftvtwenty/WallOfBlossoms.java
@@ -38,7 +38,7 @@ public class WallOfBlossoms extends mage.sets.stronghold.WallOfBlossoms {
 
     public WallOfBlossoms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "V13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java b/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java
index 23744575c2..392cb80e04 100644
--- a/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java
+++ b/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java
@@ -38,7 +38,7 @@ public class AkromasMemorial extends mage.sets.magic2013.AkromasMemorial {
 
     public AkromasMemorial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/AngelOfSalvation.java b/Mage.Sets/src/mage/sets/futuresight/AngelOfSalvation.java
index 50fae2905f..943b4e8475 100644
--- a/Mage.Sets/src/mage/sets/futuresight/AngelOfSalvation.java
+++ b/Mage.Sets/src/mage/sets/futuresight/AngelOfSalvation.java
@@ -37,7 +37,7 @@ public class AngelOfSalvation extends mage.sets.elspethvstezzeret.AngelOfSalvati
 
     public AngelOfSalvation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/BloodshotTrainee.java b/Mage.Sets/src/mage/sets/futuresight/BloodshotTrainee.java
index 0b94db5548..e7c47aafd2 100644
--- a/Mage.Sets/src/mage/sets/futuresight/BloodshotTrainee.java
+++ b/Mage.Sets/src/mage/sets/futuresight/BloodshotTrainee.java
@@ -37,7 +37,7 @@ public class BloodshotTrainee extends mage.sets.scarsofmirrodin.BloodshotTrainee
 
     public BloodshotTrainee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/BoldwyrIntimidator.java b/Mage.Sets/src/mage/sets/futuresight/BoldwyrIntimidator.java
index 68b8f68440..5c5b69370e 100644
--- a/Mage.Sets/src/mage/sets/futuresight/BoldwyrIntimidator.java
+++ b/Mage.Sets/src/mage/sets/futuresight/BoldwyrIntimidator.java
@@ -37,7 +37,7 @@ public class BoldwyrIntimidator extends mage.sets.morningtide.BoldwyrIntimidator
 
     public BoldwyrIntimidator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java b/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java
index dabad1c074..419d369ee2 100644
--- a/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java
+++ b/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java
@@ -38,7 +38,7 @@ public class BoundInSilence extends mage.sets.modernmasters.BoundInSilence {
 
     public BoundInSilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/DeathRattle.java b/Mage.Sets/src/mage/sets/futuresight/DeathRattle.java
index f276bffce2..e38f4985e2 100644
--- a/Mage.Sets/src/mage/sets/futuresight/DeathRattle.java
+++ b/Mage.Sets/src/mage/sets/futuresight/DeathRattle.java
@@ -38,7 +38,7 @@ public class DeathRattle extends mage.sets.modernmasters.DeathRattle {
 
     public DeathRattle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/DeepcavernImp.java b/Mage.Sets/src/mage/sets/futuresight/DeepcavernImp.java
index 291643ef35..4a1c0c53cb 100644
--- a/Mage.Sets/src/mage/sets/futuresight/DeepcavernImp.java
+++ b/Mage.Sets/src/mage/sets/futuresight/DeepcavernImp.java
@@ -37,7 +37,7 @@ public class DeepcavernImp extends mage.sets.modernmasters.DeepcavernImp {
 
     public DeepcavernImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/EdgeOfAutumn.java b/Mage.Sets/src/mage/sets/futuresight/EdgeOfAutumn.java
index aed3268253..a5fd0fc2ea 100644
--- a/Mage.Sets/src/mage/sets/futuresight/EdgeOfAutumn.java
+++ b/Mage.Sets/src/mage/sets/futuresight/EdgeOfAutumn.java
@@ -37,7 +37,7 @@ public class EdgeOfAutumn extends mage.sets.knightsvsdragons.EdgeOfAutumn {
 
     public EdgeOfAutumn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/EmberwildeAugur.java b/Mage.Sets/src/mage/sets/futuresight/EmberwildeAugur.java
index 8e8e5a6e30..ad2f3a2429 100644
--- a/Mage.Sets/src/mage/sets/futuresight/EmberwildeAugur.java
+++ b/Mage.Sets/src/mage/sets/futuresight/EmberwildeAugur.java
@@ -37,7 +37,7 @@ public class EmberwildeAugur extends mage.sets.elvesvsgoblins.EmberwildeAugur {
 
     public EmberwildeAugur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/Epochrasite.java b/Mage.Sets/src/mage/sets/futuresight/Epochrasite.java
index 093629a74f..477122f36a 100644
--- a/Mage.Sets/src/mage/sets/futuresight/Epochrasite.java
+++ b/Mage.Sets/src/mage/sets/futuresight/Epochrasite.java
@@ -38,7 +38,7 @@ public class Epochrasite extends mage.sets.modernmasters.Epochrasite {
 
     public Epochrasite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/Foresee.java b/Mage.Sets/src/mage/sets/futuresight/Foresee.java
index 9bbe498f4f..1b202f0456 100644
--- a/Mage.Sets/src/mage/sets/futuresight/Foresee.java
+++ b/Mage.Sets/src/mage/sets/futuresight/Foresee.java
@@ -37,7 +37,7 @@ public class Foresee extends mage.sets.magic2011.Foresee {
 
     public Foresee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/Ghostfire.java b/Mage.Sets/src/mage/sets/futuresight/Ghostfire.java
index 871a079e6a..adbd2764ed 100644
--- a/Mage.Sets/src/mage/sets/futuresight/Ghostfire.java
+++ b/Mage.Sets/src/mage/sets/futuresight/Ghostfire.java
@@ -37,7 +37,7 @@ public class Ghostfire extends mage.sets.knightsvsdragons.Ghostfire {
 
     public Ghostfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/GravenCairns.java b/Mage.Sets/src/mage/sets/futuresight/GravenCairns.java
index 5d950bfa07..7ddc6d016d 100644
--- a/Mage.Sets/src/mage/sets/futuresight/GravenCairns.java
+++ b/Mage.Sets/src/mage/sets/futuresight/GravenCairns.java
@@ -37,7 +37,7 @@ public class GravenCairns extends mage.sets.shadowmoor.GravenCairns {
 
     public GravenCairns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/GrinningIgnus.java b/Mage.Sets/src/mage/sets/futuresight/GrinningIgnus.java
index ffee9dbd5d..4249456d67 100644
--- a/Mage.Sets/src/mage/sets/futuresight/GrinningIgnus.java
+++ b/Mage.Sets/src/mage/sets/futuresight/GrinningIgnus.java
@@ -38,7 +38,7 @@ public class GrinningIgnus extends mage.sets.modernmasters.GrinningIgnus {
 
     public GrinningIgnus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/Imperiosaur.java b/Mage.Sets/src/mage/sets/futuresight/Imperiosaur.java
index 977a3012bd..d793e48fc0 100644
--- a/Mage.Sets/src/mage/sets/futuresight/Imperiosaur.java
+++ b/Mage.Sets/src/mage/sets/futuresight/Imperiosaur.java
@@ -38,7 +38,7 @@ public class Imperiosaur extends mage.sets.modernmasters.Imperiosaur {
 
     public Imperiosaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/JhoiraOfTheGhitu.java b/Mage.Sets/src/mage/sets/futuresight/JhoiraOfTheGhitu.java
index 0da0935a8d..3904b5cef4 100644
--- a/Mage.Sets/src/mage/sets/futuresight/JhoiraOfTheGhitu.java
+++ b/Mage.Sets/src/mage/sets/futuresight/JhoiraOfTheGhitu.java
@@ -37,7 +37,7 @@ public class JhoiraOfTheGhitu extends mage.sets.modernmasters.JhoiraOfTheGhitu {
 
     public JhoiraOfTheGhitu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/KeldonMegaliths.java b/Mage.Sets/src/mage/sets/futuresight/KeldonMegaliths.java
index 86a276194f..bcb718dc5e 100644
--- a/Mage.Sets/src/mage/sets/futuresight/KeldonMegaliths.java
+++ b/Mage.Sets/src/mage/sets/futuresight/KeldonMegaliths.java
@@ -37,7 +37,7 @@ public class KeldonMegaliths extends mage.sets.jacevschandra.KeldonMegaliths {
 
     public KeldonMegaliths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/LlanowarReborn.java b/Mage.Sets/src/mage/sets/futuresight/LlanowarReborn.java
index 42496666cc..70b9c9b032 100644
--- a/Mage.Sets/src/mage/sets/futuresight/LlanowarReborn.java
+++ b/Mage.Sets/src/mage/sets/futuresight/LlanowarReborn.java
@@ -37,7 +37,7 @@ public class LlanowarReborn extends mage.sets.heroesvsmonsters.LlanowarReborn {
 
     public LlanowarReborn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/LogicKnot.java b/Mage.Sets/src/mage/sets/futuresight/LogicKnot.java
index 0e9fb62abc..ed0bb16469 100644
--- a/Mage.Sets/src/mage/sets/futuresight/LogicKnot.java
+++ b/Mage.Sets/src/mage/sets/futuresight/LogicKnot.java
@@ -37,7 +37,7 @@ public class LogicKnot extends mage.sets.modernmasters.LogicKnot {
 
     public LogicKnot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/MagusOfTheVineyard.java b/Mage.Sets/src/mage/sets/futuresight/MagusOfTheVineyard.java
index 6d7513f44c..114e94a864 100644
--- a/Mage.Sets/src/mage/sets/futuresight/MagusOfTheVineyard.java
+++ b/Mage.Sets/src/mage/sets/futuresight/MagusOfTheVineyard.java
@@ -37,7 +37,7 @@ public class MagusOfTheVineyard extends mage.sets.commander.MagusOfTheVineyard {
 
     public MagusOfTheVineyard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/MassOfGhouls.java b/Mage.Sets/src/mage/sets/futuresight/MassOfGhouls.java
index ff6bfa74ab..dca9583fd8 100644
--- a/Mage.Sets/src/mage/sets/futuresight/MassOfGhouls.java
+++ b/Mage.Sets/src/mage/sets/futuresight/MassOfGhouls.java
@@ -37,7 +37,7 @@ public class MassOfGhouls extends mage.sets.tenthedition.MassOfGhouls {
 
     public MassOfGhouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/MistmeadowSkulk.java b/Mage.Sets/src/mage/sets/futuresight/MistmeadowSkulk.java
index b6b1b5adb0..bbb9d1e883 100644
--- a/Mage.Sets/src/mage/sets/futuresight/MistmeadowSkulk.java
+++ b/Mage.Sets/src/mage/sets/futuresight/MistmeadowSkulk.java
@@ -37,7 +37,7 @@ public class MistmeadowSkulk extends mage.sets.shadowmoor.MistmeadowSkulk {
 
     public MistmeadowSkulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/MoltenDisaster.java b/Mage.Sets/src/mage/sets/futuresight/MoltenDisaster.java
index 8bf629e3d3..8441aa3c4f 100644
--- a/Mage.Sets/src/mage/sets/futuresight/MoltenDisaster.java
+++ b/Mage.Sets/src/mage/sets/futuresight/MoltenDisaster.java
@@ -37,7 +37,7 @@ public class MoltenDisaster extends mage.sets.modernmasters.MoltenDisaster {
 
     public MoltenDisaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/PhosphorescentFeast.java b/Mage.Sets/src/mage/sets/futuresight/PhosphorescentFeast.java
index 879f7c2c74..4dac706a09 100644
--- a/Mage.Sets/src/mage/sets/futuresight/PhosphorescentFeast.java
+++ b/Mage.Sets/src/mage/sets/futuresight/PhosphorescentFeast.java
@@ -37,7 +37,7 @@ public class PhosphorescentFeast extends mage.sets.eventide.PhosphorescentFeast
 
     public PhosphorescentFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/PyromancersSwath.java b/Mage.Sets/src/mage/sets/futuresight/PyromancersSwath.java
index b9b7d048ee..32a03cd3c3 100644
--- a/Mage.Sets/src/mage/sets/futuresight/PyromancersSwath.java
+++ b/Mage.Sets/src/mage/sets/futuresight/PyromancersSwath.java
@@ -37,7 +37,7 @@ public class PyromancersSwath extends mage.sets.modernmasters.PyromancersSwath {
 
     public PyromancersSwath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/QuietDisrepair.java b/Mage.Sets/src/mage/sets/futuresight/QuietDisrepair.java
index d0bd475664..03a5e177d1 100644
--- a/Mage.Sets/src/mage/sets/futuresight/QuietDisrepair.java
+++ b/Mage.Sets/src/mage/sets/futuresight/QuietDisrepair.java
@@ -37,7 +37,7 @@ public class QuietDisrepair extends mage.sets.planechase2012.QuietDisrepair {
 
     public QuietDisrepair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/RiddleOfLightning.java b/Mage.Sets/src/mage/sets/futuresight/RiddleOfLightning.java
index 89114ccc61..b8df89628f 100644
--- a/Mage.Sets/src/mage/sets/futuresight/RiddleOfLightning.java
+++ b/Mage.Sets/src/mage/sets/futuresight/RiddleOfLightning.java
@@ -38,7 +38,7 @@ public class RiddleOfLightning extends mage.sets.journeyintonyx.RiddleOfLightnin
 
     public RiddleOfLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/RiftElemental.java b/Mage.Sets/src/mage/sets/futuresight/RiftElemental.java
index 5580eeac8d..ddf6ce3501 100644
--- a/Mage.Sets/src/mage/sets/futuresight/RiftElemental.java
+++ b/Mage.Sets/src/mage/sets/futuresight/RiftElemental.java
@@ -37,7 +37,7 @@ public class RiftElemental extends mage.sets.modernmasters.RiftElemental {
 
     public RiftElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/Riftsweeper.java b/Mage.Sets/src/mage/sets/futuresight/Riftsweeper.java
index 6f500f446c..74de83670b 100644
--- a/Mage.Sets/src/mage/sets/futuresight/Riftsweeper.java
+++ b/Mage.Sets/src/mage/sets/futuresight/Riftsweeper.java
@@ -37,7 +37,7 @@ public class Riftsweeper extends mage.sets.modernmasters.Riftsweeper {
 
     public Riftsweeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/RitesOfFlourishing.java b/Mage.Sets/src/mage/sets/futuresight/RitesOfFlourishing.java
index 462b49650e..42d3d08e3d 100644
--- a/Mage.Sets/src/mage/sets/futuresight/RitesOfFlourishing.java
+++ b/Mage.Sets/src/mage/sets/futuresight/RitesOfFlourishing.java
@@ -37,7 +37,7 @@ public class RitesOfFlourishing extends mage.sets.magic2012.RitesOfFlourishing {
 
     public RitesOfFlourishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/SarcomiteMyr.java b/Mage.Sets/src/mage/sets/futuresight/SarcomiteMyr.java
index f09419b136..92392672e2 100644
--- a/Mage.Sets/src/mage/sets/futuresight/SarcomiteMyr.java
+++ b/Mage.Sets/src/mage/sets/futuresight/SarcomiteMyr.java
@@ -37,7 +37,7 @@ public class SarcomiteMyr extends mage.sets.planechase.SarcomiteMyr {
 
     public SarcomiteMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/ShimianSpecter.java b/Mage.Sets/src/mage/sets/futuresight/ShimianSpecter.java
index 5f4458fd43..9fe024c576 100644
--- a/Mage.Sets/src/mage/sets/futuresight/ShimianSpecter.java
+++ b/Mage.Sets/src/mage/sets/futuresight/ShimianSpecter.java
@@ -37,7 +37,7 @@ public class ShimianSpecter extends mage.sets.magic2013.ShimianSpecter {
 
     public ShimianSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/SpinIntoMyth.java b/Mage.Sets/src/mage/sets/futuresight/SpinIntoMyth.java
index 6311152306..c997cf99e5 100644
--- a/Mage.Sets/src/mage/sets/futuresight/SpinIntoMyth.java
+++ b/Mage.Sets/src/mage/sets/futuresight/SpinIntoMyth.java
@@ -37,7 +37,7 @@ public class SpinIntoMyth extends mage.sets.archenemy.SpinIntoMyth {
 
     public SpinIntoMyth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/SporolothAncient.java b/Mage.Sets/src/mage/sets/futuresight/SporolothAncient.java
index 4df3faa893..257c9dc7b3 100644
--- a/Mage.Sets/src/mage/sets/futuresight/SporolothAncient.java
+++ b/Mage.Sets/src/mage/sets/futuresight/SporolothAncient.java
@@ -37,7 +37,7 @@ public class SporolothAncient extends mage.sets.modernmasters.SporolothAncient {
 
     public SporolothAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/TakePossession.java b/Mage.Sets/src/mage/sets/futuresight/TakePossession.java
index d6dd112223..78f2aa6fca 100644
--- a/Mage.Sets/src/mage/sets/futuresight/TakePossession.java
+++ b/Mage.Sets/src/mage/sets/futuresight/TakePossession.java
@@ -38,7 +38,7 @@ public class TakePossession extends mage.sets.modernmasters.TakePossession {
 
     public TakePossession(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "FUT";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/futuresight/Tombstalker.java b/Mage.Sets/src/mage/sets/futuresight/Tombstalker.java
index 48426d40b9..b45e653d2d 100644
--- a/Mage.Sets/src/mage/sets/futuresight/Tombstalker.java
+++ b/Mage.Sets/src/mage/sets/futuresight/Tombstalker.java
@@ -37,7 +37,7 @@ public class Tombstalker extends mage.sets.modernmasters.Tombstalker {
 
     public Tombstalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/WrapInVigor.java b/Mage.Sets/src/mage/sets/futuresight/WrapInVigor.java
index 73e50b46d3..fa4ea9a5f6 100644
--- a/Mage.Sets/src/mage/sets/futuresight/WrapInVigor.java
+++ b/Mage.Sets/src/mage/sets/futuresight/WrapInVigor.java
@@ -37,7 +37,7 @@ public class WrapInVigor extends mage.sets.conspiracy.WrapInVigor {
 
     public WrapInVigor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/ZoeticCavern.java b/Mage.Sets/src/mage/sets/futuresight/ZoeticCavern.java
index 944c32eaf4..7bb4e9a278 100644
--- a/Mage.Sets/src/mage/sets/futuresight/ZoeticCavern.java
+++ b/Mage.Sets/src/mage/sets/futuresight/ZoeticCavern.java
@@ -37,7 +37,7 @@ public class ZoeticCavern extends mage.sets.commander2014.ZoeticCavern {
 
     public ZoeticCavern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "FUT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/AnguishedUnmaking.java b/Mage.Sets/src/mage/sets/gameday/AnguishedUnmaking.java
index 703e860e09..9a638eadc1 100644
--- a/Mage.Sets/src/mage/sets/gameday/AnguishedUnmaking.java
+++ b/Mage.Sets/src/mage/sets/gameday/AnguishedUnmaking.java
@@ -37,7 +37,7 @@ public class AnguishedUnmaking extends mage.sets.shadowsoverinnistrad.AnguishedU
 
     public AnguishedUnmaking(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/BlackSunsZenith.java b/Mage.Sets/src/mage/sets/gameday/BlackSunsZenith.java
index 037878b2c6..60a5e3f6f3 100644
--- a/Mage.Sets/src/mage/sets/gameday/BlackSunsZenith.java
+++ b/Mage.Sets/src/mage/sets/gameday/BlackSunsZenith.java
@@ -37,7 +37,7 @@ public class BlackSunsZenith extends mage.sets.mirrodinbesieged.BlackSunsZenith
 
     public BlackSunsZenith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ChiefEngineer.java b/Mage.Sets/src/mage/sets/gameday/ChiefEngineer.java
index a1744b19eb..77240cb602 100644
--- a/Mage.Sets/src/mage/sets/gameday/ChiefEngineer.java
+++ b/Mage.Sets/src/mage/sets/gameday/ChiefEngineer.java
@@ -37,7 +37,7 @@ public class ChiefEngineer extends mage.sets.magic2015.ChiefEngineer {
 
     public ChiefEngineer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ConclaveNaturalists.java b/Mage.Sets/src/mage/sets/gameday/ConclaveNaturalists.java
index 1dc3c7c8bc..cbcb0be84d 100644
--- a/Mage.Sets/src/mage/sets/gameday/ConclaveNaturalists.java
+++ b/Mage.Sets/src/mage/sets/gameday/ConclaveNaturalists.java
@@ -37,7 +37,7 @@ public class ConclaveNaturalists extends mage.sets.magicorigins.ConclaveNaturali
 
     public ConclaveNaturalists(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/CryptbornHorror.java b/Mage.Sets/src/mage/sets/gameday/CryptbornHorror.java
index 5958b6cab5..fd82f2e3fe 100644
--- a/Mage.Sets/src/mage/sets/gameday/CryptbornHorror.java
+++ b/Mage.Sets/src/mage/sets/gameday/CryptbornHorror.java
@@ -37,7 +37,7 @@ public class CryptbornHorror extends mage.sets.returntoravnica.CryptbornHorror {
 
     public CryptbornHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/DictateOfKruphix.java b/Mage.Sets/src/mage/sets/gameday/DictateOfKruphix.java
index 9c1192fa42..2d498d47b1 100644
--- a/Mage.Sets/src/mage/sets/gameday/DictateOfKruphix.java
+++ b/Mage.Sets/src/mage/sets/gameday/DictateOfKruphix.java
@@ -37,7 +37,7 @@ public class DictateOfKruphix extends mage.sets.journeyintonyx.DictateOfKruphix
 
     public DictateOfKruphix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/DiregrafGhoul.java b/Mage.Sets/src/mage/sets/gameday/DiregrafGhoul.java
index 80a9cee0ae..e4fe87c816 100644
--- a/Mage.Sets/src/mage/sets/gameday/DiregrafGhoul.java
+++ b/Mage.Sets/src/mage/sets/gameday/DiregrafGhoul.java
@@ -37,7 +37,7 @@ public class DiregrafGhoul extends mage.sets.innistrad.DiregrafGhoul {
 
     public DiregrafGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/DryadMilitant.java b/Mage.Sets/src/mage/sets/gameday/DryadMilitant.java
index 2f48512b7f..0c4e149425 100644
--- a/Mage.Sets/src/mage/sets/gameday/DryadMilitant.java
+++ b/Mage.Sets/src/mage/sets/gameday/DryadMilitant.java
@@ -37,7 +37,7 @@ public class DryadMilitant extends mage.sets.returntoravnica.DryadMilitant {
 
     public DryadMilitant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/DungroveElder.java b/Mage.Sets/src/mage/sets/gameday/DungroveElder.java
index 8d1d860add..f21c8774da 100644
--- a/Mage.Sets/src/mage/sets/gameday/DungroveElder.java
+++ b/Mage.Sets/src/mage/sets/gameday/DungroveElder.java
@@ -37,7 +37,7 @@ public class DungroveElder extends mage.sets.magic2012.DungroveElder {
 
     public DungroveElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/EliteInquisitor.java b/Mage.Sets/src/mage/sets/gameday/EliteInquisitor.java
index 723259eb79..19f17cfc86 100644
--- a/Mage.Sets/src/mage/sets/gameday/EliteInquisitor.java
+++ b/Mage.Sets/src/mage/sets/gameday/EliteInquisitor.java
@@ -37,7 +37,7 @@ public class EliteInquisitor extends mage.sets.innistrad.EliteInquisitor {
 
     public EliteInquisitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/FiremaneAvenger.java b/Mage.Sets/src/mage/sets/gameday/FiremaneAvenger.java
index 8c69fc78c6..9d5a4068fa 100644
--- a/Mage.Sets/src/mage/sets/gameday/FiremaneAvenger.java
+++ b/Mage.Sets/src/mage/sets/gameday/FiremaneAvenger.java
@@ -37,7 +37,7 @@ public class FiremaneAvenger extends mage.sets.gatecrash.FiremaneAvenger {
 
     public FiremaneAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/GoblinDiplomats.java b/Mage.Sets/src/mage/sets/gameday/GoblinDiplomats.java
index 68b9d75688..18aa20ee92 100644
--- a/Mage.Sets/src/mage/sets/gameday/GoblinDiplomats.java
+++ b/Mage.Sets/src/mage/sets/gameday/GoblinDiplomats.java
@@ -37,7 +37,7 @@ public class GoblinDiplomats extends mage.sets.magic2014.GoblinDiplomats {
 
     public GoblinDiplomats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/HallOfTriumph.java b/Mage.Sets/src/mage/sets/gameday/HallOfTriumph.java
index 4554369d73..19a7517778 100644
--- a/Mage.Sets/src/mage/sets/gameday/HallOfTriumph.java
+++ b/Mage.Sets/src/mage/sets/gameday/HallOfTriumph.java
@@ -37,7 +37,7 @@ public class HallOfTriumph extends mage.sets.journeyintonyx.HallOfTriumph {
 
     public HallOfTriumph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/HeirOfTheWilds.java b/Mage.Sets/src/mage/sets/gameday/HeirOfTheWilds.java
index 5a522dd2f2..5091386abc 100644
--- a/Mage.Sets/src/mage/sets/gameday/HeirOfTheWilds.java
+++ b/Mage.Sets/src/mage/sets/gameday/HeirOfTheWilds.java
@@ -37,7 +37,7 @@ public class HeirOfTheWilds extends mage.sets.khansoftarkir.HeirOfTheWilds {
 
     public HeirOfTheWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/HeronsGraceChampion.java b/Mage.Sets/src/mage/sets/gameday/HeronsGraceChampion.java
index 27cdc4034d..81d36accb1 100644
--- a/Mage.Sets/src/mage/sets/gameday/HeronsGraceChampion.java
+++ b/Mage.Sets/src/mage/sets/gameday/HeronsGraceChampion.java
@@ -37,7 +37,7 @@ public class HeronsGraceChampion extends mage.sets.eldritchmoon.HeronsGraceChamp
 
     public HeronsGraceChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/HiveStirrings.java b/Mage.Sets/src/mage/sets/gameday/HiveStirrings.java
index 2faf61ba4d..55f2a7882a 100644
--- a/Mage.Sets/src/mage/sets/gameday/HiveStirrings.java
+++ b/Mage.Sets/src/mage/sets/gameday/HiveStirrings.java
@@ -37,7 +37,7 @@ public class HiveStirrings extends mage.sets.magic2014.HiveStirrings {
 
     public HiveStirrings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ImmolatingGlare.java b/Mage.Sets/src/mage/sets/gameday/ImmolatingGlare.java
index df9c29b8d1..84cb0f52b0 100644
--- a/Mage.Sets/src/mage/sets/gameday/ImmolatingGlare.java
+++ b/Mage.Sets/src/mage/sets/gameday/ImmolatingGlare.java
@@ -37,7 +37,7 @@ public class ImmolatingGlare extends mage.sets.oathofthegatewatch.ImmolatingGlar
 
     public ImmolatingGlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/IncorrigibleYouths.java b/Mage.Sets/src/mage/sets/gameday/IncorrigibleYouths.java
index 801db563a3..e0184ce245 100644
--- a/Mage.Sets/src/mage/sets/gameday/IncorrigibleYouths.java
+++ b/Mage.Sets/src/mage/sets/gameday/IncorrigibleYouths.java
@@ -37,7 +37,7 @@ public class IncorrigibleYouths extends mage.sets.shadowsoverinnistrad.Incorrigi
 
     public IncorrigibleYouths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/JoriEnRuinDiver.java b/Mage.Sets/src/mage/sets/gameday/JoriEnRuinDiver.java
index ab4234dba0..51669edbcd 100644
--- a/Mage.Sets/src/mage/sets/gameday/JoriEnRuinDiver.java
+++ b/Mage.Sets/src/mage/sets/gameday/JoriEnRuinDiver.java
@@ -37,7 +37,7 @@ public class JoriEnRuinDiver extends mage.sets.oathofthegatewatch.JoriEnRuinDive
 
     public JoriEnRuinDiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/KillingWave.java b/Mage.Sets/src/mage/sets/gameday/KillingWave.java
index 135e83471c..16d8a8a7ce 100644
--- a/Mage.Sets/src/mage/sets/gameday/KillingWave.java
+++ b/Mage.Sets/src/mage/sets/gameday/KillingWave.java
@@ -37,7 +37,7 @@ public class KillingWave extends mage.sets.avacynrestored.KillingWave {
 
     public KillingWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/KiorasFollower.java b/Mage.Sets/src/mage/sets/gameday/KiorasFollower.java
index 6a495982b5..c256a18e7c 100644
--- a/Mage.Sets/src/mage/sets/gameday/KiorasFollower.java
+++ b/Mage.Sets/src/mage/sets/gameday/KiorasFollower.java
@@ -37,7 +37,7 @@ public class KiorasFollower extends mage.sets.bornofthegods.KiorasFollower {
 
     public KiorasFollower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/Languish.java b/Mage.Sets/src/mage/sets/gameday/Languish.java
index ecac8396ad..eb6816d91e 100644
--- a/Mage.Sets/src/mage/sets/gameday/Languish.java
+++ b/Mage.Sets/src/mage/sets/gameday/Languish.java
@@ -37,7 +37,7 @@ public class Languish extends mage.sets.magicorigins.Languish {
 
     public Languish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/LatchSeeker.java b/Mage.Sets/src/mage/sets/gameday/LatchSeeker.java
index ad702f2864..22daf8718b 100644
--- a/Mage.Sets/src/mage/sets/gameday/LatchSeeker.java
+++ b/Mage.Sets/src/mage/sets/gameday/LatchSeeker.java
@@ -37,7 +37,7 @@ public class LatchSeeker extends mage.sets.avacynrestored.LatchSeeker {
 
     public LatchSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/LilianasSpecter.java b/Mage.Sets/src/mage/sets/gameday/LilianasSpecter.java
index fc03c9adcc..b480b70b46 100644
--- a/Mage.Sets/src/mage/sets/gameday/LilianasSpecter.java
+++ b/Mage.Sets/src/mage/sets/gameday/LilianasSpecter.java
@@ -37,7 +37,7 @@ public class LilianasSpecter extends mage.sets.magic2011.LilianasSpecter {
 
     public LilianasSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/Magmaquake.java b/Mage.Sets/src/mage/sets/gameday/Magmaquake.java
index 89b940f50b..beb61c5c16 100644
--- a/Mage.Sets/src/mage/sets/gameday/Magmaquake.java
+++ b/Mage.Sets/src/mage/sets/gameday/Magmaquake.java
@@ -37,7 +37,7 @@ public class Magmaquake extends mage.sets.magic2013.Magmaquake {
 
     public Magmaquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/MarduShadowspear.java b/Mage.Sets/src/mage/sets/gameday/MarduShadowspear.java
index a1beff4270..3eacffb1df 100644
--- a/Mage.Sets/src/mage/sets/gameday/MarduShadowspear.java
+++ b/Mage.Sets/src/mage/sets/gameday/MarduShadowspear.java
@@ -37,7 +37,7 @@ public class MarduShadowspear extends mage.sets.fatereforged.MarduShadowspear {
 
     public MarduShadowspear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/MelekIzzetParagon.java b/Mage.Sets/src/mage/sets/gameday/MelekIzzetParagon.java
index 5845fb3d77..8b84dceec1 100644
--- a/Mage.Sets/src/mage/sets/gameday/MelekIzzetParagon.java
+++ b/Mage.Sets/src/mage/sets/gameday/MelekIzzetParagon.java
@@ -37,7 +37,7 @@ public class MelekIzzetParagon extends mage.sets.dragonsmaze.MelekIzzetParagon {
 
     public MelekIzzetParagon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/Memnite.java b/Mage.Sets/src/mage/sets/gameday/Memnite.java
index 96d801e3c4..0a1633be07 100644
--- a/Mage.Sets/src/mage/sets/gameday/Memnite.java
+++ b/Mage.Sets/src/mage/sets/gameday/Memnite.java
@@ -37,7 +37,7 @@ public class Memnite extends mage.sets.scarsofmirrodin.Memnite {
 
     public Memnite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/MitoticSlime.java b/Mage.Sets/src/mage/sets/gameday/MitoticSlime.java
index 5fa30af875..4e479bfe1e 100644
--- a/Mage.Sets/src/mage/sets/gameday/MitoticSlime.java
+++ b/Mage.Sets/src/mage/sets/gameday/MitoticSlime.java
@@ -37,7 +37,7 @@ public class MitoticSlime extends mage.sets.magic2011.MitoticSlime {
 
     public MitoticSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/MwonvuliBeastTracker.java b/Mage.Sets/src/mage/sets/gameday/MwonvuliBeastTracker.java
index 29d548af47..7aae4cb61f 100644
--- a/Mage.Sets/src/mage/sets/gameday/MwonvuliBeastTracker.java
+++ b/Mage.Sets/src/mage/sets/gameday/MwonvuliBeastTracker.java
@@ -37,7 +37,7 @@ public class MwonvuliBeastTracker extends mage.sets.magic2013.MwonvuliBeastTrack
 
     public MwonvuliBeastTracker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/MyrSuperion.java b/Mage.Sets/src/mage/sets/gameday/MyrSuperion.java
index 176b73bc3a..41fc70a3ce 100644
--- a/Mage.Sets/src/mage/sets/gameday/MyrSuperion.java
+++ b/Mage.Sets/src/mage/sets/gameday/MyrSuperion.java
@@ -37,7 +37,7 @@ public class MyrSuperion extends mage.sets.newphyrexia.MyrSuperion {
 
     public MyrSuperion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/Nighthowler.java b/Mage.Sets/src/mage/sets/gameday/Nighthowler.java
index 735d90fff1..07a6e99042 100644
--- a/Mage.Sets/src/mage/sets/gameday/Nighthowler.java
+++ b/Mage.Sets/src/mage/sets/gameday/Nighthowler.java
@@ -37,7 +37,7 @@ public class Nighthowler extends mage.sets.theros.Nighthowler {
 
     public Nighthowler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/PainSeer.java b/Mage.Sets/src/mage/sets/gameday/PainSeer.java
index b6aae35062..fe22db5124 100644
--- a/Mage.Sets/src/mage/sets/gameday/PainSeer.java
+++ b/Mage.Sets/src/mage/sets/gameday/PainSeer.java
@@ -37,7 +37,7 @@ public class PainSeer extends mage.sets.bornofthegods.PainSeer {
 
     public PainSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/PhalanxLeader.java b/Mage.Sets/src/mage/sets/gameday/PhalanxLeader.java
index 716494e1b3..61b3d585b7 100644
--- a/Mage.Sets/src/mage/sets/gameday/PhalanxLeader.java
+++ b/Mage.Sets/src/mage/sets/gameday/PhalanxLeader.java
@@ -37,7 +37,7 @@ public class PhalanxLeader extends mage.sets.theros.PhalanxLeader {
 
     public PhalanxLeader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/PriestOfUrabrask.java b/Mage.Sets/src/mage/sets/gameday/PriestOfUrabrask.java
index a7e851aaee..a1ff32151a 100644
--- a/Mage.Sets/src/mage/sets/gameday/PriestOfUrabrask.java
+++ b/Mage.Sets/src/mage/sets/gameday/PriestOfUrabrask.java
@@ -37,7 +37,7 @@ public class PriestOfUrabrask extends mage.sets.newphyrexia.PriestOfUrabrask {
 
     public PriestOfUrabrask(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/PristineTalisman.java b/Mage.Sets/src/mage/sets/gameday/PristineTalisman.java
index 46e540982e..380525cfe2 100644
--- a/Mage.Sets/src/mage/sets/gameday/PristineTalisman.java
+++ b/Mage.Sets/src/mage/sets/gameday/PristineTalisman.java
@@ -37,7 +37,7 @@ public class PristineTalisman extends mage.sets.newphyrexia.PristineTalisman {
 
     public PristineTalisman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/RadiantFlames.java b/Mage.Sets/src/mage/sets/gameday/RadiantFlames.java
index c546687f51..87bc560b8a 100644
--- a/Mage.Sets/src/mage/sets/gameday/RadiantFlames.java
+++ b/Mage.Sets/src/mage/sets/gameday/RadiantFlames.java
@@ -37,7 +37,7 @@ public class RadiantFlames extends mage.sets.battleforzendikar.RadiantFlames {
 
     public RadiantFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ReclamationSage.java b/Mage.Sets/src/mage/sets/gameday/ReclamationSage.java
index fafc0e342f..0a90ab6793 100644
--- a/Mage.Sets/src/mage/sets/gameday/ReclamationSage.java
+++ b/Mage.Sets/src/mage/sets/gameday/ReclamationSage.java
@@ -37,7 +37,7 @@ public class ReclamationSage extends mage.sets.magic2015.ReclamationSage {
 
     public ReclamationSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/gameday/ReyaDawnbringer.java
index 29f85dfe2c..292926d50e 100644
--- a/Mage.Sets/src/mage/sets/gameday/ReyaDawnbringer.java
+++ b/Mage.Sets/src/mage/sets/gameday/ReyaDawnbringer.java
@@ -37,7 +37,7 @@ public class ReyaDawnbringer extends mage.sets.tenthedition.ReyaDawnbringer {
 
     public ReyaDawnbringer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/SquelchingLeeches.java b/Mage.Sets/src/mage/sets/gameday/SquelchingLeeches.java
index 659e2db2fd..fc2f7070ac 100644
--- a/Mage.Sets/src/mage/sets/gameday/SquelchingLeeches.java
+++ b/Mage.Sets/src/mage/sets/gameday/SquelchingLeeches.java
@@ -37,7 +37,7 @@ public class SquelchingLeeches extends mage.sets.journeyintonyx.SquelchingLeeche
 
     public SquelchingLeeches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/StasisSnare.java b/Mage.Sets/src/mage/sets/gameday/StasisSnare.java
index 7cbba70bbb..27930ae4e2 100644
--- a/Mage.Sets/src/mage/sets/gameday/StasisSnare.java
+++ b/Mage.Sets/src/mage/sets/gameday/StasisSnare.java
@@ -37,7 +37,7 @@ public class StasisSnare extends mage.sets.battleforzendikar.StasisSnare {
 
     public StasisSnare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/StormbloodBerserker.java b/Mage.Sets/src/mage/sets/gameday/StormbloodBerserker.java
index 76b2e3d28f..108877f3a3 100644
--- a/Mage.Sets/src/mage/sets/gameday/StormbloodBerserker.java
+++ b/Mage.Sets/src/mage/sets/gameday/StormbloodBerserker.java
@@ -37,7 +37,7 @@ public class StormbloodBerserker extends mage.sets.magic2012.StormbloodBerserker
 
     public StormbloodBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/StranglerootGeist.java b/Mage.Sets/src/mage/sets/gameday/StranglerootGeist.java
index 5c7e0cc989..9050eca2ad 100644
--- a/Mage.Sets/src/mage/sets/gameday/StranglerootGeist.java
+++ b/Mage.Sets/src/mage/sets/gameday/StranglerootGeist.java
@@ -37,7 +37,7 @@ public class StranglerootGeist extends mage.sets.darkascension.StranglerootGeist
 
     public StranglerootGeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/SupplantForm.java b/Mage.Sets/src/mage/sets/gameday/SupplantForm.java
index 52d9140dac..425e851680 100644
--- a/Mage.Sets/src/mage/sets/gameday/SupplantForm.java
+++ b/Mage.Sets/src/mage/sets/gameday/SupplantForm.java
@@ -37,7 +37,7 @@ public class SupplantForm extends mage.sets.fatereforged.SupplantForm {
 
     public SupplantForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/SuturePriest.java b/Mage.Sets/src/mage/sets/gameday/SuturePriest.java
index 143c18a117..8c2e21307c 100644
--- a/Mage.Sets/src/mage/sets/gameday/SuturePriest.java
+++ b/Mage.Sets/src/mage/sets/gameday/SuturePriest.java
@@ -37,7 +37,7 @@ public class SuturePriest extends mage.sets.newphyrexia.SuturePriest {
 
     public SuturePriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/TemperedSteel.java b/Mage.Sets/src/mage/sets/gameday/TemperedSteel.java
index 91308384c7..0883557e0b 100644
--- a/Mage.Sets/src/mage/sets/gameday/TemperedSteel.java
+++ b/Mage.Sets/src/mage/sets/gameday/TemperedSteel.java
@@ -37,7 +37,7 @@ public class TemperedSteel extends mage.sets.scarsofmirrodin.TemperedSteel {
 
     public TemperedSteel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/TreasureMage.java b/Mage.Sets/src/mage/sets/gameday/TreasureMage.java
index a7ac31b616..fe1b510927 100644
--- a/Mage.Sets/src/mage/sets/gameday/TreasureMage.java
+++ b/Mage.Sets/src/mage/sets/gameday/TreasureMage.java
@@ -37,7 +37,7 @@ public class TreasureMage extends mage.sets.mirrodinbesieged.TreasureMage {
 
     public TreasureMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/TrostanisSummoner.java b/Mage.Sets/src/mage/sets/gameday/TrostanisSummoner.java
index 12c1608f6d..e9b2c2378d 100644
--- a/Mage.Sets/src/mage/sets/gameday/TrostanisSummoner.java
+++ b/Mage.Sets/src/mage/sets/gameday/TrostanisSummoner.java
@@ -37,7 +37,7 @@ public class TrostanisSummoner extends mage.sets.dragonsmaze.TrostanisSummoner {
 
     public TrostanisSummoner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/Unsubstantiate.java b/Mage.Sets/src/mage/sets/gameday/Unsubstantiate.java
index 3876e45be6..d749715e73 100644
--- a/Mage.Sets/src/mage/sets/gameday/Unsubstantiate.java
+++ b/Mage.Sets/src/mage/sets/gameday/Unsubstantiate.java
@@ -37,7 +37,7 @@ public class Unsubstantiate extends mage.sets.eldritchmoon.Unsubstantiate {
 
     public Unsubstantiate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/UtterEnd.java b/Mage.Sets/src/mage/sets/gameday/UtterEnd.java
index 27776f3eb4..89bfa10465 100644
--- a/Mage.Sets/src/mage/sets/gameday/UtterEnd.java
+++ b/Mage.Sets/src/mage/sets/gameday/UtterEnd.java
@@ -37,7 +37,7 @@ public class UtterEnd extends mage.sets.khansoftarkir.UtterEnd {
 
     public UtterEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ZameckGuildmage.java b/Mage.Sets/src/mage/sets/gameday/ZameckGuildmage.java
index 97dbfca203..4253e65623 100644
--- a/Mage.Sets/src/mage/sets/gameday/ZameckGuildmage.java
+++ b/Mage.Sets/src/mage/sets/gameday/ZameckGuildmage.java
@@ -37,7 +37,7 @@ public class ZameckGuildmage extends mage.sets.gatecrash.ZameckGuildmage {
 
     public ZameckGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gameday/ZombieApocalypse.java b/Mage.Sets/src/mage/sets/gameday/ZombieApocalypse.java
index 3f89cbbeee..92b0334126 100644
--- a/Mage.Sets/src/mage/sets/gameday/ZombieApocalypse.java
+++ b/Mage.Sets/src/mage/sets/gameday/ZombieApocalypse.java
@@ -37,7 +37,7 @@ public class ZombieApocalypse extends mage.sets.darkascension.ZombieApocalypse {
 
     public ZombieApocalypse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MGDC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/AlbinoTroll.java b/Mage.Sets/src/mage/sets/garrukvsliliana/AlbinoTroll.java
index 7d9c9686c5..3108162d4e 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/AlbinoTroll.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/AlbinoTroll.java
@@ -37,7 +37,7 @@ public class AlbinoTroll extends mage.sets.urzassaga.AlbinoTroll {
 
     public AlbinoTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/BadMoon.java b/Mage.Sets/src/mage/sets/garrukvsliliana/BadMoon.java
index 335960478e..22f833807f 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/BaskingRootwalla.java b/Mage.Sets/src/mage/sets/garrukvsliliana/BaskingRootwalla.java
index bb0e3d355b..b7da53f506 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/BaskingRootwalla.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/BaskingRootwalla.java
@@ -37,7 +37,7 @@ public class BaskingRootwalla extends mage.sets.torment.BaskingRootwalla {
 
     public BaskingRootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/BeastAttack.java b/Mage.Sets/src/mage/sets/garrukvsliliana/BeastAttack.java
index 1cf3715774..6f0d1d1b53 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/BeastAttack.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/BeastAttack.java
@@ -37,7 +37,7 @@ public class BeastAttack extends mage.sets.odyssey.BeastAttack {
 
     public BeastAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Blastoderm.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Blastoderm.java
index b6524d406e..6990b2d601 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Blastoderm.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Blastoderm.java
@@ -37,7 +37,7 @@ public class Blastoderm extends mage.sets.nemesis.Blastoderm {
 
     public Blastoderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Corrupt.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Corrupt.java
index 49ffc7f83e..cca72243ad 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Corrupt.java
@@ -37,7 +37,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Deathgreeter.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Deathgreeter.java
index 2005efe224..3d2f22fcca 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Deathgreeter.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Deathgreeter.java
@@ -37,7 +37,7 @@ public class Deathgreeter extends mage.sets.shardsofalara.Deathgreeter {
 
     public Deathgreeter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/garrukvsliliana/DrudgeSkeletons.java
index 2717abb14a..bd1f0b754a 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/ElephantGuide.java b/Mage.Sets/src/mage/sets/garrukvsliliana/ElephantGuide.java
index d443a82b77..471ed4809f 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/ElephantGuide.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/ElephantGuide.java
@@ -37,7 +37,7 @@ public class ElephantGuide extends mage.sets.judgment.ElephantGuide {
 
     public ElephantGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Enslave.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Enslave.java
index 0fe57bbef9..a8e3c69b5d 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Enslave.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Enslave.java
@@ -37,7 +37,7 @@ public class Enslave extends mage.sets.newphyrexia.Enslave {
 
     public Enslave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/FaerieMacabre.java b/Mage.Sets/src/mage/sets/garrukvsliliana/FaerieMacabre.java
index 2cddf8c631..e6302ba824 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/FaerieMacabre.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/FaerieMacabre.java
@@ -37,7 +37,7 @@ public class FaerieMacabre extends mage.sets.shadowmoor.FaerieMacabre {
 
     public FaerieMacabre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/garrukvsliliana/FleshbagMarauder.java
index 6a2baa3cb8..0783ee1681 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/FleshbagMarauder.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/FleshbagMarauder.java
@@ -37,7 +37,7 @@ public class FleshbagMarauder extends mage.sets.shardsofalara.FleshbagMarauder {
 
     public FleshbagMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/garrukvsliliana/GarrukWildspeaker.java
index d725de4faf..6891d97ab2 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/GarrukWildspeaker.java
@@ -37,7 +37,7 @@ public class GarrukWildspeaker extends mage.sets.magic2010.GarrukWildspeaker {
 
     public GarrukWildspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheCedars.java b/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheCedars.java
index b6a9805b5a..0849db9965 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheCedars.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheCedars.java
@@ -37,7 +37,7 @@ public class GenjuOfTheCedars extends mage.sets.betrayersofkamigawa.GenjuOfTheCe
 
     public GenjuOfTheCedars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheFens.java b/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheFens.java
index ed2d65b377..0822e668fb 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheFens.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/GenjuOfTheFens.java
@@ -37,7 +37,7 @@ public class GenjuOfTheFens extends mage.sets.betrayersofkamigawa.GenjuOfTheFens
 
     public GenjuOfTheFens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/GhostLitStalker.java b/Mage.Sets/src/mage/sets/garrukvsliliana/GhostLitStalker.java
index 540de8e6de..64c182f3c0 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/GhostLitStalker.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/GhostLitStalker.java
@@ -37,7 +37,7 @@ public class GhostLitStalker extends mage.sets.saviorsofkamigawa.GhostLitStalker
 
     public GhostLitStalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/GiantGrowth.java b/Mage.Sets/src/mage/sets/garrukvsliliana/GiantGrowth.java
index 53e7212e27..04c5950f78 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Harmonize.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Harmonize.java
index dc9bdd9931..15e6ceace1 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Harmonize.java
@@ -37,7 +37,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/HideousEnd.java b/Mage.Sets/src/mage/sets/garrukvsliliana/HideousEnd.java
index 664034ef3a..de7a81dd74 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/HideousEnd.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/HideousEnd.java
@@ -37,7 +37,7 @@ public class HideousEnd extends mage.sets.zendikar.HideousEnd {
 
     public HideousEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/HowlingBanshee.java b/Mage.Sets/src/mage/sets/garrukvsliliana/HowlingBanshee.java
index 401b486d77..1c02edaea5 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/HowlingBanshee.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/HowlingBanshee.java
@@ -37,7 +37,7 @@ public class HowlingBanshee extends mage.sets.magic2010.HowlingBanshee {
 
     public HowlingBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/IchorSlick.java b/Mage.Sets/src/mage/sets/garrukvsliliana/IchorSlick.java
index b629a296e4..cbddb1cf07 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/IchorSlick.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/IchorSlick.java
@@ -37,7 +37,7 @@ public class IchorSlick extends mage.sets.futuresight.IchorSlick {
 
     public IchorSlick(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/garrukvsliliana/IndrikStomphowler.java
index 7bcc14e348..7ff29aacab 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/IndrikStomphowler.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/IndrikStomphowler.java
@@ -37,7 +37,7 @@ public class IndrikStomphowler extends mage.sets.dissension.IndrikStomphowler {
 
     public IndrikStomphowler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Invigorate.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Invigorate.java
index 2bf96d4417..624f30b5dc 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Invigorate.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Invigorate.java
@@ -37,7 +37,7 @@ public class Invigorate extends mage.sets.commander.Invigorate {
 
     public Invigorate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/KeeningBanshee.java b/Mage.Sets/src/mage/sets/garrukvsliliana/KeeningBanshee.java
index 538f46104c..da531ae8cd 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/KeeningBanshee.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/KeeningBanshee.java
@@ -37,7 +37,7 @@ public class KeeningBanshee extends mage.sets.ravnica.KeeningBanshee {
 
     public KeeningBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/KrosanTusker.java b/Mage.Sets/src/mage/sets/garrukvsliliana/KrosanTusker.java
index 483dca2957..96482385e7 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Lignify.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Lignify.java
index 0379adc37f..f7e7986e0b 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Lignify.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Lignify.java
@@ -37,7 +37,7 @@ public class Lignify extends mage.sets.lorwyn.Lignify {
 
     public Lignify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/LilianaVess.java b/Mage.Sets/src/mage/sets/garrukvsliliana/LilianaVess.java
index 3521b49939..9b33c78a76 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/LilianaVess.java
@@ -37,7 +37,7 @@ public class LilianaVess extends mage.sets.magic2010.LilianaVess {
 
     public LilianaVess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Mutilate.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Mutilate.java
index 60b433bef0..e1bdbc9fff 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Mutilate.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Mutilate.java
@@ -37,7 +37,7 @@ public class Mutilate extends mage.sets.magic2013.Mutilate {
 
     public Mutilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/NaturesLore.java b/Mage.Sets/src/mage/sets/garrukvsliliana/NaturesLore.java
index fafc846601..aac7a27d55 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDD";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Overrun.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Overrun.java
index 7260b94e9d..5c42e73532 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Overrun.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/PhyrexianRager.java b/Mage.Sets/src/mage/sets/garrukvsliliana/PhyrexianRager.java
index 0f8f8c64d3..a842a7820b 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/PhyrexianRager.java
@@ -37,7 +37,7 @@ public class PhyrexianRager extends mage.sets.tenthedition.PhyrexianRager {
 
     public PhyrexianRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/PlatedSlagwurm.java b/Mage.Sets/src/mage/sets/garrukvsliliana/PlatedSlagwurm.java
index 12a719fd49..af7232ebcc 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/PlatedSlagwurm.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/PlatedSlagwurm.java
@@ -37,7 +37,7 @@ public class PlatedSlagwurm extends mage.sets.mirrodin.PlatedSlagwurm {
 
     public PlatedSlagwurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/PollutedMire.java b/Mage.Sets/src/mage/sets/garrukvsliliana/PollutedMire.java
index 7be0ced1d4..d07d6536c8 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/PollutedMire.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/PollutedMire.java
@@ -37,7 +37,7 @@ public class PollutedMire extends mage.sets.urzassaga.PollutedMire {
 
     public PollutedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Rancor.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Rancor.java
index e4cf30a802..59b2855318 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Rancor.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Rancor.java
@@ -37,7 +37,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousBaloth.java b/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousBaloth.java
index a40a2092a7..11e04e927a 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousBaloth.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousBaloth.java
@@ -37,7 +37,7 @@ public class RavenousBaloth extends mage.sets.onslaught.RavenousBaloth {
 
     public RavenousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousRats.java b/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousRats.java
index e220a9d0c5..0245b9b50d 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/garrukvsliliana/RiseFromTheGrave.java
index 68c905bafa..1f036a9c5c 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/RiseFromTheGrave.java
@@ -37,7 +37,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/RudeAwakening.java b/Mage.Sets/src/mage/sets/garrukvsliliana/RudeAwakening.java
index 6571f7d665..cd7ab5fd75 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/RudeAwakening.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/RudeAwakening.java
@@ -37,7 +37,7 @@ public class RudeAwakening extends mage.sets.modernmasters.RudeAwakening {
 
     public RudeAwakening(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/SerratedArrows.java b/Mage.Sets/src/mage/sets/garrukvsliliana/SerratedArrows.java
index b38febb26a..c2e2652b7c 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/SerratedArrows.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/SerratedArrows.java
@@ -37,7 +37,7 @@ public class SerratedArrows extends mage.sets.homelands.SerratedArrows {
 
     public SerratedArrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/SignInBlood.java b/Mage.Sets/src/mage/sets/garrukvsliliana/SignInBlood.java
index a659a12fc5..edc008045e 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/SkeletalVampire.java b/Mage.Sets/src/mage/sets/garrukvsliliana/SkeletalVampire.java
index ea0d63b4e7..f6d28054b4 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/SkeletalVampire.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/SkeletalVampire.java
@@ -37,7 +37,7 @@ public class SkeletalVampire extends mage.sets.guildpact.SkeletalVampire {
 
     public SkeletalVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/SlipperyKarst.java b/Mage.Sets/src/mage/sets/garrukvsliliana/SlipperyKarst.java
index 66fe04e31d..f3f0e9282c 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/SlipperyKarst.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/SlipperyKarst.java
@@ -37,7 +37,7 @@ public class SlipperyKarst extends mage.sets.urzassaga.SlipperyKarst {
 
     public SlipperyKarst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/SnuffOut.java b/Mage.Sets/src/mage/sets/garrukvsliliana/SnuffOut.java
index 7eb894c6b5..da8b581677 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/SnuffOut.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/SnuffOut.java
@@ -37,7 +37,7 @@ public class SnuffOut extends mage.sets.mercadianmasques.SnuffOut {
 
     public SnuffOut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/StampedingWildebeests.java b/Mage.Sets/src/mage/sets/garrukvsliliana/StampedingWildebeests.java
index 3e1b1c980a..cd0ed64b32 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/StampedingWildebeests.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/StampedingWildebeests.java
@@ -37,7 +37,7 @@ public class StampedingWildebeests extends mage.sets.tenthedition.StampedingWild
 
     public StampedingWildebeests(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/garrukvsliliana/TendrilsOfCorruption.java
index e6359ffcce..f124c0697a 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/TendrilsOfCorruption.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/TendrilsOfCorruption.java
@@ -37,7 +37,7 @@ public class TendrilsOfCorruption extends mage.sets.magic2010.TendrilsOfCorrupti
 
     public TendrilsOfCorruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/TreetopVillage.java b/Mage.Sets/src/mage/sets/garrukvsliliana/TreetopVillage.java
index 61ec7e3823..d0d549761f 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/TreetopVillage.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/TreetopVillage.java
@@ -37,7 +37,7 @@ public class TreetopVillage extends mage.sets.tenthedition.TreetopVillage {
 
     public TreetopVillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/TwistedAbomination.java b/Mage.Sets/src/mage/sets/garrukvsliliana/TwistedAbomination.java
index cbe5abd65a..c7f42aca16 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/TwistedAbomination.java
@@ -38,7 +38,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDD";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/UrborgSyphonMage.java b/Mage.Sets/src/mage/sets/garrukvsliliana/UrborgSyphonMage.java
index 7e68f4a0a1..f5f897d6a9 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/UrborgSyphonMage.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/UrborgSyphonMage.java
@@ -37,7 +37,7 @@ public class UrborgSyphonMage extends mage.sets.timespiral.UrborgSyphonMage {
 
     public UrborgSyphonMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/VampireBats.java b/Mage.Sets/src/mage/sets/garrukvsliliana/VampireBats.java
index 3a3653a3ae..be8c1ca831 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/VampireBats.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/VampireBats.java
@@ -37,7 +37,7 @@ public class VampireBats extends mage.sets.fifthedition.VampireBats {
 
     public VampireBats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/ViciousHunger.java b/Mage.Sets/src/mage/sets/garrukvsliliana/ViciousHunger.java
index ada205c813..1b6e15083b 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/ViciousHunger.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/ViciousHunger.java
@@ -37,7 +37,7 @@ public class ViciousHunger extends mage.sets.nemesis.ViciousHunger {
 
     public ViciousHunger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/VineTrellis.java b/Mage.Sets/src/mage/sets/garrukvsliliana/VineTrellis.java
index 564cf989c2..63cff3fab3 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/VineTrellis.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/VineTrellis.java
@@ -37,7 +37,7 @@ public class VineTrellis extends mage.sets.mercadianmasques.VineTrellis {
 
     public VineTrellis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/WallOfBone.java b/Mage.Sets/src/mage/sets/garrukvsliliana/WallOfBone.java
index fdaf74ce5d..41aff06ea4 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/WildMongrel.java b/Mage.Sets/src/mage/sets/garrukvsliliana/WildMongrel.java
index 7396bb40e8..522c390686 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/WildMongrel.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/WildMongrel.java
@@ -37,7 +37,7 @@ public class WildMongrel extends mage.sets.odyssey.WildMongrel {
 
     public WildMongrel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/Windstorm.java b/Mage.Sets/src/mage/sets/garrukvsliliana/Windstorm.java
index d52a416b60..be88257ee9 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/Windstorm.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/Windstorm.java
@@ -37,7 +37,7 @@ public class Windstorm extends mage.sets.magic2010.Windstorm {
 
     public Windstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/garrukvsliliana/WirewoodSavage.java b/Mage.Sets/src/mage/sets/garrukvsliliana/WirewoodSavage.java
index 1270a1e025..43de9f7e75 100644
--- a/Mage.Sets/src/mage/sets/garrukvsliliana/WirewoodSavage.java
+++ b/Mage.Sets/src/mage/sets/garrukvsliliana/WirewoodSavage.java
@@ -37,7 +37,7 @@ public class WirewoodSavage extends mage.sets.onslaught.WirewoodSavage {
 
     public WirewoodSavage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java b/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java
index ecf935687e..d1980c267c 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java
@@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "GTC";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/AssaultGriffin.java b/Mage.Sets/src/mage/sets/gatecrash/AssaultGriffin.java
index 5b4b18e7c2..1e281bc3fa 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AssaultGriffin.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AssaultGriffin.java
@@ -37,7 +37,7 @@ public class AssaultGriffin extends mage.sets.magic2011.AssaultGriffin {
 
     public AssaultGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/BeckonApparition.java b/Mage.Sets/src/mage/sets/gatecrash/BeckonApparition.java
index 1d14193b5a..8dafefddd2 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/BeckonApparition.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/BeckonApparition.java
@@ -37,7 +37,7 @@ public class BeckonApparition extends mage.sets.eventide.BeckonApparition {
 
     public BeckonApparition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/BreedingPool.java b/Mage.Sets/src/mage/sets/gatecrash/BreedingPool.java
index 48bc07c756..2acf6d116a 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/BreedingPool.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/BreedingPool.java
@@ -37,7 +37,7 @@ public class BreedingPool extends mage.sets.dissension.BreedingPool {
 
     public BreedingPool(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ContaminatedGround.java b/Mage.Sets/src/mage/sets/gatecrash/ContaminatedGround.java
index b6480b2d24..89197157bf 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ContaminatedGround.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ContaminatedGround.java
@@ -37,7 +37,7 @@ public class ContaminatedGround extends mage.sets.riseoftheeldrazi.ContaminatedG
 
     public ContaminatedGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java b/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java
index 18c821e4a2..42307becf0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java
@@ -38,7 +38,7 @@ public class FrenziedTilling extends mage.sets.invasion.FrenziedTilling {
 
     public FrenziedTilling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "GTC";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GodlessShrine.java b/Mage.Sets/src/mage/sets/gatecrash/GodlessShrine.java
index 72e3e99ba7..4b3a54c4e5 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GodlessShrine.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GodlessShrine.java
@@ -37,7 +37,7 @@ public class GodlessShrine extends mage.sets.guildpact.GodlessShrine {
 
     public GodlessShrine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/Naturalize.java b/Mage.Sets/src/mage/sets/gatecrash/Naturalize.java
index eecb52e7b1..1104d4eedd 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/PropheticPrism.java b/Mage.Sets/src/mage/sets/gatecrash/PropheticPrism.java
index 0336cdefca..fd3990a83e 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/PropheticPrism.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/PropheticPrism.java
@@ -37,7 +37,7 @@ public class PropheticPrism extends mage.sets.riseoftheeldrazi.PropheticPrism {
 
     public PropheticPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SacredFoundry.java b/Mage.Sets/src/mage/sets/gatecrash/SacredFoundry.java
index c79c7a9219..53741156b0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SacredFoundry.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SacredFoundry.java
@@ -37,7 +37,7 @@ public class SacredFoundry extends mage.sets.ravnica.SacredFoundry {
 
     public SacredFoundry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkyknightLegionnaire.java b/Mage.Sets/src/mage/sets/gatecrash/SkyknightLegionnaire.java
index bdf5cb1e18..c530945cde 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SkyknightLegionnaire.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SkyknightLegionnaire.java
@@ -37,7 +37,7 @@ public class SkyknightLegionnaire extends mage.sets.ravnica.SkyknightLegionnaire
 
     public SkyknightLegionnaire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/Smite.java b/Mage.Sets/src/mage/sets/gatecrash/Smite.java
index 078df2b4e0..21dc67dfd6 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Smite.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Smite.java
@@ -37,7 +37,7 @@ public class Smite extends mage.sets.riseoftheeldrazi.Smite {
 
     public Smite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/StompingGround.java b/Mage.Sets/src/mage/sets/gatecrash/StompingGround.java
index c1caaab238..db274bab89 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/StompingGround.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/StompingGround.java
@@ -37,7 +37,7 @@ public class StompingGround extends mage.sets.guildpact.StompingGround {
 
     public StompingGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/WateryGrave.java b/Mage.Sets/src/mage/sets/gatecrash/WateryGrave.java
index 448756cf6b..652ba9539a 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/WateryGrave.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/WateryGrave.java
@@ -37,7 +37,7 @@ public class WateryGrave extends mage.sets.ravnica.WateryGrave {
 
     public WateryGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "GTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/AllIsDust.java b/Mage.Sets/src/mage/sets/grandprix/AllIsDust.java
index 4c986045d3..8a9b1d85d5 100644
--- a/Mage.Sets/src/mage/sets/grandprix/AllIsDust.java
+++ b/Mage.Sets/src/mage/sets/grandprix/AllIsDust.java
@@ -37,7 +37,7 @@ public class AllIsDust extends mage.sets.riseoftheeldrazi.AllIsDust {
 
     public AllIsDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/Batterskull.java b/Mage.Sets/src/mage/sets/grandprix/Batterskull.java
index 6090871f88..0030ebe62f 100644
--- a/Mage.Sets/src/mage/sets/grandprix/Batterskull.java
+++ b/Mage.Sets/src/mage/sets/grandprix/Batterskull.java
@@ -37,7 +37,7 @@ public class Batterskull extends mage.sets.newphyrexia.Batterskull {
 
     public Batterskull(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/CallOfTheHerd.java b/Mage.Sets/src/mage/sets/grandprix/CallOfTheHerd.java
index 91c9123ec9..7b0308be96 100644
--- a/Mage.Sets/src/mage/sets/grandprix/CallOfTheHerd.java
+++ b/Mage.Sets/src/mage/sets/grandprix/CallOfTheHerd.java
@@ -38,7 +38,7 @@ public class CallOfTheHerd extends mage.sets.timeshifted.CallOfTheHerd {
 
     public CallOfTheHerd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "GPX";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/grandprix/ChromeMox.java b/Mage.Sets/src/mage/sets/grandprix/ChromeMox.java
index 7fc0b33602..610efc19c7 100644
--- a/Mage.Sets/src/mage/sets/grandprix/ChromeMox.java
+++ b/Mage.Sets/src/mage/sets/grandprix/ChromeMox.java
@@ -37,7 +37,7 @@ public class ChromeMox extends mage.sets.mirrodin.ChromeMox {
 
     public ChromeMox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/GoblinGuide.java b/Mage.Sets/src/mage/sets/grandprix/GoblinGuide.java
index 7fe6cdfd98..6e87b47077 100644
--- a/Mage.Sets/src/mage/sets/grandprix/GoblinGuide.java
+++ b/Mage.Sets/src/mage/sets/grandprix/GoblinGuide.java
@@ -37,7 +37,7 @@ public class GoblinGuide extends mage.sets.zendikar.GoblinGuide {
 
     public GoblinGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/Griselbrand.java b/Mage.Sets/src/mage/sets/grandprix/Griselbrand.java
index d06ee249d2..43baffd5bc 100644
--- a/Mage.Sets/src/mage/sets/grandprix/Griselbrand.java
+++ b/Mage.Sets/src/mage/sets/grandprix/Griselbrand.java
@@ -37,7 +37,7 @@ public class Griselbrand extends mage.sets.avacynrestored.Griselbrand {
 
     public Griselbrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/LotusCobra.java b/Mage.Sets/src/mage/sets/grandprix/LotusCobra.java
index a544b96c51..b086eb8d09 100644
--- a/Mage.Sets/src/mage/sets/grandprix/LotusCobra.java
+++ b/Mage.Sets/src/mage/sets/grandprix/LotusCobra.java
@@ -37,7 +37,7 @@ public class LotusCobra extends mage.sets.zendikar.LotusCobra {
 
     public LotusCobra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/MaelstromPulse.java b/Mage.Sets/src/mage/sets/grandprix/MaelstromPulse.java
index 3ee40cba55..9fa0c00428 100644
--- a/Mage.Sets/src/mage/sets/grandprix/MaelstromPulse.java
+++ b/Mage.Sets/src/mage/sets/grandprix/MaelstromPulse.java
@@ -37,7 +37,7 @@ public class MaelstromPulse extends mage.sets.alarareborn.MaelstromPulse {
 
     public MaelstromPulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/PrimevalTitan.java b/Mage.Sets/src/mage/sets/grandprix/PrimevalTitan.java
index b2b8cca5cd..c858d553af 100644
--- a/Mage.Sets/src/mage/sets/grandprix/PrimevalTitan.java
+++ b/Mage.Sets/src/mage/sets/grandprix/PrimevalTitan.java
@@ -37,7 +37,7 @@ public class PrimevalTitan extends mage.sets.magic2011.PrimevalTitan {
 
     public PrimevalTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/Spiritmonger.java b/Mage.Sets/src/mage/sets/grandprix/Spiritmonger.java
index b274d28b40..322fdff9d8 100644
--- a/Mage.Sets/src/mage/sets/grandprix/Spiritmonger.java
+++ b/Mage.Sets/src/mage/sets/grandprix/Spiritmonger.java
@@ -37,7 +37,7 @@ public class Spiritmonger extends mage.sets.apocalypse.Spiritmonger {
 
     public Spiritmonger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/StoneforgeMystic.java b/Mage.Sets/src/mage/sets/grandprix/StoneforgeMystic.java
index d1d935e140..569d604687 100644
--- a/Mage.Sets/src/mage/sets/grandprix/StoneforgeMystic.java
+++ b/Mage.Sets/src/mage/sets/grandprix/StoneforgeMystic.java
@@ -37,7 +37,7 @@ public class StoneforgeMystic extends mage.sets.worldwake.StoneforgeMystic {
 
     public StoneforgeMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/grandprix/UmezawasJitte.java b/Mage.Sets/src/mage/sets/grandprix/UmezawasJitte.java
index 36552b0708..e854e52090 100644
--- a/Mage.Sets/src/mage/sets/grandprix/UmezawasJitte.java
+++ b/Mage.Sets/src/mage/sets/grandprix/UmezawasJitte.java
@@ -37,7 +37,7 @@ public class UmezawasJitte extends mage.sets.betrayersofkamigawa.UmezawasJitte {
 
     public UmezawasJitte(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "GPX";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/DjinnIlluminatus.java b/Mage.Sets/src/mage/sets/guildpact/DjinnIlluminatus.java
index 4476ddc0ca..a127df16f6 100644
--- a/Mage.Sets/src/mage/sets/guildpact/DjinnIlluminatus.java
+++ b/Mage.Sets/src/mage/sets/guildpact/DjinnIlluminatus.java
@@ -38,7 +38,7 @@ public class DjinnIlluminatus extends mage.sets.prereleaseevents.DjinnIlluminatu
 
     public DjinnIlluminatus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "GPT";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostWarden.java b/Mage.Sets/src/mage/sets/guildpact/GhostWarden.java
index 45f89229c6..179a85bbf2 100644
--- a/Mage.Sets/src/mage/sets/guildpact/GhostWarden.java
+++ b/Mage.Sets/src/mage/sets/guildpact/GhostWarden.java
@@ -37,7 +37,7 @@ public class GhostWarden extends mage.sets.tenthedition.GhostWarden {
 
     public GhostWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulTurf.java b/Mage.Sets/src/mage/sets/guildpact/GruulTurf.java
index 4641e706d6..e908817168 100644
--- a/Mage.Sets/src/mage/sets/guildpact/GruulTurf.java
+++ b/Mage.Sets/src/mage/sets/guildpact/GruulTurf.java
@@ -36,7 +36,7 @@ public class GruulTurf extends mage.sets.planechase.GruulTurf {
 
     public GruulTurf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheVoid.java b/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheVoid.java
index cb17be31fe..356e86857c 100644
--- a/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheVoid.java
+++ b/Mage.Sets/src/mage/sets/guildpact/LeylineOfTheVoid.java
@@ -37,7 +37,7 @@ public class LeylineOfTheVoid extends mage.sets.magic2011.LeylineOfTheVoid {
 
     public LeylineOfTheVoid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/NivixAerieOfTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/NivixAerieOfTheFiremind.java
index 3239fb5a1c..a591d4a56b 100644
--- a/Mage.Sets/src/mage/sets/guildpact/NivixAerieOfTheFiremind.java
+++ b/Mage.Sets/src/mage/sets/guildpact/NivixAerieOfTheFiremind.java
@@ -37,7 +37,7 @@ public class NivixAerieOfTheFiremind extends mage.sets.izzetvsgolgari.NivixAerie
 
     public NivixAerieOfTheFiremind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/OgreSavant.java b/Mage.Sets/src/mage/sets/guildpact/OgreSavant.java
index 8095753e59..f51971d3e1 100644
--- a/Mage.Sets/src/mage/sets/guildpact/OgreSavant.java
+++ b/Mage.Sets/src/mage/sets/guildpact/OgreSavant.java
@@ -37,7 +37,7 @@ public class OgreSavant extends mage.sets.ajanivsnicolbolas.OgreSavant {
 
     public OgreSavant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java b/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java
index 9ad228ec56..f5a4ce70e4 100644
--- a/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java
+++ b/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java
@@ -37,7 +37,7 @@ public class RevenantPatriarch extends mage.sets.sorinvstibalt.RevenantPatriarch
 
     public RevenantPatriarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/SavageTwister.java b/Mage.Sets/src/mage/sets/guildpact/SavageTwister.java
index c89c3a38f5..34a035cc83 100644
--- a/Mage.Sets/src/mage/sets/guildpact/SavageTwister.java
+++ b/Mage.Sets/src/mage/sets/guildpact/SavageTwister.java
@@ -37,7 +37,7 @@ public class SavageTwister extends mage.sets.commander2013.SavageTwister {
 
     public SavageTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/SkarrganFirebird.java b/Mage.Sets/src/mage/sets/guildpact/SkarrganFirebird.java
index 833bfa16f5..d48f3eab14 100644
--- a/Mage.Sets/src/mage/sets/guildpact/SkarrganFirebird.java
+++ b/Mage.Sets/src/mage/sets/guildpact/SkarrganFirebird.java
@@ -37,7 +37,7 @@ public class SkarrganFirebird extends mage.sets.heroesvsmonsters.SkarrganFirebir
 
     public SkarrganFirebird(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/SkarrganSkybreaker.java b/Mage.Sets/src/mage/sets/guildpact/SkarrganSkybreaker.java
index fb6ea51ade..17f6770c63 100644
--- a/Mage.Sets/src/mage/sets/guildpact/SkarrganSkybreaker.java
+++ b/Mage.Sets/src/mage/sets/guildpact/SkarrganSkybreaker.java
@@ -37,7 +37,7 @@ public class SkarrganSkybreaker extends mage.sets.heroesvsmonsters.SkarrganSkybr
 
     public SkarrganSkybreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/SteamcoreWeird.java b/Mage.Sets/src/mage/sets/guildpact/SteamcoreWeird.java
index a27ab8e1f8..c148588fee 100644
--- a/Mage.Sets/src/mage/sets/guildpact/SteamcoreWeird.java
+++ b/Mage.Sets/src/mage/sets/guildpact/SteamcoreWeird.java
@@ -37,7 +37,7 @@ public class SteamcoreWeird extends mage.sets.izzetvsgolgari.SteamcoreWeird {
 
     public SteamcoreWeird(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/SwordOfTheParuns.java b/Mage.Sets/src/mage/sets/guildpact/SwordOfTheParuns.java
index 3eee06976b..94af1f22cd 100644
--- a/Mage.Sets/src/mage/sets/guildpact/SwordOfTheParuns.java
+++ b/Mage.Sets/src/mage/sets/guildpact/SwordOfTheParuns.java
@@ -37,7 +37,7 @@ public class SwordOfTheParuns extends mage.sets.commander2013.SwordOfTheParuns {
 
     public SwordOfTheParuns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "GPT";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/AnaxAndCymede.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/AnaxAndCymede.java
index 90e65685d5..5e1e54abc9 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/AnaxAndCymede.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/AnaxAndCymede.java
@@ -37,7 +37,7 @@ public class AnaxAndCymede extends mage.sets.theros.AnaxAndCymede {
 
     public AnaxAndCymede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/ArmoryGuard.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ArmoryGuard.java
index a3dbf6057e..716478d0ce 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ArmoryGuard.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ArmoryGuard.java
@@ -37,7 +37,7 @@ public class ArmoryGuard extends mage.sets.returntoravnica.ArmoryGuard {
 
     public ArmoryGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/Auramancer.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/Auramancer.java
index 19d7d839d6..92cf6713fa 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/Auramancer.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/Auramancer.java
@@ -37,7 +37,7 @@ public class Auramancer extends mage.sets.magic2012.Auramancer {
 
     public Auramancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/BattleMastery.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/BattleMastery.java
index f0ef06fc59..de821ddd9d 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/BattleMastery.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/BattleMastery.java
@@ -37,7 +37,7 @@ public class BattleMastery extends mage.sets.lorwyn.BattleMastery {
 
     public BattleMastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/BeastWithin.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/BeastWithin.java
index e0afa91e16..2cf3f5e98c 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/BeastWithin.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/BeastWithin.java
@@ -37,7 +37,7 @@ public class BeastWithin extends mage.sets.newphyrexia.BeastWithin {
 
     public BeastWithin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/BloodOgre.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/BloodOgre.java
index bec5be8867..9050cb8d90 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/BloodOgre.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/BloodOgre.java
@@ -37,7 +37,7 @@ public class BloodOgre extends mage.sets.magic2012.BloodOgre {
 
     public BloodOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/BondsOfFaith.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/BondsOfFaith.java
index 2fca990142..f0c602da61 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/BondsOfFaith.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/BondsOfFaith.java
@@ -37,7 +37,7 @@ public class BondsOfFaith extends mage.sets.innistrad.BondsOfFaith {
 
     public BondsOfFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/BorosGuildgate.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/BorosGuildgate.java
index eb52222d98..20210725c5 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/BorosGuildgate.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/BorosGuildgate.java
@@ -37,7 +37,7 @@ public class BorosGuildgate extends mage.sets.gatecrash.BorosGuildgate {
 
     public BorosGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/CavalryPegasus.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/CavalryPegasus.java
index aaec8b92df..94b168f21e 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/CavalryPegasus.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/CavalryPegasus.java
@@ -37,7 +37,7 @@ public class CavalryPegasus extends mage.sets.theros.CavalryPegasus {
 
     public CavalryPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/Condemn.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/Condemn.java
index 9fe7947428..68762452dd 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/Condemn.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/Condemn.java
@@ -37,7 +37,7 @@ public class Condemn extends mage.sets.tenthedition.Condemn {
 
     public Condemn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/ConqueringManticore.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ConqueringManticore.java
index 3f97f05c16..48d2e7f709 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ConqueringManticore.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ConqueringManticore.java
@@ -37,7 +37,7 @@ public class ConqueringManticore extends mage.sets.riseoftheeldrazi.ConqueringMa
 
     public ConqueringManticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/CraterHellion.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/CraterHellion.java
index e3166facd8..edad26369e 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/CraterHellion.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/CraterHellion.java
@@ -37,7 +37,7 @@ public class CraterHellion extends mage.sets.urzassaga.CraterHellion {
 
     public CraterHellion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/CrownedCeratok.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/CrownedCeratok.java
index 7815008c42..4652490c2a 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/CrownedCeratok.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/CrownedCeratok.java
@@ -37,7 +37,7 @@ public class CrownedCeratok extends mage.sets.gatecrash.CrownedCeratok {
 
     public CrownedCeratok(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/DailyRegimen.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DailyRegimen.java
index 0a83f97075..b456c6bdbb 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DailyRegimen.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DailyRegimen.java
@@ -37,7 +37,7 @@ public class DailyRegimen extends mage.sets.morningtide.DailyRegimen {
 
     public DailyRegimen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/DawnstrikePaladin.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DawnstrikePaladin.java
index 018af92cd6..ab0c5bc4e4 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DawnstrikePaladin.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DawnstrikePaladin.java
@@ -37,7 +37,7 @@ public class DawnstrikePaladin extends mage.sets.magic2014.DawnstrikePaladin {
 
     public DawnstrikePaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DeadlyRecluse.java
index 06f6150e5b..b626cd30fa 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DeadlyRecluse.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DeadlyRecluse.java
@@ -37,7 +37,7 @@ public class DeadlyRecluse extends mage.sets.magic2010.DeadlyRecluse {
 
     public DeadlyRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/DestructiveRevelry.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DestructiveRevelry.java
index 66bae36287..0f45683550 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DestructiveRevelry.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DestructiveRevelry.java
@@ -37,7 +37,7 @@ public class DestructiveRevelry extends mage.sets.theros.DestructiveRevelry {
 
     public DestructiveRevelry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/DragonBlood.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DragonBlood.java
index 2ab9dfe1e2..b30463da4d 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DragonBlood.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DragonBlood.java
@@ -37,7 +37,7 @@ public class DragonBlood extends mage.sets.mirrodin.DragonBlood {
 
     public DragonBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/FencingAce.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/FencingAce.java
index c6e144f73d..ff3b78cbca 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/FencingAce.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/FencingAce.java
@@ -37,7 +37,7 @@ public class FencingAce extends mage.sets.returntoravnica.FencingAce {
 
     public FencingAce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/FigureOfDestiny.java
index d076de7922..66c269436e 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/FigureOfDestiny.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/FigureOfDestiny.java
@@ -37,7 +37,7 @@ public class FigureOfDestiny extends mage.sets.eventide.FigureOfDestiny {
 
     public FigureOfDestiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/FiresOfYavimaya.java
index ac7d0d1b57..8960323587 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/FreewindEquenaut.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/FreewindEquenaut.java
index 55e3f76da6..398ed7c7d3 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/FreewindEquenaut.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/FreewindEquenaut.java
@@ -37,7 +37,7 @@ public class FreewindEquenaut extends mage.sets.dissension.FreewindEquenaut {
 
     public FreewindEquenaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/GhorClanSavage.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/GhorClanSavage.java
index 54bd5f0287..1a36b04cff 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/GhorClanSavage.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/GhorClanSavage.java
@@ -37,7 +37,7 @@ public class GhorClanSavage extends mage.sets.guildpact.GhorClanSavage {
 
     public GhorClanSavage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/GorehornMinotaurs.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/GorehornMinotaurs.java
index c0125dd104..49f2380814 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/GorehornMinotaurs.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/GorehornMinotaurs.java
@@ -37,7 +37,7 @@ public class GorehornMinotaurs extends mage.sets.magic2012.GorehornMinotaurs {
 
     public GorehornMinotaurs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/GriffinGuide.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/GriffinGuide.java
index 5273fc5121..d1741c6fb3 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/GriffinGuide.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/GriffinGuide.java
@@ -37,7 +37,7 @@ public class GriffinGuide extends mage.sets.timespiral.GriffinGuide {
 
     public GriffinGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/GustcloakSentinel.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/GustcloakSentinel.java
index 8bb589929d..0616b412d2 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/GustcloakSentinel.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/GustcloakSentinel.java
@@ -37,7 +37,7 @@ public class GustcloakSentinel extends mage.sets.onslaught.GustcloakSentinel {
 
     public GustcloakSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/KamahlPitFighter.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/KamahlPitFighter.java
index 26106274c4..fcd84c4db8 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/KamahlPitFighter.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/KamahlPitFighter.java
@@ -37,7 +37,7 @@ public class KamahlPitFighter extends mage.sets.tenthedition.KamahlPitFighter {
 
     public KamahlPitFighter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/KazanduRefuge.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/KazanduRefuge.java
index 1a948c5f0b..9dae2f0cfa 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/KazanduRefuge.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/KazanduRefuge.java
@@ -37,7 +37,7 @@ public class KazanduRefuge extends mage.sets.zendikar.KazanduRefuge {
 
     public KazanduRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/MagmaJet.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/MagmaJet.java
index 683e126857..c66f393b47 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/MagmaJet.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/MagmaJet.java
@@ -37,7 +37,7 @@ public class MagmaJet extends mage.sets.fifthdawn.MagmaJet {
 
     public MagmaJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/MiraculousRecovery.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/MiraculousRecovery.java
index c845f137ff..a7237a9274 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/MiraculousRecovery.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/MiraculousRecovery.java
@@ -37,7 +37,7 @@ public class MiraculousRecovery extends mage.sets.visions.MiraculousRecovery {
 
     public MiraculousRecovery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/MomentOfHeroism.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/MomentOfHeroism.java
index 67ca7189a6..b47685aa58 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/MomentOfHeroism.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/MomentOfHeroism.java
@@ -37,7 +37,7 @@ public class MomentOfHeroism extends mage.sets.innistrad.MomentOfHeroism {
 
     public MomentOfHeroism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/NewBenalia.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/NewBenalia.java
index ebcbd653d3..894c45b420 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/NewBenalia.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/NewBenalia.java
@@ -37,7 +37,7 @@ public class NewBenalia extends mage.sets.futuresight.NewBenalia {
 
     public NewBenalia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/NobilisOfWar.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/NobilisOfWar.java
index 275b717dbd..2682ca68aa 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/NobilisOfWar.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/NobilisOfWar.java
@@ -37,7 +37,7 @@ public class NobilisOfWar extends mage.sets.eventide.NobilisOfWar {
 
     public NobilisOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/OrdealOfPurphoros.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/OrdealOfPurphoros.java
index be7ad3d3ba..03d68959a2 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/OrdealOfPurphoros.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/OrdealOfPurphoros.java
@@ -37,7 +37,7 @@ public class OrdealOfPurphoros extends mage.sets.theros.OrdealOfPurphoros {
 
     public OrdealOfPurphoros(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/PayNoHeed.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/PayNoHeed.java
index 8f699707ff..26d76ab6f4 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/PayNoHeed.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/PayNoHeed.java
@@ -37,7 +37,7 @@ public class PayNoHeed extends mage.sets.magic2014.PayNoHeed {
 
     public PayNoHeed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/PolukranosWorldEater.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/PolukranosWorldEater.java
index 1c5bb9bc2f..e97f4ebcd7 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/PolukranosWorldEater.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/PolukranosWorldEater.java
@@ -37,7 +37,7 @@ public class PolukranosWorldEater extends mage.sets.theros.PolukranosWorldEater
 
     public PolukranosWorldEater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/PreyUpon.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/PreyUpon.java
index 525b83d81b..41257721ce 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/PreyUpon.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/PreyUpon.java
@@ -37,7 +37,7 @@ public class PreyUpon extends mage.sets.innistrad.PreyUpon {
 
     public PreyUpon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyroclasm.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyroclasm.java
index 9082cfa365..0dd30a9d24 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyroclasm.java
@@ -37,7 +37,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyrokinesis.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyrokinesis.java
index 6d53be0e05..ce4f60620e 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyrokinesis.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/Pyrokinesis.java
@@ -37,7 +37,7 @@ public class Pyrokinesis extends mage.sets.alliances.Pyrokinesis {
 
     public Pyrokinesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/Regrowth.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/Regrowth.java
index 20add2c673..d308d015de 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/Regrowth.java
@@ -37,7 +37,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/Righteousness.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/Righteousness.java
index eb2c811e74..33ea0d4c54 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/Righteousness.java
@@ -38,7 +38,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDL";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SatyrHedonist.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SatyrHedonist.java
index 853232cf15..87cc26f67c 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SatyrHedonist.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SatyrHedonist.java
@@ -37,7 +37,7 @@ public class SatyrHedonist extends mage.sets.theros.SatyrHedonist {
 
     public SatyrHedonist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrgTheRagePits.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrgTheRagePits.java
index abfa4b3f88..8e3ba4235d 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrgTheRagePits.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrgTheRagePits.java
@@ -37,7 +37,7 @@ public class SkarrgTheRagePits extends mage.sets.guildpact.SkarrgTheRagePits {
 
     public SkarrgTheRagePits(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SmiteTheMonstrous.java
index 88d63399f6..409afca2cd 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SmiteTheMonstrous.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SmiteTheMonstrous.java
@@ -37,7 +37,7 @@ public class SmiteTheMonstrous extends mage.sets.innistrad.SmiteTheMonstrous {
 
     public SmiteTheMonstrous(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SomberwaldVigilante.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SomberwaldVigilante.java
index 2c8632549e..21ec5deb18 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SomberwaldVigilante.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SomberwaldVigilante.java
@@ -37,7 +37,7 @@ public class SomberwaldVigilante extends mage.sets.avacynrestored.SomberwaldVigi
 
     public SomberwaldVigilante(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/StandFirm.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/StandFirm.java
index f4292d9515..2f0011b709 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/StandFirm.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/StandFirm.java
@@ -37,7 +37,7 @@ public class StandFirm extends mage.sets.fifthdawn.StandFirm {
 
     public StandFirm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/StunSniper.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/StunSniper.java
index b05d4a3981..8d03b1d78e 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/StunSniper.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/StunSniper.java
@@ -37,7 +37,7 @@ public class StunSniper extends mage.sets.alarareborn.StunSniper {
 
     public StunSniper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SunTitan.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SunTitan.java
index e5a61c8643..8ddc45954f 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SunTitan.java
@@ -37,7 +37,7 @@ public class SunTitan extends mage.sets.magic2011.SunTitan {
 
     public SunTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/TerrifyingPresence.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/TerrifyingPresence.java
index c2aedd8fe0..7e9d9676d7 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/TerrifyingPresence.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/TerrifyingPresence.java
@@ -37,7 +37,7 @@ public class TerrifyingPresence extends mage.sets.avacynrestored.TerrifyingPrese
 
     public TerrifyingPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/ThrabenValiant.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ThrabenValiant.java
index d0e5bc2d14..02a3fef81b 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ThrabenValiant.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ThrabenValiant.java
@@ -37,7 +37,7 @@ public class ThrabenValiant extends mage.sets.avacynrestored.ThrabenValiant {
 
     public ThrabenValiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/TrollAscetic.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/TrollAscetic.java
index cc9193e3f7..9da6072a01 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/TrollAscetic.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/TrollAscetic.java
@@ -37,7 +37,7 @@ public class TrollAscetic extends mage.sets.mirrodin.TrollAscetic {
 
     public TrollAscetic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/TruefirePaladin.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/TruefirePaladin.java
index 89cebbc2e5..db9700068a 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/TruefirePaladin.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/TruefirePaladin.java
@@ -37,7 +37,7 @@ public class TruefirePaladin extends mage.sets.gatecrash.TruefirePaladin {
 
     public TruefirePaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/ValleyRannet.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ValleyRannet.java
index 9caf113d89..3c41947ce1 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ValleyRannet.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ValleyRannet.java
@@ -37,7 +37,7 @@ public class ValleyRannet extends mage.sets.alarareborn.ValleyRannet {
 
     public ValleyRannet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/VoltCharge.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/VoltCharge.java
index 879730856c..5478ff2ee9 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/VoltCharge.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/VoltCharge.java
@@ -37,7 +37,7 @@ public class VoltCharge extends mage.sets.newphyrexia.VoltCharge {
 
     public VoltCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/ZhurTaaDruid.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ZhurTaaDruid.java
index 1151f1de72..4741a2763b 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ZhurTaaDruid.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ZhurTaaDruid.java
@@ -37,7 +37,7 @@ public class ZhurTaaDruid extends mage.sets.dragonsmaze.ZhurTaaDruid {
 
     public ZhurTaaDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDL";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AbbeyGargoyles.java b/Mage.Sets/src/mage/sets/homelands/AbbeyGargoyles.java
index 6ec9431864..5cf188b727 100644
--- a/Mage.Sets/src/mage/sets/homelands/AbbeyGargoyles.java
+++ b/Mage.Sets/src/mage/sets/homelands/AbbeyGargoyles.java
@@ -37,7 +37,7 @@ public class AbbeyGargoyles extends mage.sets.fifthedition.AbbeyGargoyles {
 
     public AbbeyGargoyles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java b/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java
index 63a97db67a..6558056a4e 100644
--- a/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java
+++ b/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java
@@ -37,7 +37,7 @@ public class AbbeyMatron2 extends mage.sets.homelands.AbbeyMatron1 {
 
     public AbbeyMatron2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AlibansTower2.java b/Mage.Sets/src/mage/sets/homelands/AlibansTower2.java
index f9841cce18..9e83e85eec 100644
--- a/Mage.Sets/src/mage/sets/homelands/AlibansTower2.java
+++ b/Mage.Sets/src/mage/sets/homelands/AlibansTower2.java
@@ -37,7 +37,7 @@ public class AlibansTower2 extends AlibansTower1 {
 
     public AlibansTower2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
     }
 
     public AlibansTower2(final AlibansTower2 card) {
diff --git a/Mage.Sets/src/mage/sets/homelands/AmbushParty1.java b/Mage.Sets/src/mage/sets/homelands/AmbushParty1.java
index 4619f98e99..246168d891 100644
--- a/Mage.Sets/src/mage/sets/homelands/AmbushParty1.java
+++ b/Mage.Sets/src/mage/sets/homelands/AmbushParty1.java
@@ -37,7 +37,7 @@ public class AmbushParty1 extends mage.sets.fifthedition.AmbushParty {
 
     public AmbushParty1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AmbushParty2.java b/Mage.Sets/src/mage/sets/homelands/AmbushParty2.java
index 1b1369173a..0efbe2b0b0 100644
--- a/Mage.Sets/src/mage/sets/homelands/AmbushParty2.java
+++ b/Mage.Sets/src/mage/sets/homelands/AmbushParty2.java
@@ -37,7 +37,7 @@ public class AmbushParty2 extends mage.sets.fifthedition.AmbushParty {
 
     public AmbushParty2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AnHavvaConstable.java b/Mage.Sets/src/mage/sets/homelands/AnHavvaConstable.java
index 8f3aaa655e..52aa1203ab 100644
--- a/Mage.Sets/src/mage/sets/homelands/AnHavvaConstable.java
+++ b/Mage.Sets/src/mage/sets/homelands/AnHavvaConstable.java
@@ -37,7 +37,7 @@ public class AnHavvaConstable extends mage.sets.fifthedition.AnHavvaConstable {
 
     public AnHavvaConstable(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard1.java b/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard1.java
index 053e8e1ecb..f7d662c91c 100644
--- a/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard1.java
+++ b/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard1.java
@@ -37,7 +37,7 @@ public class AnabaBodyguard1 extends mage.sets.tenthedition.AnabaBodyguard {
 
     public AnabaBodyguard1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard2.java b/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard2.java
index 3b55af66e4..65223d2956 100644
--- a/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard2.java
+++ b/Mage.Sets/src/mage/sets/homelands/AnabaBodyguard2.java
@@ -37,7 +37,7 @@ public class AnabaBodyguard2 extends mage.sets.tenthedition.AnabaBodyguard {
 
     public AnabaBodyguard2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AnabaShaman1.java b/Mage.Sets/src/mage/sets/homelands/AnabaShaman1.java
index 30229ffff6..8f1bb9fc83 100644
--- a/Mage.Sets/src/mage/sets/homelands/AnabaShaman1.java
+++ b/Mage.Sets/src/mage/sets/homelands/AnabaShaman1.java
@@ -37,7 +37,7 @@ public class AnabaShaman1 extends mage.sets.ninthedition.AnabaShaman {
 
     public AnabaShaman1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AnabaShaman2.java b/Mage.Sets/src/mage/sets/homelands/AnabaShaman2.java
index 19a4b24025..430fde3e4a 100644
--- a/Mage.Sets/src/mage/sets/homelands/AnabaShaman2.java
+++ b/Mage.Sets/src/mage/sets/homelands/AnabaShaman2.java
@@ -37,7 +37,7 @@ public class AnabaShaman2 extends mage.sets.ninthedition.AnabaShaman {
 
     public AnabaShaman2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats1.java b/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats1.java
index 41ecb5594d..eed806ac94 100644
--- a/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats1.java
+++ b/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats1.java
@@ -37,7 +37,7 @@ public class AysenBureaucrats1 extends mage.sets.masterseditionii.AysenBureaucra
 
     public AysenBureaucrats1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats2.java b/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats2.java
index 001037563d..23ad29d4fe 100644
--- a/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats2.java
+++ b/Mage.Sets/src/mage/sets/homelands/AysenBureaucrats2.java
@@ -37,7 +37,7 @@ public class AysenBureaucrats2 extends mage.sets.masterseditionii.AysenBureaucra
 
     public AysenBureaucrats2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/BaronSengir.java b/Mage.Sets/src/mage/sets/homelands/BaronSengir.java
index 1acc37a4fd..d2c8318f69 100644
--- a/Mage.Sets/src/mage/sets/homelands/BaronSengir.java
+++ b/Mage.Sets/src/mage/sets/homelands/BaronSengir.java
@@ -37,7 +37,7 @@ public class BaronSengir extends mage.sets.mastersedition.BaronSengir {
 
     public BaronSengir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java b/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java
index f1e2b3776a..42ad83ddf8 100644
--- a/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java
+++ b/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java
@@ -37,7 +37,7 @@ public class CemeteryGate2 extends mage.sets.homelands.CemeteryGate1 {
 
     public CemeteryGate2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java b/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java
index 2c2ed27140..ec9fff9bf0 100644
--- a/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java
+++ b/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java
@@ -38,7 +38,7 @@ public class ClockworkGnomes extends mage.sets.masterseditioniv.ClockworkGnomes
 
     public ClockworkGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "HML";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/homelands/DarkMaze1.java b/Mage.Sets/src/mage/sets/homelands/DarkMaze1.java
index 82d0978872..edf68681c4 100644
--- a/Mage.Sets/src/mage/sets/homelands/DarkMaze1.java
+++ b/Mage.Sets/src/mage/sets/homelands/DarkMaze1.java
@@ -37,7 +37,7 @@ public class DarkMaze1 extends mage.sets.fifthedition.DarkMaze {
 
     public DarkMaze1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/DarkMaze2.java b/Mage.Sets/src/mage/sets/homelands/DarkMaze2.java
index 5d5cce4955..07296d9ab6 100644
--- a/Mage.Sets/src/mage/sets/homelands/DarkMaze2.java
+++ b/Mage.Sets/src/mage/sets/homelands/DarkMaze2.java
@@ -37,7 +37,7 @@ public class DarkMaze2 extends mage.sets.fifthedition.DarkMaze {
 
     public DarkMaze2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/DrySpell2.java b/Mage.Sets/src/mage/sets/homelands/DrySpell2.java
index 9c7de712ad..c653b7349e 100644
--- a/Mage.Sets/src/mage/sets/homelands/DrySpell2.java
+++ b/Mage.Sets/src/mage/sets/homelands/DrySpell2.java
@@ -37,7 +37,7 @@ public class DrySpell2 extends mage.sets.homelands.DrySpell1 {
 
     public DrySpell2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/DwarvenTrader2.java b/Mage.Sets/src/mage/sets/homelands/DwarvenTrader2.java
index c2bb43bb40..a6987ead38 100644
--- a/Mage.Sets/src/mage/sets/homelands/DwarvenTrader2.java
+++ b/Mage.Sets/src/mage/sets/homelands/DwarvenTrader2.java
@@ -37,7 +37,7 @@ public class DwarvenTrader2 extends mage.sets.homelands.DwarvenTrader1 {
 
     public DwarvenTrader2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/FaerieNoble.java b/Mage.Sets/src/mage/sets/homelands/FaerieNoble.java
index 8224da5cb4..a049f2651a 100644
--- a/Mage.Sets/src/mage/sets/homelands/FaerieNoble.java
+++ b/Mage.Sets/src/mage/sets/homelands/FaerieNoble.java
@@ -38,7 +38,7 @@ public class FaerieNoble extends mage.sets.masterseditioniii.FaerieNoble {
 
     public FaerieNoble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "HML";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn2.java b/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn2.java
index 5f537de059..b6ec9ac92f 100644
--- a/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn2.java
+++ b/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn2.java
@@ -37,7 +37,7 @@ public class FeastOfTheUnicorn2 extends mage.sets.homelands.FeastOfTheUnicorn1 {
 
     public FeastOfTheUnicorn2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/FerozsBan.java b/Mage.Sets/src/mage/sets/homelands/FerozsBan.java
index 5f8eca3be5..0059938736 100644
--- a/Mage.Sets/src/mage/sets/homelands/FerozsBan.java
+++ b/Mage.Sets/src/mage/sets/homelands/FerozsBan.java
@@ -38,7 +38,7 @@ public class FerozsBan extends mage.sets.fifthedition.FerozsBan {
 
     public FerozsBan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/FolkOfAnHavva2.java b/Mage.Sets/src/mage/sets/homelands/FolkOfAnHavva2.java
index f28dbedca2..8cee858ce4 100644
--- a/Mage.Sets/src/mage/sets/homelands/FolkOfAnHavva2.java
+++ b/Mage.Sets/src/mage/sets/homelands/FolkOfAnHavva2.java
@@ -37,7 +37,7 @@ public class FolkOfAnHavva2 extends FolkOfAnHavva1 {
 
     public FolkOfAnHavva2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
     }
 
     public FolkOfAnHavva2(final FolkOfAnHavva2 card) {
diff --git a/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java b/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java
index 80bbc82aed..8b0a42f3c4 100644
--- a/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java
+++ b/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java
@@ -37,7 +37,7 @@ public class GrandmotherSengir extends mage.sets.masterseditionii.GrandmotherSen
 
     public GrandmotherSengir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/HungryMist1.java b/Mage.Sets/src/mage/sets/homelands/HungryMist1.java
index b39d4ddaf8..9f41ffbc9e 100644
--- a/Mage.Sets/src/mage/sets/homelands/HungryMist1.java
+++ b/Mage.Sets/src/mage/sets/homelands/HungryMist1.java
@@ -37,7 +37,7 @@ public class HungryMist1 extends mage.sets.fifthedition.HungryMist {
 
     public HungryMist1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/HungryMist2.java b/Mage.Sets/src/mage/sets/homelands/HungryMist2.java
index d06a93b387..086b405f1a 100644
--- a/Mage.Sets/src/mage/sets/homelands/HungryMist2.java
+++ b/Mage.Sets/src/mage/sets/homelands/HungryMist2.java
@@ -37,7 +37,7 @@ public class HungryMist2 extends mage.sets.fifthedition.HungryMist {
 
     public HungryMist2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/Marjhan.java b/Mage.Sets/src/mage/sets/homelands/Marjhan.java
index d29651eddc..69649dc823 100644
--- a/Mage.Sets/src/mage/sets/homelands/Marjhan.java
+++ b/Mage.Sets/src/mage/sets/homelands/Marjhan.java
@@ -37,7 +37,7 @@ public class Marjhan extends mage.sets.masterseditionii.Marjhan {
 
     public Marjhan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/MemoryLapse1.java b/Mage.Sets/src/mage/sets/homelands/MemoryLapse1.java
index 3a09bc0498..2734353283 100644
--- a/Mage.Sets/src/mage/sets/homelands/MemoryLapse1.java
+++ b/Mage.Sets/src/mage/sets/homelands/MemoryLapse1.java
@@ -37,7 +37,7 @@ public class MemoryLapse1 extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/MemoryLapse2.java b/Mage.Sets/src/mage/sets/homelands/MemoryLapse2.java
index 69644b3c8e..2529da9a6b 100644
--- a/Mage.Sets/src/mage/sets/homelands/MemoryLapse2.java
+++ b/Mage.Sets/src/mage/sets/homelands/MemoryLapse2.java
@@ -37,7 +37,7 @@ public class MemoryLapse2 extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java b/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java
index f75de9ce92..4ea066e9a5 100644
--- a/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java
+++ b/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java
@@ -38,7 +38,7 @@ public class MerchantScroll extends mage.sets.eighthedition.MerchantScroll {
 
     public MerchantScroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "HML";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/homelands/MesaFalcon2.java b/Mage.Sets/src/mage/sets/homelands/MesaFalcon2.java
index a50450d193..6b7939f384 100644
--- a/Mage.Sets/src/mage/sets/homelands/MesaFalcon2.java
+++ b/Mage.Sets/src/mage/sets/homelands/MesaFalcon2.java
@@ -37,7 +37,7 @@ public class MesaFalcon2 extends mage.sets.homelands.MesaFalcon1 {
 
     public MesaFalcon2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/ReefPirates2.java b/Mage.Sets/src/mage/sets/homelands/ReefPirates2.java
index d7e484c14c..0facb018e9 100644
--- a/Mage.Sets/src/mage/sets/homelands/ReefPirates2.java
+++ b/Mage.Sets/src/mage/sets/homelands/ReefPirates2.java
@@ -37,7 +37,7 @@ public class ReefPirates2 extends ReefPirates1 {
 
     public ReefPirates2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
     }
 
     public ReefPirates2(final ReefPirates2 card) {
diff --git a/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java b/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java
index bd6b383e86..5a07291460 100644
--- a/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java
+++ b/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java
@@ -38,7 +38,7 @@ public class RevekaWizardSavant extends mage.sets.masterseditioniii.RevekaWizard
 
     public RevekaWizardSavant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "HML";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/homelands/SengirBats1.java b/Mage.Sets/src/mage/sets/homelands/SengirBats1.java
index fe62e67dab..1af8202a57 100644
--- a/Mage.Sets/src/mage/sets/homelands/SengirBats1.java
+++ b/Mage.Sets/src/mage/sets/homelands/SengirBats1.java
@@ -37,7 +37,7 @@ public class SengirBats1 extends mage.sets.homelands.SengirBats2 {
 
     public SengirBats1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/SpectralBears.java b/Mage.Sets/src/mage/sets/homelands/SpectralBears.java
index 998177e34e..b6e42f840c 100644
--- a/Mage.Sets/src/mage/sets/homelands/SpectralBears.java
+++ b/Mage.Sets/src/mage/sets/homelands/SpectralBears.java
@@ -37,7 +37,7 @@ public class SpectralBears extends mage.sets.mastersedition.SpectralBears {
 
     public SpectralBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/Torture2.java b/Mage.Sets/src/mage/sets/homelands/Torture2.java
index 48520a79ea..eb9a2f8ff0 100644
--- a/Mage.Sets/src/mage/sets/homelands/Torture2.java
+++ b/Mage.Sets/src/mage/sets/homelands/Torture2.java
@@ -37,7 +37,7 @@ public class Torture2 extends mage.sets.homelands.Torture1 {
 
     public Torture2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/homelands/WillowFaerie2.java b/Mage.Sets/src/mage/sets/homelands/WillowFaerie2.java
index 36a0cd12d4..b8b5d54a25 100644
--- a/Mage.Sets/src/mage/sets/homelands/WillowFaerie2.java
+++ b/Mage.Sets/src/mage/sets/homelands/WillowFaerie2.java
@@ -37,7 +37,7 @@ public class WillowFaerie2 extends mage.sets.homelands.WillowFaerie1 {
 
     public WillowFaerie2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "HML";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/iceage/AbyssalSpecter.java
index ceec10a011..dd52e99068 100644
--- a/Mage.Sets/src/mage/sets/iceage/AbyssalSpecter.java
+++ b/Mage.Sets/src/mage/sets/iceage/AbyssalSpecter.java
@@ -37,7 +37,7 @@ public class AbyssalSpecter extends mage.sets.fifthedition.AbyssalSpecter {
 
     public AbyssalSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/AdarkarWastes.java b/Mage.Sets/src/mage/sets/iceage/AdarkarWastes.java
index 7454622d7d..4859f71801 100644
--- a/Mage.Sets/src/mage/sets/iceage/AdarkarWastes.java
+++ b/Mage.Sets/src/mage/sets/iceage/AdarkarWastes.java
@@ -37,7 +37,7 @@ public class AdarkarWastes extends mage.sets.tenthedition.AdarkarWastes {
 
     public AdarkarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 326;
+        this.cardNumber = "326";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/ArensonsAura.java b/Mage.Sets/src/mage/sets/iceage/ArensonsAura.java
index 9d486bfbd0..5fe63f6c4b 100644
--- a/Mage.Sets/src/mage/sets/iceage/ArensonsAura.java
+++ b/Mage.Sets/src/mage/sets/iceage/ArensonsAura.java
@@ -39,7 +39,7 @@ public class ArensonsAura extends mage.sets.fifthedition.ArensonsAura {
 
     public ArensonsAura(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/ArmorOfFaith.java b/Mage.Sets/src/mage/sets/iceage/ArmorOfFaith.java
index 407fbbcbbe..2acee81921 100644
--- a/Mage.Sets/src/mage/sets/iceage/ArmorOfFaith.java
+++ b/Mage.Sets/src/mage/sets/iceage/ArmorOfFaith.java
@@ -37,7 +37,7 @@ public class ArmorOfFaith extends mage.sets.masterseditionii.ArmorOfFaith {
 
     public ArmorOfFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/iceage/BalduvianBarbarians.java
index b88788774c..289e8f77c2 100644
--- a/Mage.Sets/src/mage/sets/iceage/BalduvianBarbarians.java
+++ b/Mage.Sets/src/mage/sets/iceage/BalduvianBarbarians.java
@@ -37,7 +37,7 @@ public class BalduvianBarbarians extends mage.sets.ninthedition.BalduvianBarbari
 
     public BalduvianBarbarians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/BindingGrasp.java b/Mage.Sets/src/mage/sets/iceage/BindingGrasp.java
index 75725a5c46..7ce8534630 100644
--- a/Mage.Sets/src/mage/sets/iceage/BindingGrasp.java
+++ b/Mage.Sets/src/mage/sets/iceage/BindingGrasp.java
@@ -38,7 +38,7 @@ public class BindingGrasp extends mage.sets.masterseditionii.BindingGrasp {
 
     public BindingGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/BlessedWine.java b/Mage.Sets/src/mage/sets/iceage/BlessedWine.java
index 106007dcc3..062d6a82da 100644
--- a/Mage.Sets/src/mage/sets/iceage/BlessedWine.java
+++ b/Mage.Sets/src/mage/sets/iceage/BlessedWine.java
@@ -37,7 +37,7 @@ public class BlessedWine extends mage.sets.fifthedition.BlessedWine {
 
     public BlessedWine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/BlinkingSpirit.java b/Mage.Sets/src/mage/sets/iceage/BlinkingSpirit.java
index 751363d603..5235b4b554 100644
--- a/Mage.Sets/src/mage/sets/iceage/BlinkingSpirit.java
+++ b/Mage.Sets/src/mage/sets/iceage/BlinkingSpirit.java
@@ -37,7 +37,7 @@ public class BlinkingSpirit extends mage.sets.ninthedition.BlinkingSpirit {
 
     public BlinkingSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Brainstorm.java b/Mage.Sets/src/mage/sets/iceage/Brainstorm.java
index 32e2ff323a..44e50642b4 100644
--- a/Mage.Sets/src/mage/sets/iceage/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/iceage/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Brushland.java b/Mage.Sets/src/mage/sets/iceage/Brushland.java
index c6e3685d57..d8eeac3ddb 100644
--- a/Mage.Sets/src/mage/sets/iceage/Brushland.java
+++ b/Mage.Sets/src/mage/sets/iceage/Brushland.java
@@ -37,7 +37,7 @@ public class Brushland extends mage.sets.tenthedition.Brushland {
 
     public Brushland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 327;
+        this.cardNumber = "327";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/CaribouRange.java b/Mage.Sets/src/mage/sets/iceage/CaribouRange.java
index 634d473b44..1b40802b54 100644
--- a/Mage.Sets/src/mage/sets/iceage/CaribouRange.java
+++ b/Mage.Sets/src/mage/sets/iceage/CaribouRange.java
@@ -37,7 +37,7 @@ public class CaribouRange extends mage.sets.fifthedition.CaribouRange {
 
     public CaribouRange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Counterspell.java b/Mage.Sets/src/mage/sets/iceage/Counterspell.java
index 80e5bf7652..45ccaf1f6d 100644
--- a/Mage.Sets/src/mage/sets/iceage/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/iceage/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/DarkBanishing.java b/Mage.Sets/src/mage/sets/iceage/DarkBanishing.java
index 9f81c621be..978dd8f0a2 100644
--- a/Mage.Sets/src/mage/sets/iceage/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/iceage/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/DarkRitual.java b/Mage.Sets/src/mage/sets/iceage/DarkRitual.java
index 26435f0ce0..8b89bd279e 100644
--- a/Mage.Sets/src/mage/sets/iceage/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/iceage/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/DeathWard.java b/Mage.Sets/src/mage/sets/iceage/DeathWard.java
index 21ec6cf37d..f508e26607 100644
--- a/Mage.Sets/src/mage/sets/iceage/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/iceage/DeathWard.java
@@ -38,7 +38,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/DespoticScepter.java b/Mage.Sets/src/mage/sets/iceage/DespoticScepter.java
index d38baee1bb..cb5e8bb9dc 100644
--- a/Mage.Sets/src/mage/sets/iceage/DespoticScepter.java
+++ b/Mage.Sets/src/mage/sets/iceage/DespoticScepter.java
@@ -37,7 +37,7 @@ public class DespoticScepter extends mage.sets.masterseditionii.DespoticScepter
 
     public DespoticScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Disenchant.java b/Mage.Sets/src/mage/sets/iceage/Disenchant.java
index 390a272431..4a999d9bb4 100644
--- a/Mage.Sets/src/mage/sets/iceage/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/iceage/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/ElementalAugury.java b/Mage.Sets/src/mage/sets/iceage/ElementalAugury.java
index b547cf1453..5421a035a0 100644
--- a/Mage.Sets/src/mage/sets/iceage/ElementalAugury.java
+++ b/Mage.Sets/src/mage/sets/iceage/ElementalAugury.java
@@ -37,7 +37,7 @@ public class ElementalAugury extends mage.sets.masterseditionii.ElementalAugury
 
     public ElementalAugury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 364;
+        this.cardNumber = "364";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Enervate.java b/Mage.Sets/src/mage/sets/iceage/Enervate.java
index fa18468d1e..632f879fc4 100644
--- a/Mage.Sets/src/mage/sets/iceage/Enervate.java
+++ b/Mage.Sets/src/mage/sets/iceage/Enervate.java
@@ -37,7 +37,7 @@ public class Enervate extends mage.sets.masterseditionii.Enervate {
 
     public Enervate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Errantry.java b/Mage.Sets/src/mage/sets/iceage/Errantry.java
index e77120e660..3f61b09e4e 100644
--- a/Mage.Sets/src/mage/sets/iceage/Errantry.java
+++ b/Mage.Sets/src/mage/sets/iceage/Errantry.java
@@ -38,7 +38,7 @@ public class Errantry extends mage.sets.masterseditionii.Errantry {
 
     public Errantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Fear.java b/Mage.Sets/src/mage/sets/iceage/Fear.java
index a21081e65e..36a700bb27 100644
--- a/Mage.Sets/src/mage/sets/iceage/Fear.java
+++ b/Mage.Sets/src/mage/sets/iceage/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Flare.java b/Mage.Sets/src/mage/sets/iceage/Flare.java
index 417b3ffdb1..52e0f82e53 100644
--- a/Mage.Sets/src/mage/sets/iceage/Flare.java
+++ b/Mage.Sets/src/mage/sets/iceage/Flare.java
@@ -37,7 +37,7 @@ public class Flare extends mage.sets.fifthedition.Flare {
 
     public Flare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/FolkOfThePines.java b/Mage.Sets/src/mage/sets/iceage/FolkOfThePines.java
index 7c0243eab7..c2a9ee4544 100644
--- a/Mage.Sets/src/mage/sets/iceage/FolkOfThePines.java
+++ b/Mage.Sets/src/mage/sets/iceage/FolkOfThePines.java
@@ -37,7 +37,7 @@ public class FolkOfThePines extends mage.sets.masterseditionii.FolkOfThePines {
 
     public FolkOfThePines(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/ForgottenLore.java b/Mage.Sets/src/mage/sets/iceage/ForgottenLore.java
index 3f6ef647dc..2182fc3425 100644
--- a/Mage.Sets/src/mage/sets/iceage/ForgottenLore.java
+++ b/Mage.Sets/src/mage/sets/iceage/ForgottenLore.java
@@ -37,7 +37,7 @@ public class ForgottenLore extends mage.sets.masterseditionii.ForgottenLore {
 
     public ForgottenLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/FoulFamiliar.java b/Mage.Sets/src/mage/sets/iceage/FoulFamiliar.java
index 010f923c60..af0e479971 100644
--- a/Mage.Sets/src/mage/sets/iceage/FoulFamiliar.java
+++ b/Mage.Sets/src/mage/sets/iceage/FoulFamiliar.java
@@ -37,7 +37,7 @@ public class FoulFamiliar extends mage.sets.masterseditionii.FoulFamiliar {
 
     public FoulFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Fumarole.java b/Mage.Sets/src/mage/sets/iceage/Fumarole.java
index 1929853f8c..6639339938 100644
--- a/Mage.Sets/src/mage/sets/iceage/Fumarole.java
+++ b/Mage.Sets/src/mage/sets/iceage/Fumarole.java
@@ -37,7 +37,7 @@ public class Fumarole extends mage.sets.masterseditionii.Fumarole {
 
     public Fumarole(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 369;
+        this.cardNumber = "369";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/GiantGrowth.java b/Mage.Sets/src/mage/sets/iceage/GiantGrowth.java
index be7a2d0706..3f92543054 100644
--- a/Mage.Sets/src/mage/sets/iceage/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/iceage/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/GlacialWall.java b/Mage.Sets/src/mage/sets/iceage/GlacialWall.java
index f77778201d..580c64f4d3 100644
--- a/Mage.Sets/src/mage/sets/iceage/GlacialWall.java
+++ b/Mage.Sets/src/mage/sets/iceage/GlacialWall.java
@@ -37,7 +37,7 @@ public class GlacialWall extends mage.sets.fifthedition.GlacialWall {
 
     public GlacialWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Gravebind.java b/Mage.Sets/src/mage/sets/iceage/Gravebind.java
index ccf0d4cb8f..d434d9eac6 100644
--- a/Mage.Sets/src/mage/sets/iceage/Gravebind.java
+++ b/Mage.Sets/src/mage/sets/iceage/Gravebind.java
@@ -38,7 +38,7 @@ public class Gravebind extends mage.sets.masterseditioniv.Gravebind {
 
     public Gravebind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/iceage/HowlFromBeyond.java
index 572f1f3df5..909b404592 100644
--- a/Mage.Sets/src/mage/sets/iceage/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/iceage/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Hurricane.java b/Mage.Sets/src/mage/sets/iceage/Hurricane.java
index e4e78eebaf..2db42dd969 100644
--- a/Mage.Sets/src/mage/sets/iceage/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/iceage/Hurricane.java
@@ -37,7 +37,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Hydroblast.java b/Mage.Sets/src/mage/sets/iceage/Hydroblast.java
index 59909fcde9..5c7284c576 100644
--- a/Mage.Sets/src/mage/sets/iceage/Hydroblast.java
+++ b/Mage.Sets/src/mage/sets/iceage/Hydroblast.java
@@ -38,7 +38,7 @@ public class Hydroblast extends mage.sets.fifthedition.Hydroblast {
 
     public Hydroblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/HymnOfRebirth.java b/Mage.Sets/src/mage/sets/iceage/HymnOfRebirth.java
index 75f0280ea5..b45840d750 100644
--- a/Mage.Sets/src/mage/sets/iceage/HymnOfRebirth.java
+++ b/Mage.Sets/src/mage/sets/iceage/HymnOfRebirth.java
@@ -37,7 +37,7 @@ public class HymnOfRebirth extends mage.sets.mastersedition.HymnOfRebirth {
 
     public HymnOfRebirth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 373;
+        this.cardNumber = "373";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/IcyManipulator.java b/Mage.Sets/src/mage/sets/iceage/IcyManipulator.java
index 02adcf9ab6..41a7b6f6e6 100644
--- a/Mage.Sets/src/mage/sets/iceage/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/iceage/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/IllusionaryForces.java b/Mage.Sets/src/mage/sets/iceage/IllusionaryForces.java
index 35765a6ae6..406b3b53d9 100644
--- a/Mage.Sets/src/mage/sets/iceage/IllusionaryForces.java
+++ b/Mage.Sets/src/mage/sets/iceage/IllusionaryForces.java
@@ -38,7 +38,7 @@ public class IllusionaryForces extends mage.sets.mastersedition.IllusionaryForce
 
     public IllusionaryForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/IllusionaryWall.java b/Mage.Sets/src/mage/sets/iceage/IllusionaryWall.java
index d713603a80..afcbf93267 100644
--- a/Mage.Sets/src/mage/sets/iceage/IllusionaryWall.java
+++ b/Mage.Sets/src/mage/sets/iceage/IllusionaryWall.java
@@ -37,7 +37,7 @@ public class IllusionaryWall extends mage.sets.mastersedition.IllusionaryWall {
 
     public IllusionaryWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Incinerate.java b/Mage.Sets/src/mage/sets/iceage/Incinerate.java
index e8371e6a7a..025b27d4a3 100644
--- a/Mage.Sets/src/mage/sets/iceage/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/iceage/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/JestersCap.java b/Mage.Sets/src/mage/sets/iceage/JestersCap.java
index 2cfcdced91..7ceb8216b3 100644
--- a/Mage.Sets/src/mage/sets/iceage/JestersCap.java
+++ b/Mage.Sets/src/mage/sets/iceage/JestersCap.java
@@ -37,7 +37,7 @@ public class JestersCap extends mage.sets.fifthedition.JestersCap {
 
     public JestersCap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Justice.java b/Mage.Sets/src/mage/sets/iceage/Justice.java
index 1e1a9addbd..aa98a75a3f 100644
--- a/Mage.Sets/src/mage/sets/iceage/Justice.java
+++ b/Mage.Sets/src/mage/sets/iceage/Justice.java
@@ -37,7 +37,7 @@ public class Justice extends mage.sets.fifthedition.Justice {
 
     public Justice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/KarplusanForest.java b/Mage.Sets/src/mage/sets/iceage/KarplusanForest.java
index d4b2504334..1a6d68ee18 100644
--- a/Mage.Sets/src/mage/sets/iceage/KarplusanForest.java
+++ b/Mage.Sets/src/mage/sets/iceage/KarplusanForest.java
@@ -37,7 +37,7 @@ public class KarplusanForest extends mage.sets.tenthedition.KarplusanForest {
 
     public KarplusanForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 337;
+        this.cardNumber = "337";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/KrovikanFetish.java b/Mage.Sets/src/mage/sets/iceage/KrovikanFetish.java
index 88688aeb24..56700c6242 100644
--- a/Mage.Sets/src/mage/sets/iceage/KrovikanFetish.java
+++ b/Mage.Sets/src/mage/sets/iceage/KrovikanFetish.java
@@ -37,7 +37,7 @@ public class KrovikanFetish extends mage.sets.fifthedition.KrovikanFetish {
 
     public KrovikanFetish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/KrovikanSorcerer.java b/Mage.Sets/src/mage/sets/iceage/KrovikanSorcerer.java
index 717cc850ff..a342561761 100644
--- a/Mage.Sets/src/mage/sets/iceage/KrovikanSorcerer.java
+++ b/Mage.Sets/src/mage/sets/iceage/KrovikanSorcerer.java
@@ -37,7 +37,7 @@ public class KrovikanSorcerer extends mage.sets.vintagemasters.KrovikanSorcerer
 
     public KrovikanSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Lure.java b/Mage.Sets/src/mage/sets/iceage/Lure.java
index d9b503455c..92dba38b0d 100644
--- a/Mage.Sets/src/mage/sets/iceage/Lure.java
+++ b/Mage.Sets/src/mage/sets/iceage/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/MesmericTrance.java b/Mage.Sets/src/mage/sets/iceage/MesmericTrance.java
index a880fab609..3b0d04015b 100644
--- a/Mage.Sets/src/mage/sets/iceage/MesmericTrance.java
+++ b/Mage.Sets/src/mage/sets/iceage/MesmericTrance.java
@@ -37,7 +37,7 @@ public class MesmericTrance extends mage.sets.masterseditionii.MesmericTrance {
 
     public MesmericTrance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/MindRavel.java b/Mage.Sets/src/mage/sets/iceage/MindRavel.java
index 2495044d09..5f95451f3a 100644
--- a/Mage.Sets/src/mage/sets/iceage/MindRavel.java
+++ b/Mage.Sets/src/mage/sets/iceage/MindRavel.java
@@ -37,7 +37,7 @@ public class MindRavel extends mage.sets.fifthedition.MindRavel {
 
     public MindRavel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/MoleWorms.java b/Mage.Sets/src/mage/sets/iceage/MoleWorms.java
index 04097473b0..0da052aa1b 100644
--- a/Mage.Sets/src/mage/sets/iceage/MoleWorms.java
+++ b/Mage.Sets/src/mage/sets/iceage/MoleWorms.java
@@ -37,7 +37,7 @@ public class MoleWorms extends mage.sets.fifthedition.MoleWorms {
 
     public MoleWorms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/MountainGoat.java b/Mage.Sets/src/mage/sets/iceage/MountainGoat.java
index bde36462dc..0371163765 100644
--- a/Mage.Sets/src/mage/sets/iceage/MountainGoat.java
+++ b/Mage.Sets/src/mage/sets/iceage/MountainGoat.java
@@ -37,7 +37,7 @@ public class MountainGoat extends mage.sets.fifthedition.MountainGoat {
 
     public MountainGoat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/OrcishLumberjack.java b/Mage.Sets/src/mage/sets/iceage/OrcishLumberjack.java
index 89ab7cc448..5935f44721 100644
--- a/Mage.Sets/src/mage/sets/iceage/OrcishLumberjack.java
+++ b/Mage.Sets/src/mage/sets/iceage/OrcishLumberjack.java
@@ -37,7 +37,7 @@ public class OrcishLumberjack extends mage.sets.heroesvsmonsters.OrcishLumberjac
 
     public OrcishLumberjack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Panic.java b/Mage.Sets/src/mage/sets/iceage/Panic.java
index 65e1c110b9..8e413c1b6a 100644
--- a/Mage.Sets/src/mage/sets/iceage/Panic.java
+++ b/Mage.Sets/src/mage/sets/iceage/Panic.java
@@ -37,7 +37,7 @@ public class Panic extends mage.sets.masterseditionii.Panic {
 
     public Panic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/PitTrap.java b/Mage.Sets/src/mage/sets/iceage/PitTrap.java
index dcf177c50a..d34f572b7d 100644
--- a/Mage.Sets/src/mage/sets/iceage/PitTrap.java
+++ b/Mage.Sets/src/mage/sets/iceage/PitTrap.java
@@ -37,7 +37,7 @@ public class PitTrap extends mage.sets.urzassaga.PitTrap {
 
     public PitTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Portent.java b/Mage.Sets/src/mage/sets/iceage/Portent.java
index d08726e4f1..38b08108a8 100644
--- a/Mage.Sets/src/mage/sets/iceage/Portent.java
+++ b/Mage.Sets/src/mage/sets/iceage/Portent.java
@@ -37,7 +37,7 @@ public class Portent extends mage.sets.fifthedition.Portent {
 
     public Portent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/PowerSink.java b/Mage.Sets/src/mage/sets/iceage/PowerSink.java
index ec1228ef8f..4f01ce2e42 100644
--- a/Mage.Sets/src/mage/sets/iceage/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/iceage/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Pox.java b/Mage.Sets/src/mage/sets/iceage/Pox.java
index 8c7d8c9c10..61837b4a08 100644
--- a/Mage.Sets/src/mage/sets/iceage/Pox.java
+++ b/Mage.Sets/src/mage/sets/iceage/Pox.java
@@ -37,7 +37,7 @@ public class Pox extends mage.sets.fifthedition.Pox {
 
     public Pox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Pyroclasm.java b/Mage.Sets/src/mage/sets/iceage/Pyroclasm.java
index a5c16b54d6..3d1717f92a 100644
--- a/Mage.Sets/src/mage/sets/iceage/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/iceage/Pyroclasm.java
@@ -37,7 +37,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SabretoothTiger.java b/Mage.Sets/src/mage/sets/iceage/SabretoothTiger.java
index 65086b29da..ecb25264ac 100644
--- a/Mage.Sets/src/mage/sets/iceage/SabretoothTiger.java
+++ b/Mage.Sets/src/mage/sets/iceage/SabretoothTiger.java
@@ -37,7 +37,7 @@ public class SabretoothTiger extends mage.sets.fifthedition.SabretoothTiger {
 
     public SabretoothTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/ScaledWurm.java b/Mage.Sets/src/mage/sets/iceage/ScaledWurm.java
index d3a59f3c55..e8e1d05a45 100644
--- a/Mage.Sets/src/mage/sets/iceage/ScaledWurm.java
+++ b/Mage.Sets/src/mage/sets/iceage/ScaledWurm.java
@@ -37,7 +37,7 @@ public class ScaledWurm extends mage.sets.ninthedition.ScaledWurm {
 
     public ScaledWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SeaSpirit.java b/Mage.Sets/src/mage/sets/iceage/SeaSpirit.java
index 1f205f420c..2e30105445 100644
--- a/Mage.Sets/src/mage/sets/iceage/SeaSpirit.java
+++ b/Mage.Sets/src/mage/sets/iceage/SeaSpirit.java
@@ -37,7 +37,7 @@ public class SeaSpirit extends mage.sets.masterseditionii.SeaSpirit {
 
     public SeaSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/ShamblingStrider.java b/Mage.Sets/src/mage/sets/iceage/ShamblingStrider.java
index 0ead0898f6..39a7837bb3 100644
--- a/Mage.Sets/src/mage/sets/iceage/ShamblingStrider.java
+++ b/Mage.Sets/src/mage/sets/iceage/ShamblingStrider.java
@@ -37,7 +37,7 @@ public class ShamblingStrider extends mage.sets.mastersedition.ShamblingStrider
 
     public ShamblingStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Shatter.java b/Mage.Sets/src/mage/sets/iceage/Shatter.java
index c25c219ec0..8e94f135b7 100644
--- a/Mage.Sets/src/mage/sets/iceage/Shatter.java
+++ b/Mage.Sets/src/mage/sets/iceage/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/ShieldOfTheAges.java b/Mage.Sets/src/mage/sets/iceage/ShieldOfTheAges.java
index 62bebd747b..59bf04981e 100644
--- a/Mage.Sets/src/mage/sets/iceage/ShieldOfTheAges.java
+++ b/Mage.Sets/src/mage/sets/iceage/ShieldOfTheAges.java
@@ -37,7 +37,7 @@ public class ShieldOfTheAges extends mage.sets.mastersedition.ShieldOfTheAges {
 
     public ShieldOfTheAges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SoldeviMachinist.java b/Mage.Sets/src/mage/sets/iceage/SoldeviMachinist.java
index 320bf8943f..f7d40fa332 100644
--- a/Mage.Sets/src/mage/sets/iceage/SoldeviMachinist.java
+++ b/Mage.Sets/src/mage/sets/iceage/SoldeviMachinist.java
@@ -37,7 +37,7 @@ public class SoldeviMachinist extends mage.sets.masterseditioniv.SoldeviMachinis
 
     public SoldeviMachinist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SoldeviSimulacrum.java b/Mage.Sets/src/mage/sets/iceage/SoldeviSimulacrum.java
index a79829b58e..dbd4bfefdf 100644
--- a/Mage.Sets/src/mage/sets/iceage/SoldeviSimulacrum.java
+++ b/Mage.Sets/src/mage/sets/iceage/SoldeviSimulacrum.java
@@ -38,7 +38,7 @@ public class SoldeviSimulacrum extends mage.sets.masterseditionii.SoldeviSimulac
 
     public SoldeviSimulacrum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SoulKiss.java b/Mage.Sets/src/mage/sets/iceage/SoulKiss.java
index 1bdd7fc2d1..582130c6e7 100644
--- a/Mage.Sets/src/mage/sets/iceage/SoulKiss.java
+++ b/Mage.Sets/src/mage/sets/iceage/SoulKiss.java
@@ -38,7 +38,7 @@ public class SoulKiss extends mage.sets.masterseditionii.SoulKiss {
 
     public SoulKiss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/StoneRain.java b/Mage.Sets/src/mage/sets/iceage/StoneRain.java
index c5e073d4e4..b7fea4c36b 100644
--- a/Mage.Sets/src/mage/sets/iceage/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/iceage/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/StormSpirit.java b/Mage.Sets/src/mage/sets/iceage/StormSpirit.java
index 6f3f5eb4e4..8fa752c9b1 100644
--- a/Mage.Sets/src/mage/sets/iceage/StormSpirit.java
+++ b/Mage.Sets/src/mage/sets/iceage/StormSpirit.java
@@ -37,7 +37,7 @@ public class StormSpirit extends mage.sets.masterseditionii.StormSpirit {
 
     public StormSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 381;
+        this.cardNumber = "381";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SulfurousSprings.java b/Mage.Sets/src/mage/sets/iceage/SulfurousSprings.java
index 932a82c202..793fa90d0a 100644
--- a/Mage.Sets/src/mage/sets/iceage/SulfurousSprings.java
+++ b/Mage.Sets/src/mage/sets/iceage/SulfurousSprings.java
@@ -37,7 +37,7 @@ public class SulfurousSprings extends mage.sets.tenthedition.SulfurousSprings {
 
     public SulfurousSprings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 352;
+        this.cardNumber = "352";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/iceage/SwordsToPlowshares.java
index a809875fa1..17c85a9e15 100644
--- a/Mage.Sets/src/mage/sets/iceage/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/iceage/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Thermokarst.java b/Mage.Sets/src/mage/sets/iceage/Thermokarst.java
index bfb85909f0..90e719319b 100644
--- a/Mage.Sets/src/mage/sets/iceage/Thermokarst.java
+++ b/Mage.Sets/src/mage/sets/iceage/Thermokarst.java
@@ -38,7 +38,7 @@ public class Thermokarst extends mage.sets.masterseditionii.Thermokarst {
 
     public Thermokarst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "ICE";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/iceage/Thoughtleech.java b/Mage.Sets/src/mage/sets/iceage/Thoughtleech.java
index 80e1571a0c..5898f2f56a 100644
--- a/Mage.Sets/src/mage/sets/iceage/Thoughtleech.java
+++ b/Mage.Sets/src/mage/sets/iceage/Thoughtleech.java
@@ -38,7 +38,7 @@ public class Thoughtleech extends mage.sets.seventhedition.Thoughtleech {
 
     public Thoughtleech(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/TimeBomb.java b/Mage.Sets/src/mage/sets/iceage/TimeBomb.java
index a707e9dc09..02880fb1e1 100644
--- a/Mage.Sets/src/mage/sets/iceage/TimeBomb.java
+++ b/Mage.Sets/src/mage/sets/iceage/TimeBomb.java
@@ -37,7 +37,7 @@ public class TimeBomb extends mage.sets.masterseditionii.TimeBomb {
 
     public TimeBomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/UndergroundRiver.java b/Mage.Sets/src/mage/sets/iceage/UndergroundRiver.java
index c860bf5864..77170859e6 100644
--- a/Mage.Sets/src/mage/sets/iceage/UndergroundRiver.java
+++ b/Mage.Sets/src/mage/sets/iceage/UndergroundRiver.java
@@ -37,7 +37,7 @@ public class UndergroundRiver extends mage.sets.tenthedition.UndergroundRiver {
 
     public UndergroundRiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 357;
+        this.cardNumber = "357";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/UrzasBauble.java b/Mage.Sets/src/mage/sets/iceage/UrzasBauble.java
index ca01ceae33..e3833f45dc 100644
--- a/Mage.Sets/src/mage/sets/iceage/UrzasBauble.java
+++ b/Mage.Sets/src/mage/sets/iceage/UrzasBauble.java
@@ -37,7 +37,7 @@ public class UrzasBauble extends mage.sets.mastersedition.UrzasBauble {
 
     public UrzasBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/WalkingWall.java b/Mage.Sets/src/mage/sets/iceage/WalkingWall.java
index 9db4cff12f..9cef3e7abf 100644
--- a/Mage.Sets/src/mage/sets/iceage/WalkingWall.java
+++ b/Mage.Sets/src/mage/sets/iceage/WalkingWall.java
@@ -37,7 +37,7 @@ public class WalkingWall extends mage.sets.mastersedition.WalkingWall {
 
     public WalkingWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/Warning.java b/Mage.Sets/src/mage/sets/iceage/Warning.java
index 19144d8390..79b1670a9e 100644
--- a/Mage.Sets/src/mage/sets/iceage/Warning.java
+++ b/Mage.Sets/src/mage/sets/iceage/Warning.java
@@ -37,7 +37,7 @@ public class Warning extends mage.sets.masterseditionii.Warning {
 
     public Warning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/WingsOfAesthir.java b/Mage.Sets/src/mage/sets/iceage/WingsOfAesthir.java
index 80ab80fe4c..dfd0eb380d 100644
--- a/Mage.Sets/src/mage/sets/iceage/WingsOfAesthir.java
+++ b/Mage.Sets/src/mage/sets/iceage/WingsOfAesthir.java
@@ -37,7 +37,7 @@ public class WingsOfAesthir extends mage.sets.masterseditionii.WingsOfAesthir {
 
     public WingsOfAesthir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 383;
+        this.cardNumber = "383";
         this.expansionSetCode = "ICE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java b/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java
index 6a4432a4b2..c761590460 100644
--- a/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java
+++ b/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java
@@ -38,7 +38,7 @@ public class BlazingTorch extends mage.sets.zendikar.BlazingTorch {
 
     public BlazingTorch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "ISD";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/innistrad/Naturalize.java b/Mage.Sets/src/mage/sets/innistrad/Naturalize.java
index 4abd0f9314..dae7988eb5 100644
--- a/Mage.Sets/src/mage/sets/innistrad/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/innistrad/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "ISD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/ShimmeringGrotto.java b/Mage.Sets/src/mage/sets/innistrad/ShimmeringGrotto.java
index f5526dcd87..289f74c770 100644
--- a/Mage.Sets/src/mage/sets/innistrad/ShimmeringGrotto.java
+++ b/Mage.Sets/src/mage/sets/innistrad/ShimmeringGrotto.java
@@ -37,7 +37,7 @@ public class ShimmeringGrotto extends mage.sets.lorwyn.ShimmeringGrotto {
 
     public ShimmeringGrotto(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "ISD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Addle.java b/Mage.Sets/src/mage/sets/invasion/Addle.java
index 8a6561081a..6598c623f0 100644
--- a/Mage.Sets/src/mage/sets/invasion/Addle.java
+++ b/Mage.Sets/src/mage/sets/invasion/Addle.java
@@ -38,7 +38,7 @@ public class Addle extends mage.sets.vintagemasters.Addle {
 
     public Addle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "INV";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/invasion/AggressiveUrge.java b/Mage.Sets/src/mage/sets/invasion/AggressiveUrge.java
index 45f2e41059..d4a6e61f61 100644
--- a/Mage.Sets/src/mage/sets/invasion/AggressiveUrge.java
+++ b/Mage.Sets/src/mage/sets/invasion/AggressiveUrge.java
@@ -37,7 +37,7 @@ public class AggressiveUrge extends mage.sets.tenthedition.AggressiveUrge {
 
     public AggressiveUrge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/AgonizingDemise.java b/Mage.Sets/src/mage/sets/invasion/AgonizingDemise.java
index df0cf3c0a6..d6384688f6 100644
--- a/Mage.Sets/src/mage/sets/invasion/AgonizingDemise.java
+++ b/Mage.Sets/src/mage/sets/invasion/AgonizingDemise.java
@@ -37,7 +37,7 @@ public class AgonizingDemise extends mage.sets.ajanivsnicolbolas.AgonizingDemise
 
     public AgonizingDemise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/AngelOfMercy.java b/Mage.Sets/src/mage/sets/invasion/AngelOfMercy.java
index 6cd1b1421e..a082b3d5bb 100644
--- a/Mage.Sets/src/mage/sets/invasion/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/invasion/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/AngelicShield.java b/Mage.Sets/src/mage/sets/invasion/AngelicShield.java
index 01156fa56d..06a176cfc5 100644
--- a/Mage.Sets/src/mage/sets/invasion/AngelicShield.java
+++ b/Mage.Sets/src/mage/sets/invasion/AngelicShield.java
@@ -38,7 +38,7 @@ public class AngelicShield extends mage.sets.venservskoth.AngelicShield {
 
     public AngelicShield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/AuraShards.java b/Mage.Sets/src/mage/sets/invasion/AuraShards.java
index 29a292a2b3..eb7209db0c 100644
--- a/Mage.Sets/src/mage/sets/invasion/AuraShards.java
+++ b/Mage.Sets/src/mage/sets/invasion/AuraShards.java
@@ -37,7 +37,7 @@ public class AuraShards extends mage.sets.commander.AuraShards {
 
     public AuraShards(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/BlindingLight.java b/Mage.Sets/src/mage/sets/invasion/BlindingLight.java
index 9d4a9c4995..4cd11b01b0 100644
--- a/Mage.Sets/src/mage/sets/invasion/BlindingLight.java
+++ b/Mage.Sets/src/mage/sets/invasion/BlindingLight.java
@@ -38,7 +38,7 @@ public class BlindingLight extends mage.sets.mirage.BlindingLight {
 
     public BlindingLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/BreathOfDarigaaz.java b/Mage.Sets/src/mage/sets/invasion/BreathOfDarigaaz.java
index 8b76b34493..8b19900664 100644
--- a/Mage.Sets/src/mage/sets/invasion/BreathOfDarigaaz.java
+++ b/Mage.Sets/src/mage/sets/invasion/BreathOfDarigaaz.java
@@ -37,7 +37,7 @@ public class BreathOfDarigaaz extends mage.sets.commander.BreathOfDarigaaz {
 
     public BreathOfDarigaaz(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java b/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java
index 6c93d17696..57d8bdfc60 100644
--- a/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java
+++ b/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java
@@ -38,7 +38,7 @@ public class ChromaticSphere extends mage.sets.mirrodin.ChromaticSphere {
 
     public ChromaticSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "INV";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/invasion/CoalitionVictory.java b/Mage.Sets/src/mage/sets/invasion/CoalitionVictory.java
index f255546428..9edfa35a3a 100644
--- a/Mage.Sets/src/mage/sets/invasion/CoalitionVictory.java
+++ b/Mage.Sets/src/mage/sets/invasion/CoalitionVictory.java
@@ -38,7 +38,7 @@ public class CoalitionVictory extends mage.sets.timeshifted.CoalitionVictory {
 
     public CoalitionVictory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "INV";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/invasion/Cremate.java b/Mage.Sets/src/mage/sets/invasion/Cremate.java
index 4c873e2f5e..0150d3c9b8 100644
--- a/Mage.Sets/src/mage/sets/invasion/Cremate.java
+++ b/Mage.Sets/src/mage/sets/invasion/Cremate.java
@@ -38,7 +38,7 @@ public class Cremate extends mage.sets.guildpact.Cremate {
 
     public Cremate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "INV";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/invasion/CrownOfFlames.java b/Mage.Sets/src/mage/sets/invasion/CrownOfFlames.java
index 4a90b35328..69fe7f0a9c 100644
--- a/Mage.Sets/src/mage/sets/invasion/CrownOfFlames.java
+++ b/Mage.Sets/src/mage/sets/invasion/CrownOfFlames.java
@@ -37,7 +37,7 @@ public class CrownOfFlames extends mage.sets.tempest.CrownOfFlames {
 
     public CrownOfFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/DarigaazTheIgniter.java b/Mage.Sets/src/mage/sets/invasion/DarigaazTheIgniter.java
index eac04d40d2..aa26680510 100644
--- a/Mage.Sets/src/mage/sets/invasion/DarigaazTheIgniter.java
+++ b/Mage.Sets/src/mage/sets/invasion/DarigaazTheIgniter.java
@@ -37,7 +37,7 @@ public class DarigaazTheIgniter extends mage.sets.phyrexiavsthecoalition.Darigaa
 
     public DarigaazTheIgniter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/DistortingWake.java b/Mage.Sets/src/mage/sets/invasion/DistortingWake.java
index f0366d5975..279bb7624d 100644
--- a/Mage.Sets/src/mage/sets/invasion/DistortingWake.java
+++ b/Mage.Sets/src/mage/sets/invasion/DistortingWake.java
@@ -37,7 +37,7 @@ public class DistortingWake extends mage.sets.commander2014.DistortingWake {
 
     public DistortingWake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ElvishChampion.java b/Mage.Sets/src/mage/sets/invasion/ElvishChampion.java
index f177aac962..d62e71060a 100644
--- a/Mage.Sets/src/mage/sets/invasion/ElvishChampion.java
+++ b/Mage.Sets/src/mage/sets/invasion/ElvishChampion.java
@@ -37,7 +37,7 @@ public class ElvishChampion extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Exclude.java b/Mage.Sets/src/mage/sets/invasion/Exclude.java
index bd84232ef6..4d5f5329b3 100644
--- a/Mage.Sets/src/mage/sets/invasion/Exclude.java
+++ b/Mage.Sets/src/mage/sets/invasion/Exclude.java
@@ -37,7 +37,7 @@ public class Exclude extends mage.sets.commander2014.Exclude {
 
     public Exclude(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ExoticCurse.java b/Mage.Sets/src/mage/sets/invasion/ExoticCurse.java
index 7778f1041f..45d617eda9 100644
--- a/Mage.Sets/src/mage/sets/invasion/ExoticCurse.java
+++ b/Mage.Sets/src/mage/sets/invasion/ExoticCurse.java
@@ -37,7 +37,7 @@ public class ExoticCurse extends mage.sets.phyrexiavsthecoalition.ExoticCurse {
 
     public ExoticCurse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/FertileGround.java b/Mage.Sets/src/mage/sets/invasion/FertileGround.java
index 82e908e0dd..85daf275b0 100644
--- a/Mage.Sets/src/mage/sets/invasion/FertileGround.java
+++ b/Mage.Sets/src/mage/sets/invasion/FertileGround.java
@@ -37,7 +37,7 @@ public class FertileGround extends mage.sets.urzassaga.FertileGround {
 
     public FertileGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/invasion/FiresOfYavimaya.java
index e22b7118de..24dbde6d42 100644
--- a/Mage.Sets/src/mage/sets/invasion/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/invasion/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Harrow.java b/Mage.Sets/src/mage/sets/invasion/Harrow.java
index 93765fc597..f73a573cfa 100644
--- a/Mage.Sets/src/mage/sets/invasion/Harrow.java
+++ b/Mage.Sets/src/mage/sets/invasion/Harrow.java
@@ -37,7 +37,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/HateWeaver.java b/Mage.Sets/src/mage/sets/invasion/HateWeaver.java
index fba81e1cca..d26e884a96 100644
--- a/Mage.Sets/src/mage/sets/invasion/HateWeaver.java
+++ b/Mage.Sets/src/mage/sets/invasion/HateWeaver.java
@@ -37,7 +37,7 @@ public class HateWeaver extends mage.sets.tenthedition.HateWeaver {
 
     public HateWeaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/KavuClimber.java b/Mage.Sets/src/mage/sets/invasion/KavuClimber.java
index 6a57b2cc72..b71b12caab 100644
--- a/Mage.Sets/src/mage/sets/invasion/KavuClimber.java
+++ b/Mage.Sets/src/mage/sets/invasion/KavuClimber.java
@@ -37,7 +37,7 @@ public class KavuClimber extends mage.sets.tenthedition.KavuClimber {
 
     public KavuClimber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Lobotomy.java b/Mage.Sets/src/mage/sets/invasion/Lobotomy.java
index c11b8878ce..bce5aa7978 100644
--- a/Mage.Sets/src/mage/sets/invasion/Lobotomy.java
+++ b/Mage.Sets/src/mage/sets/invasion/Lobotomy.java
@@ -37,7 +37,7 @@ public class Lobotomy extends mage.sets.tempest.Lobotomy {
 
     public Lobotomy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ManiacalRage.java b/Mage.Sets/src/mage/sets/invasion/ManiacalRage.java
index d01c62d55d..79218f727a 100644
--- a/Mage.Sets/src/mage/sets/invasion/ManiacalRage.java
+++ b/Mage.Sets/src/mage/sets/invasion/ManiacalRage.java
@@ -37,7 +37,7 @@ public class ManiacalRage extends mage.sets.conflux.ManiacalRage {
 
     public ManiacalRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/MightWeaver.java b/Mage.Sets/src/mage/sets/invasion/MightWeaver.java
index 5fc61e5bfe..26fb99f0d7 100644
--- a/Mage.Sets/src/mage/sets/invasion/MightWeaver.java
+++ b/Mage.Sets/src/mage/sets/invasion/MightWeaver.java
@@ -37,7 +37,7 @@ public class MightWeaver extends mage.sets.tenthedition.MightWeaver {
 
     public MightWeaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/sets/invasion/MolimoMaroSorcerer.java
index 499be90166..1baa5dec9a 100644
--- a/Mage.Sets/src/mage/sets/invasion/MolimoMaroSorcerer.java
+++ b/Mage.Sets/src/mage/sets/invasion/MolimoMaroSorcerer.java
@@ -37,7 +37,7 @@ public class MolimoMaroSorcerer extends mage.sets.tenthedition.MolimoMaroSorcere
 
     public MolimoMaroSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/invasion/PhantasmalTerrain.java
index b663e07be0..ae888a9724 100644
--- a/Mage.Sets/src/mage/sets/invasion/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/invasion/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/PhyrexianBattleflies.java b/Mage.Sets/src/mage/sets/invasion/PhyrexianBattleflies.java
index 05da6a066e..53351d6a66 100644
--- a/Mage.Sets/src/mage/sets/invasion/PhyrexianBattleflies.java
+++ b/Mage.Sets/src/mage/sets/invasion/PhyrexianBattleflies.java
@@ -37,7 +37,7 @@ public class PhyrexianBattleflies extends mage.sets.phyrexiavsthecoalition.Phyre
 
     public PhyrexianBattleflies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/QuirionElves.java b/Mage.Sets/src/mage/sets/invasion/QuirionElves.java
index 0fc6364c86..f5dea79934 100644
--- a/Mage.Sets/src/mage/sets/invasion/QuirionElves.java
+++ b/Mage.Sets/src/mage/sets/invasion/QuirionElves.java
@@ -37,7 +37,7 @@ public class QuirionElves extends mage.sets.mirage.QuirionElves {
 
     public QuirionElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/RageWeaver.java b/Mage.Sets/src/mage/sets/invasion/RageWeaver.java
index 67c096daef..0bcbea5a9b 100644
--- a/Mage.Sets/src/mage/sets/invasion/RageWeaver.java
+++ b/Mage.Sets/src/mage/sets/invasion/RageWeaver.java
@@ -37,7 +37,7 @@ public class RageWeaver extends mage.sets.tenthedition.RageWeaver {
 
     public RageWeaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/RavenousRats.java b/Mage.Sets/src/mage/sets/invasion/RavenousRats.java
index cf3c35efa4..dc14ef4dd3 100644
--- a/Mage.Sets/src/mage/sets/invasion/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/invasion/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/invasion/RazorfootGriffin.java
index 6f02aa85a2..53ffa75dba 100644
--- a/Mage.Sets/src/mage/sets/invasion/RazorfootGriffin.java
+++ b/Mage.Sets/src/mage/sets/invasion/RazorfootGriffin.java
@@ -37,7 +37,7 @@ public class RazorfootGriffin extends mage.sets.magic2010.RazorfootGriffin {
 
     public RazorfootGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/RecklessSpite.java b/Mage.Sets/src/mage/sets/invasion/RecklessSpite.java
index bfa4631610..0206d33de3 100644
--- a/Mage.Sets/src/mage/sets/invasion/RecklessSpite.java
+++ b/Mage.Sets/src/mage/sets/invasion/RecklessSpite.java
@@ -37,7 +37,7 @@ public class RecklessSpite extends mage.sets.tempest.RecklessSpite {
 
     public RecklessSpite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/RevivingDose.java b/Mage.Sets/src/mage/sets/invasion/RevivingDose.java
index ce874ecb52..64f123aec6 100644
--- a/Mage.Sets/src/mage/sets/invasion/RevivingDose.java
+++ b/Mage.Sets/src/mage/sets/invasion/RevivingDose.java
@@ -37,7 +37,7 @@ public class RevivingDose extends mage.sets.tenthedition.RevivingDose {
 
     public RevivingDose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/invasion/ReyaDawnbringer.java
index e5e71f376e..48979a755e 100644
--- a/Mage.Sets/src/mage/sets/invasion/ReyaDawnbringer.java
+++ b/Mage.Sets/src/mage/sets/invasion/ReyaDawnbringer.java
@@ -37,7 +37,7 @@ public class ReyaDawnbringer extends mage.sets.tenthedition.ReyaDawnbringer {
 
     public ReyaDawnbringer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/RogueKavu.java b/Mage.Sets/src/mage/sets/invasion/RogueKavu.java
index 3739279531..09a052fe45 100644
--- a/Mage.Sets/src/mage/sets/invasion/RogueKavu.java
+++ b/Mage.Sets/src/mage/sets/invasion/RogueKavu.java
@@ -37,7 +37,7 @@ public class RogueKavu extends mage.sets.ninthedition.RogueKavu {
 
     public RogueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Rout.java b/Mage.Sets/src/mage/sets/invasion/Rout.java
index 43125afc6f..85aa6b024b 100644
--- a/Mage.Sets/src/mage/sets/invasion/Rout.java
+++ b/Mage.Sets/src/mage/sets/invasion/Rout.java
@@ -38,7 +38,7 @@ public class Rout extends mage.sets.conspiracy.Rout {
 
     public Rout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ShimmeringWings.java b/Mage.Sets/src/mage/sets/invasion/ShimmeringWings.java
index affa0f43f8..c35e0ae148 100644
--- a/Mage.Sets/src/mage/sets/invasion/ShimmeringWings.java
+++ b/Mage.Sets/src/mage/sets/invasion/ShimmeringWings.java
@@ -37,7 +37,7 @@ public class ShimmeringWings extends mage.sets.tempest.ShimmeringWings {
 
     public ShimmeringWings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/ShivanOasis.java b/Mage.Sets/src/mage/sets/invasion/ShivanOasis.java
index 5bbc4eac98..c4a2f8cfa1 100644
--- a/Mage.Sets/src/mage/sets/invasion/ShivanOasis.java
+++ b/Mage.Sets/src/mage/sets/invasion/ShivanOasis.java
@@ -37,7 +37,7 @@ public class ShivanOasis extends mage.sets.planechase.ShivanOasis {
 
     public ShivanOasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 327;
+        this.cardNumber = "327";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Simoon.java b/Mage.Sets/src/mage/sets/invasion/Simoon.java
index eb8fc2cd18..f47914dd58 100644
--- a/Mage.Sets/src/mage/sets/invasion/Simoon.java
+++ b/Mage.Sets/src/mage/sets/invasion/Simoon.java
@@ -37,7 +37,7 @@ public class Simoon extends mage.sets.visions.Simoon {
 
     public Simoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/SkyWeaver.java b/Mage.Sets/src/mage/sets/invasion/SkyWeaver.java
index 64bb525329..edef2543ce 100644
--- a/Mage.Sets/src/mage/sets/invasion/SkyWeaver.java
+++ b/Mage.Sets/src/mage/sets/invasion/SkyWeaver.java
@@ -37,7 +37,7 @@ public class SkyWeaver extends mage.sets.tenthedition.SkyWeaver {
 
     public SkyWeaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/SpiritWeaver.java b/Mage.Sets/src/mage/sets/invasion/SpiritWeaver.java
index 5a42ee52fa..8c2fc31ad4 100644
--- a/Mage.Sets/src/mage/sets/invasion/SpiritWeaver.java
+++ b/Mage.Sets/src/mage/sets/invasion/SpiritWeaver.java
@@ -37,7 +37,7 @@ public class SpiritWeaver extends mage.sets.tenthedition.SpiritWeaver {
 
     public SpiritWeaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Stun.java b/Mage.Sets/src/mage/sets/invasion/Stun.java
index 3430f5fac0..060a8ab24d 100644
--- a/Mage.Sets/src/mage/sets/invasion/Stun.java
+++ b/Mage.Sets/src/mage/sets/invasion/Stun.java
@@ -37,7 +37,7 @@ public class Stun extends mage.sets.tempest.Stun {
 
     public Stun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/TeferisMoat.java b/Mage.Sets/src/mage/sets/invasion/TeferisMoat.java
index 5240732811..629a1a8eb5 100644
--- a/Mage.Sets/src/mage/sets/invasion/TeferisMoat.java
+++ b/Mage.Sets/src/mage/sets/invasion/TeferisMoat.java
@@ -38,7 +38,7 @@ public class TeferisMoat extends mage.sets.timeshifted.TeferisMoat {
 
     public TeferisMoat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "INV";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/invasion/ThornscapeApprentice.java b/Mage.Sets/src/mage/sets/invasion/ThornscapeApprentice.java
index 00c99c6ff8..732540b426 100644
--- a/Mage.Sets/src/mage/sets/invasion/ThornscapeApprentice.java
+++ b/Mage.Sets/src/mage/sets/invasion/ThornscapeApprentice.java
@@ -37,7 +37,7 @@ public class ThornscapeApprentice extends mage.sets.phyrexiavsthecoalition.Thorn
 
     public ThornscapeApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/TowerDrake.java b/Mage.Sets/src/mage/sets/invasion/TowerDrake.java
index a0151d33ec..d40762f32e 100644
--- a/Mage.Sets/src/mage/sets/invasion/TowerDrake.java
+++ b/Mage.Sets/src/mage/sets/invasion/TowerDrake.java
@@ -37,7 +37,7 @@ public class TowerDrake extends mage.sets.returntoravnica.TowerDrake {
 
     public TowerDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/Tranquility.java b/Mage.Sets/src/mage/sets/invasion/Tranquility.java
index a42957830a..68c86bbc9f 100644
--- a/Mage.Sets/src/mage/sets/invasion/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/invasion/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/TravelersCloak.java b/Mage.Sets/src/mage/sets/invasion/TravelersCloak.java
index fb88d40dc5..343eb30337 100644
--- a/Mage.Sets/src/mage/sets/invasion/TravelersCloak.java
+++ b/Mage.Sets/src/mage/sets/invasion/TravelersCloak.java
@@ -37,7 +37,7 @@ public class TravelersCloak extends mage.sets.conspiracy.TravelersCloak {
 
     public TravelersCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/UrzasRage.java b/Mage.Sets/src/mage/sets/invasion/UrzasRage.java
index 1db837504c..c4459f3335 100644
--- a/Mage.Sets/src/mage/sets/invasion/UrzasRage.java
+++ b/Mage.Sets/src/mage/sets/invasion/UrzasRage.java
@@ -38,7 +38,7 @@ public class UrzasRage extends mage.sets.phyrexiavsthecoalition.UrzasRage {
 
     public UrzasRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "INV";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/invasion/VerduranEmissary.java b/Mage.Sets/src/mage/sets/invasion/VerduranEmissary.java
index 86e36e6eb4..f75e092a4e 100644
--- a/Mage.Sets/src/mage/sets/invasion/VerduranEmissary.java
+++ b/Mage.Sets/src/mage/sets/invasion/VerduranEmissary.java
@@ -37,7 +37,7 @@ public class VerduranEmissary extends mage.sets.phyrexiavsthecoalition.VerduranE
 
     public VerduranEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/WaxWane.java b/Mage.Sets/src/mage/sets/invasion/WaxWane.java
index ab44180a78..297a3171e7 100644
--- a/Mage.Sets/src/mage/sets/invasion/WaxWane.java
+++ b/Mage.Sets/src/mage/sets/invasion/WaxWane.java
@@ -37,7 +37,7 @@ public class WaxWane extends mage.sets.archenemy.WaxWane {
 
     public WaxWane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/WorldlyCounsel.java b/Mage.Sets/src/mage/sets/invasion/WorldlyCounsel.java
index 024a0ce85e..48e96934cd 100644
--- a/Mage.Sets/src/mage/sets/invasion/WorldlyCounsel.java
+++ b/Mage.Sets/src/mage/sets/invasion/WorldlyCounsel.java
@@ -37,7 +37,7 @@ public class WorldlyCounsel extends mage.sets.conflux.WorldlyCounsel {
 
     public WorldlyCounsel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "INV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/BarrenMoor.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/BarrenMoor.java
index a542aed397..3f118e0be3 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/BoneyardWurm.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/BoneyardWurm.java
index 2f4421f90e..73437ef4ca 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/BoneyardWurm.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/BoneyardWurm.java
@@ -37,7 +37,7 @@ public class BoneyardWurm extends mage.sets.innistrad.BoneyardWurm {
 
     public BoneyardWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/BrainWeevil.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/BrainWeevil.java
index bcaaa82ff5..1cd8e1f9ae 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/BrainWeevil.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/BrainWeevil.java
@@ -37,7 +37,7 @@ public class BrainWeevil extends mage.sets.innistrad.BrainWeevil {
 
     public BrainWeevil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Brainstorm.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Brainstorm.java
index 8ca7595bf0..94e1950fda 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/CallToHeel.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/CallToHeel.java
index a4e47bd2ef..7356d047d6 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/CallToHeel.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/CallToHeel.java
@@ -37,7 +37,7 @@ public class CallToHeel extends mage.sets.shardsofalara.CallToHeel {
 
     public CallToHeel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/DakmorSalvage.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/DakmorSalvage.java
index 245b18583e..99c36c2671 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/DakmorSalvage.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/DakmorSalvage.java
@@ -37,7 +37,7 @@ public class DakmorSalvage extends mage.sets.futuresight.DakmorSalvage {
 
     public DakmorSalvage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Dissipate.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Dissipate.java
index 6a5c5cc10e..7f1b50892d 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Dissipate.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Dissipate.java
@@ -37,7 +37,7 @@ public class Dissipate extends mage.sets.innistrad.Dissipate {
 
     public Dissipate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/DjinnIlluminatus.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/DjinnIlluminatus.java
index 62ab29630d..e666ebd0d6 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/DjinnIlluminatus.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/DjinnIlluminatus.java
@@ -38,7 +38,7 @@ public class DjinnIlluminatus extends mage.sets.prereleaseevents.DjinnIlluminatu
 
     public DjinnIlluminatus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDJ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Doomgape.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Doomgape.java
index b8a4bbf8bf..99a5c45914 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Doomgape.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Doomgape.java
@@ -37,7 +37,7 @@ public class Doomgape extends mage.sets.eventide.Doomgape {
 
     public Doomgape(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/DregMangler.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/DregMangler.java
index ac5355f5c0..844ba00204 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/DregMangler.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/DregMangler.java
@@ -37,7 +37,7 @@ public class DregMangler extends mage.sets.returntoravnica.DregMangler {
 
     public DregMangler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/ElvesOfDeepShadow.java
index 9558b049de..062b970162 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/ElvesOfDeepShadow.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/ElvesOfDeepShadow.java
@@ -37,7 +37,7 @@ public class ElvesOfDeepShadow extends mage.sets.ravnica.ElvesOfDeepShadow {
 
     public ElvesOfDeepShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/EternalWitness.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/EternalWitness.java
index dbb6194710..fc4c473a67 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/EternalWitness.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/EternalWitness.java
@@ -37,7 +37,7 @@ public class EternalWitness extends mage.sets.fifthdawn.EternalWitness {
 
     public EternalWitness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/FireIce.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/FireIce.java
index 18e4f42864..831a0a8c31 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/FireIce.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/FireIce.java
@@ -37,7 +37,7 @@ public class FireIce extends mage.sets.apocalypse.FireIce {
 
     public FireIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/ForceSpike.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/ForceSpike.java
index 4ba83d96c2..2b02a04457 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/ForceSpike.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/ForceSpike.java
@@ -37,7 +37,7 @@ public class ForceSpike extends mage.sets.seventhedition.ForceSpike {
 
     public ForceSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/ForgottenCave.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/ForgottenCave.java
index 58b7a24c60..355f69c8d0 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Galvanoth.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Galvanoth.java
index 77f31a078f..22d0c27284 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Galvanoth.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Galvanoth.java
@@ -37,7 +37,7 @@ public class Galvanoth extends mage.sets.mirrodinbesieged.Galvanoth {
 
     public Galvanoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Gelectrode.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Gelectrode.java
index 19fac13087..e4255032e5 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Gelectrode.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Gelectrode.java
@@ -37,7 +37,7 @@ public class Gelectrode extends mage.sets.guildpact.Gelectrode {
 
     public Gelectrode(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Gleancrawler.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Gleancrawler.java
index 0d6e817300..e0c135d133 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Gleancrawler.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Gleancrawler.java
@@ -38,7 +38,7 @@ public class Gleancrawler extends mage.sets.prereleaseevents.Gleancrawler {
 
     public Gleancrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDJ";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GoblinElectromancer.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GoblinElectromancer.java
index f7bc887180..82bec8395c 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GoblinElectromancer.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GoblinElectromancer.java
@@ -37,7 +37,7 @@ public class GoblinElectromancer extends mage.sets.returntoravnica.GoblinElectro
 
     public GoblinElectromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariGraveTroll.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariGraveTroll.java
index bd21b9e746..20c637ea16 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariGraveTroll.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariGraveTroll.java
@@ -37,7 +37,7 @@ public class GolgariGraveTroll extends mage.sets.ravnica.GolgariGraveTroll {
 
     public GolgariGraveTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotFarm.java
index 2c80cfd7db..5c5fc56a8a 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotFarm.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotFarm.java
@@ -37,7 +37,7 @@ public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
 
     public GolgariRotFarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotwurm.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotwurm.java
index 4f4ff55e69..2110416183 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotwurm.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotwurm.java
@@ -37,7 +37,7 @@ public class GolgariRotwurm extends mage.sets.ravnica.GolgariRotwurm {
 
     public GolgariRotwurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariSignet.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariSignet.java
index f947756e1f..c20a094c81 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariSignet.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariSignet.java
@@ -37,7 +37,7 @@ public class GolgariSignet extends mage.sets.ravnica.GolgariSignet {
 
     public GolgariSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariThug.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariThug.java
index 7a90b44933..5736332415 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariThug.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariThug.java
@@ -37,7 +37,7 @@ public class GolgariThug extends mage.sets.ravnica.GolgariThug {
 
     public GolgariThug(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GreaterMossdog.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GreaterMossdog.java
index 575619b005..66a1087826 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GreaterMossdog.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GreaterMossdog.java
@@ -37,7 +37,7 @@ public class GreaterMossdog extends mage.sets.ravnica.GreaterMossdog {
 
     public GreaterMossdog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/GrimFlowering.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/GrimFlowering.java
index 5c847efa62..fbc3b5f8ef 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/GrimFlowering.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/GrimFlowering.java
@@ -37,7 +37,7 @@ public class GrimFlowering extends mage.sets.darkascension.GrimFlowering {
 
     public GrimFlowering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/InvokeTheFiremind.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/InvokeTheFiremind.java
index ef72e84164..d9b071e2ab 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/InvokeTheFiremind.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/InvokeTheFiremind.java
@@ -37,7 +37,7 @@ public class InvokeTheFiremind extends mage.sets.guildpact.InvokeTheFiremind {
 
     public InvokeTheFiremind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/IsochronScepter.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/IsochronScepter.java
index cbd6e0caf5..1a33c2d57e 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/IsochronScepter.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/IsochronScepter.java
@@ -37,7 +37,7 @@ public class IsochronScepter extends mage.sets.mirrodin.IsochronScepter {
 
     public IsochronScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetBoilerworks.java
index fae967a19f..a90d83f156 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetBoilerworks.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetBoilerworks.java
@@ -37,7 +37,7 @@ public class IzzetBoilerworks extends mage.sets.guildpact.IzzetBoilerworks {
 
     public IzzetBoilerworks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetCharm.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetCharm.java
index 1a1237ab45..4a3ac7264d 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetCharm.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetCharm.java
@@ -37,7 +37,7 @@ public class IzzetCharm extends mage.sets.returntoravnica.IzzetCharm {
 
     public IzzetCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetChronarch.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetChronarch.java
index 0ab6445217..41bd17c882 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetChronarch.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetChronarch.java
@@ -37,7 +37,7 @@ public class IzzetChronarch extends mage.sets.guildpact.IzzetChronarch {
 
     public IzzetChronarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetGuildmage.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetGuildmage.java
index 296ff1f643..9822fe770e 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetGuildmage.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetGuildmage.java
@@ -37,7 +37,7 @@ public class IzzetGuildmage extends mage.sets.guildpact.IzzetGuildmage {
 
     public IzzetGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetSignet.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetSignet.java
index c32fa1ef8a..ed42c3dd51 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetSignet.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/IzzetSignet.java
@@ -37,7 +37,7 @@ public class IzzetSignet extends mage.sets.guildpact.IzzetSignet {
 
     public IzzetSignet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/JaradGolgariLichLord.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/JaradGolgariLichLord.java
index 70d081e2f2..be9c40fdcb 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/JaradGolgariLichLord.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/JaradGolgariLichLord.java
@@ -37,7 +37,7 @@ public class JaradGolgariLichLord extends mage.sets.returntoravnica.JaradGolgari
 
     public JaradGolgariLichLord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/KilnFiend.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/KilnFiend.java
index 03004e7e41..85a09d36cc 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/KilnFiend.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/KilnFiend.java
@@ -37,7 +37,7 @@ public class KilnFiend extends mage.sets.riseoftheeldrazi.KilnFiend {
 
     public KilnFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/KorozdaGuildmage.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/KorozdaGuildmage.java
index 9633af42f6..356c0d4558 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/KorozdaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/KorozdaGuildmage.java
@@ -37,7 +37,7 @@ public class KorozdaGuildmage extends mage.sets.returntoravnica.KorozdaGuildmage
 
     public KorozdaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeDeath.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeDeath.java
index 312f745e30..0b67c68734 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeDeath.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeDeath.java
@@ -37,7 +37,7 @@ public class LifeDeath extends mage.sets.apocalypse.LifeDeath {
 
     public LifeDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeFromTheLoam.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeFromTheLoam.java
index a0897d7ee3..968df3d4ae 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeFromTheLoam.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/LifeFromTheLoam.java
@@ -37,7 +37,7 @@ public class LifeFromTheLoam extends mage.sets.ravnica.LifeFromTheLoam {
 
     public LifeFromTheLoam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/LonelySandbar.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/LonelySandbar.java
index 9a3802f0bc..b89eba4824 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/LonelySandbar.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/LonelySandbar.java
@@ -37,7 +37,7 @@ public class LonelySandbar extends mage.sets.onslaught.LonelySandbar {
 
     public LonelySandbar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/MagmaSpray.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/MagmaSpray.java
index 85a96dd216..82472b7b6f 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/MagmaSpray.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/MagmaSpray.java
@@ -37,7 +37,7 @@ public class MagmaSpray extends mage.sets.shardsofalara.MagmaSpray {
 
     public MagmaSpray(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/NightmareVoid.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/NightmareVoid.java
index 3d6019316a..4673203dd4 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/NightmareVoid.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/NightmareVoid.java
@@ -37,7 +37,7 @@ public class NightmareVoid extends mage.sets.ravnica.NightmareVoid {
 
     public NightmareVoid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/NivMizzetTheFiremind.java
index cc3c672f83..89d9c0bb2a 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/NivMizzetTheFiremind.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/NivMizzetTheFiremind.java
@@ -38,7 +38,7 @@ public class NivMizzetTheFiremind extends mage.sets.guildpact.NivMizzetTheFiremi
 
     public NivMizzetTheFiremind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDJ";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/OgreSavant.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/OgreSavant.java
index 0f7b0bd3e3..5d94573c51 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/OgreSavant.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/OgreSavant.java
@@ -37,7 +37,7 @@ public class OgreSavant extends mage.sets.ajanivsnicolbolas.OgreSavant {
 
     public OgreSavant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/OverwhelmingIntellect.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/OverwhelmingIntellect.java
index f74aa7c738..686de0a98e 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/OverwhelmingIntellect.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/OverwhelmingIntellect.java
@@ -37,7 +37,7 @@ public class OverwhelmingIntellect extends mage.sets.saviorsofkamigawa.Overwhelm
 
     public OverwhelmingIntellect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/PlaguedRusalka.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/PlaguedRusalka.java
index 0a636f7ce9..aeeea7cd36 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/PlaguedRusalka.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/PlaguedRusalka.java
@@ -37,7 +37,7 @@ public class PlaguedRusalka extends mage.sets.guildpact.PlaguedRusalka {
 
     public PlaguedRusalka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/PropheticBolt.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/PropheticBolt.java
index 4a3c1f4a30..bacedf2117 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/PropheticBolt.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/PropheticBolt.java
@@ -37,7 +37,7 @@ public class PropheticBolt extends mage.sets.commander.PropheticBolt {
 
     public PropheticBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Putrefy.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Putrefy.java
index db11015516..0b828c789a 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Putrefy.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Putrefy.java
@@ -37,7 +37,7 @@ public class Putrefy extends mage.sets.ravnica.Putrefy {
 
     public Putrefy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/PutridLeech.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/PutridLeech.java
index 5c3e6fe2d9..9d6797f4a2 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/PutridLeech.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/PutridLeech.java
@@ -37,7 +37,7 @@ public class PutridLeech extends mage.sets.alarareborn.PutridLeech {
 
     public PutridLeech(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Pyromatics.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Pyromatics.java
index 5a201da753..f317acc245 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Pyromatics.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Pyromatics.java
@@ -37,7 +37,7 @@ public class Pyromatics extends mage.sets.guildpact.Pyromatics {
 
     public Pyromatics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/QuicksilverDagger.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/QuicksilverDagger.java
index 938290e0d2..6ad480a161 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/QuicksilverDagger.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/QuicksilverDagger.java
@@ -37,7 +37,7 @@ public class QuicksilverDagger extends mage.sets.apocalypse.QuicksilverDagger {
 
     public QuicksilverDagger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/RavenousRats.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/RavenousRats.java
index c7a398624b..29dc3ffb17 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/ReassemblingSkeleton.java
index 3d2b810466..02210a7043 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/ReassemblingSkeleton.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/ReassemblingSkeleton.java
@@ -37,7 +37,7 @@ public class ReassemblingSkeleton extends mage.sets.magic2011.ReassemblingSkelet
 
     public ReassemblingSkeleton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Reminisce.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Reminisce.java
index 2c743e1415..0b61bf8cb7 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Reminisce.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Reminisce.java
@@ -37,7 +37,7 @@ public class Reminisce extends mage.sets.onslaught.Reminisce {
 
     public Reminisce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/SadisticHypnotist.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/SadisticHypnotist.java
index 27b4c108aa..64241ebaa9 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/SadisticHypnotist.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/SadisticHypnotist.java
@@ -37,7 +37,7 @@ public class SadisticHypnotist extends mage.sets.odyssey.SadisticHypnotist {
 
     public SadisticHypnotist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/ShamblingShell.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/ShamblingShell.java
index e32ec26842..49f2f3e126 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/ShamblingShell.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/ShamblingShell.java
@@ -37,7 +37,7 @@ public class ShamblingShell extends mage.sets.ravnica.ShamblingShell {
 
     public ShamblingShell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/ShrewdHatchling.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/ShrewdHatchling.java
index ec645dad96..25de353aa5 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/ShrewdHatchling.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/ShrewdHatchling.java
@@ -37,7 +37,7 @@ public class ShrewdHatchling extends mage.sets.eventide.ShrewdHatchling {
 
     public ShrewdHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/SphinxBoneWand.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/SphinxBoneWand.java
index 9d81005f19..148d2f005d 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/SphinxBoneWand.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/SphinxBoneWand.java
@@ -37,7 +37,7 @@ public class SphinxBoneWand extends mage.sets.riseoftheeldrazi.SphinxBoneWand {
 
     public SphinxBoneWand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/StingerflingSpider.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/StingerflingSpider.java
index 713e660745..44847157b1 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/StingerflingSpider.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/StingerflingSpider.java
@@ -37,7 +37,7 @@ public class StingerflingSpider extends mage.sets.magic2012.StingerflingSpider {
 
     public StingerflingSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/StinkweedImp.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/StinkweedImp.java
index 46dea46387..e83873d18b 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/StinkweedImp.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/StinkweedImp.java
@@ -37,7 +37,7 @@ public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
 
     public StinkweedImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/StreetSpasm.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/StreetSpasm.java
index 6603719037..b6d98a669c 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/StreetSpasm.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/StreetSpasm.java
@@ -37,7 +37,7 @@ public class StreetSpasm extends mage.sets.returntoravnica.StreetSpasm {
 
     public StreetSpasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/SvogthosTheRestlessTomb.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/SvogthosTheRestlessTomb.java
index 77bc7c0abd..aa33d244c6 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/SvogthosTheRestlessTomb.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/SvogthosTheRestlessTomb.java
@@ -37,7 +37,7 @@ public class SvogthosTheRestlessTomb extends mage.sets.commander.SvogthosTheRest
 
     public SvogthosTheRestlessTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Thunderheads.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Thunderheads.java
index 8e10cd639f..98c0edf232 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Thunderheads.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Thunderheads.java
@@ -37,7 +37,7 @@ public class Thunderheads extends mage.sets.guildpact.Thunderheads {
 
     public Thunderheads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/TrainOfThought.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/TrainOfThought.java
index ec7ca0a550..6c4b0ac909 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/TrainOfThought.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/TrainOfThought.java
@@ -37,7 +37,7 @@ public class TrainOfThought extends mage.sets.guildpact.TrainOfThought {
 
     public TrainOfThought(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/TranquilThicket.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/TranquilThicket.java
index 786514256a..a6f14d90d0 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/TwilightsCall.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/TwilightsCall.java
index 11503dd681..163bc8f648 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/TwilightsCall.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/TwilightsCall.java
@@ -38,7 +38,7 @@ public class TwilightsCall extends mage.sets.invasion.TwilightsCall {
 
     public TwilightsCall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/Vacuumelt.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/Vacuumelt.java
index b5cae2f51d..9a5ba2c21e 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/Vacuumelt.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/Vacuumelt.java
@@ -37,7 +37,7 @@ public class Vacuumelt extends mage.sets.guildpact.Vacuumelt {
 
     public Vacuumelt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/VigorMortis.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/VigorMortis.java
index 0df97d2129..567a3aecfb 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/VigorMortis.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/VigorMortis.java
@@ -37,7 +37,7 @@ public class VigorMortis extends mage.sets.ravnica.VigorMortis {
 
     public VigorMortis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/WeeDragonauts.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/WeeDragonauts.java
index 7875f5da11..a7d7c81bdb 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/WeeDragonauts.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/WeeDragonauts.java
@@ -37,7 +37,7 @@ public class WeeDragonauts extends mage.sets.guildpact.WeeDragonauts {
 
     public WeeDragonauts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/izzetvsgolgari/YokeOfTheDamned.java b/Mage.Sets/src/mage/sets/izzetvsgolgari/YokeOfTheDamned.java
index 2b57ea1f03..766aa1bd54 100644
--- a/Mage.Sets/src/mage/sets/izzetvsgolgari/YokeOfTheDamned.java
+++ b/Mage.Sets/src/mage/sets/izzetvsgolgari/YokeOfTheDamned.java
@@ -37,7 +37,7 @@ public class YokeOfTheDamned extends mage.sets.conflux.YokeOfTheDamned {
 
     public YokeOfTheDamned(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDJ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java b/Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java
index 452b1a3b0a..bdba615bdd 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java
@@ -37,7 +37,7 @@ public class AEthersnipe extends mage.sets.commander.AEthersnipe {
 
     public AEthersnipe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/AirElemental.java b/Mage.Sets/src/mage/sets/jacevschandra/AirElemental.java
index d48ff2937f..b603251b44 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/AncestralVision.java b/Mage.Sets/src/mage/sets/jacevschandra/AncestralVision.java
index 80150d1bd0..add7d00cdf 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/AncestralVision.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/AncestralVision.java
@@ -37,7 +37,7 @@ public class AncestralVision extends mage.sets.timespiral.AncestralVision {
 
     public AncestralVision(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/BottleGnomes.java b/Mage.Sets/src/mage/sets/jacevschandra/BottleGnomes.java
index 8583835ece..e811c71a29 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/BrineElemental.java b/Mage.Sets/src/mage/sets/jacevschandra/BrineElemental.java
index f277639e7d..9af3188dc1 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/BrineElemental.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/BrineElemental.java
@@ -37,7 +37,7 @@ public class BrineElemental extends mage.sets.commander2014.BrineElemental {
 
     public BrineElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/ChandraNalaar.java b/Mage.Sets/src/mage/sets/jacevschandra/ChandraNalaar.java
index db510c8df9..a65e3e84dc 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/ChandraNalaar.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/ChandraNalaar.java
@@ -37,7 +37,7 @@ public class ChandraNalaar extends mage.sets.magic2010.ChandraNalaar {
 
     public ChandraNalaar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/ChartoothCougar.java b/Mage.Sets/src/mage/sets/jacevschandra/ChartoothCougar.java
index b8f34afc35..52f96c47ce 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/ChartoothCougar.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/ChartoothCougar.java
@@ -37,7 +37,7 @@ public class ChartoothCougar extends mage.sets.scourge.ChartoothCougar {
 
     public ChartoothCougar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Condescend.java b/Mage.Sets/src/mage/sets/jacevschandra/Condescend.java
index 5949ede8d5..9e2eb7fa28 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Condescend.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Condescend.java
@@ -37,7 +37,7 @@ public class Condescend extends mage.sets.fifthdawn.Condescend {
 
     public Condescend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/ConeOfFlame.java b/Mage.Sets/src/mage/sets/jacevschandra/ConeOfFlame.java
index b15065657d..a99ed488a3 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Counterspell.java b/Mage.Sets/src/mage/sets/jacevschandra/Counterspell.java
index 76c72bea14..9763b814e1 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Daze.java b/Mage.Sets/src/mage/sets/jacevschandra/Daze.java
index 0d604579b0..216166a1c6 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Daze.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Daze.java
@@ -37,7 +37,7 @@ public class Daze extends mage.sets.nemesis.Daze {
 
     public Daze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Demonfire.java b/Mage.Sets/src/mage/sets/jacevschandra/Demonfire.java
index 2ef7127eb1..1ab8e36208 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Demonfire.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Demonfire.java
@@ -37,7 +37,7 @@ public class Demonfire extends mage.sets.dissension.Demonfire {
 
     public Demonfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/ErrantEphemeron.java b/Mage.Sets/src/mage/sets/jacevschandra/ErrantEphemeron.java
index f8e51d0455..00d5bada40 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/ErrantEphemeron.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/ErrantEphemeron.java
@@ -37,7 +37,7 @@ public class ErrantEphemeron extends mage.sets.timespiral.ErrantEphemeron {
 
     public ErrantEphemeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FactOrFiction.java b/Mage.Sets/src/mage/sets/jacevschandra/FactOrFiction.java
index 1767afef0b..c5b9ade596 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Fireball.java b/Mage.Sets/src/mage/sets/jacevschandra/Fireball.java
index dd33194c35..0f937a6e4b 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Fireball.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Fireblast.java b/Mage.Sets/src/mage/sets/jacevschandra/Fireblast.java
index cb6161e4e4..2a14e95f72 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Fireblast.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Fireblast.java
@@ -37,7 +37,7 @@ public class Fireblast extends mage.sets.visions.Fireblast {
 
     public Fireblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Firebolt.java b/Mage.Sets/src/mage/sets/jacevschandra/Firebolt.java
index 3ed6c1980c..f1cc3ef7a9 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Firebolt.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Firebolt.java
@@ -37,7 +37,7 @@ public class Firebolt extends mage.sets.odyssey.Firebolt {
 
     public Firebolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Fireslinger.java b/Mage.Sets/src/mage/sets/jacevschandra/Fireslinger.java
index a584826de9..addc7ddcd5 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Fireslinger.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Fireslinger.java
@@ -37,7 +37,7 @@ public class Fireslinger extends mage.sets.tempest.Fireslinger {
 
     public Fireslinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FlameJavelin.java b/Mage.Sets/src/mage/sets/jacevschandra/FlameJavelin.java
index 24f6e3e964..054c8d89ce 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/FlameJavelin.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/FlameJavelin.java
@@ -37,7 +37,7 @@ public class FlameJavelin extends mage.sets.shadowmoor.FlameJavelin {
 
     public FlameJavelin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FlamekinBrawler.java b/Mage.Sets/src/mage/sets/jacevschandra/FlamekinBrawler.java
index 5d6ff35893..00aa475f97 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/FlamekinBrawler.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/FlamekinBrawler.java
@@ -37,7 +37,7 @@ public class FlamekinBrawler extends mage.sets.lorwyn.FlamekinBrawler {
 
     public FlamekinBrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FlametongueKavu.java b/Mage.Sets/src/mage/sets/jacevschandra/FlametongueKavu.java
index 4614b19cd5..59384bd7b0 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/jacevschandra/FlamewaveInvoker.java
index 1ddfbfbb2f..946f0c5943 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/FlamewaveInvoker.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/FlamewaveInvoker.java
@@ -37,7 +37,7 @@ public class FlamewaveInvoker extends mage.sets.tenthedition.FlamewaveInvoker {
 
     public FlamewaveInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/jacevschandra/FurnaceWhelp.java
index cb151a12a6..cdc1f7df9a 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/FurnaceWhelp.java
@@ -37,7 +37,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
 
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Guile.java b/Mage.Sets/src/mage/sets/jacevschandra/Guile.java
index 5b5806855f..aee0ed55bd 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Guile.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Guile.java
@@ -37,7 +37,7 @@ public class Guile extends mage.sets.lorwyn.Guile {
 
     public Guile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Incinerate.java b/Mage.Sets/src/mage/sets/jacevschandra/Incinerate.java
index 6c51aacf21..14ce4cd502 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/IngotChewer.java b/Mage.Sets/src/mage/sets/jacevschandra/IngotChewer.java
index 7337c03bd1..f2c1be15dc 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/IngotChewer.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/IngotChewer.java
@@ -37,7 +37,7 @@ public class IngotChewer extends mage.sets.lorwyn.IngotChewer {
 
     public IngotChewer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/InnerFlameAcolyte.java b/Mage.Sets/src/mage/sets/jacevschandra/InnerFlameAcolyte.java
index 779b4c6269..f6f16095f8 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/InnerFlameAcolyte.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/InnerFlameAcolyte.java
@@ -37,7 +37,7 @@ public class InnerFlameAcolyte extends mage.sets.lorwyn.InnerFlameAcolyte {
 
     public InnerFlameAcolyte(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/JaceBeleren.java b/Mage.Sets/src/mage/sets/jacevschandra/JaceBeleren.java
index dcf9baa619..87535177bc 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/JaceBeleren.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/JaceBeleren.java
@@ -37,7 +37,7 @@ public class JaceBeleren extends mage.sets.magic2010.JaceBeleren {
 
     public JaceBeleren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/MagmaJet.java b/Mage.Sets/src/mage/sets/jacevschandra/MagmaJet.java
index 40d9fc4f35..02b82038f8 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/MagmaJet.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/MagmaJet.java
@@ -37,7 +37,7 @@ public class MagmaJet extends mage.sets.fifthdawn.MagmaJet {
 
     public MagmaJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/ManOWar.java b/Mage.Sets/src/mage/sets/jacevschandra/ManOWar.java
index e8bbd9402d..800d94455b 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/ManOWar.java
@@ -37,7 +37,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/MartyrOfFrost.java b/Mage.Sets/src/mage/sets/jacevschandra/MartyrOfFrost.java
index 25dbc5e3cf..eb84243caa 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/MartyrOfFrost.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/MartyrOfFrost.java
@@ -37,7 +37,7 @@ public class MartyrOfFrost extends mage.sets.coldsnap.MartyrOfFrost {
 
     public MartyrOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/MindStone.java b/Mage.Sets/src/mage/sets/jacevschandra/MindStone.java
index a3dfe0f22c..4717e3111c 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/MindStone.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/MindStone.java
@@ -37,7 +37,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Mulldrifter.java b/Mage.Sets/src/mage/sets/jacevschandra/Mulldrifter.java
index 4eccb31101..a8b1ebd8f8 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Mulldrifter.java
@@ -37,7 +37,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Ophidian.java b/Mage.Sets/src/mage/sets/jacevschandra/Ophidian.java
index 4cd532bf13..78f78004a8 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Ophidian.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Ophidian.java
@@ -37,7 +37,7 @@ public class Ophidian extends mage.sets.vintagemasters.Ophidian {
 
     public Ophidian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/PyreCharger.java b/Mage.Sets/src/mage/sets/jacevschandra/PyreCharger.java
index b8d541f69d..ad0e000305 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/PyreCharger.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/PyreCharger.java
@@ -37,7 +37,7 @@ public class PyreCharger extends mage.sets.shadowmoor.PyreCharger {
 
     public PyreCharger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/RakdosPitDragon.java b/Mage.Sets/src/mage/sets/jacevschandra/RakdosPitDragon.java
index 402b455a48..07c5019a4f 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/RakdosPitDragon.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/RakdosPitDragon.java
@@ -37,7 +37,7 @@ public class RakdosPitDragon extends mage.sets.dissension.RakdosPitDragon {
 
     public RakdosPitDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Repulse.java b/Mage.Sets/src/mage/sets/jacevschandra/Repulse.java
index 0beba2a572..9e271dbd00 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Repulse.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Repulse.java
@@ -37,7 +37,7 @@ public class Repulse extends mage.sets.invasion.Repulse {
 
     public Repulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/jacevschandra/RiftwingCloudskate.java
index ee6cbc6838..f6787ed349 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/RiftwingCloudskate.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/RiftwingCloudskate.java
@@ -37,7 +37,7 @@ public class RiftwingCloudskate extends mage.sets.timespiral.RiftwingCloudskate
 
     public RiftwingCloudskate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/SealOfFire.java b/Mage.Sets/src/mage/sets/jacevschandra/SealOfFire.java
index b570949e03..f6c216b413 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/SealOfFire.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/SealOfFire.java
@@ -37,7 +37,7 @@ public class SealOfFire extends mage.sets.nemesis.SealOfFire {
 
     public SealOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/SlithFirewalker.java b/Mage.Sets/src/mage/sets/jacevschandra/SlithFirewalker.java
index 2ce91d7f10..7d1d8d68a8 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/SlithFirewalker.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/SlithFirewalker.java
@@ -37,7 +37,7 @@ public class SlithFirewalker extends mage.sets.mirrodin.SlithFirewalker {
 
     public SlithFirewalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/SoulbrightFlamekin.java b/Mage.Sets/src/mage/sets/jacevschandra/SoulbrightFlamekin.java
index 14a4b2fdea..642d8b5daf 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/SoulbrightFlamekin.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/SoulbrightFlamekin.java
@@ -37,7 +37,7 @@ public class SoulbrightFlamekin extends mage.sets.lorwyn.SoulbrightFlamekin {
 
     public SoulbrightFlamekin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/TerrainGenerator.java b/Mage.Sets/src/mage/sets/jacevschandra/TerrainGenerator.java
index 5cce9bb93f..62088003e7 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/TerrainGenerator.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/TerrainGenerator.java
@@ -37,7 +37,7 @@ public class TerrainGenerator extends mage.sets.anthologyjacevschandra.TerrainGe
 
     public TerrainGenerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/VoidmageApprentice.java b/Mage.Sets/src/mage/sets/jacevschandra/VoidmageApprentice.java
index da64a2f191..620d837023 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/VoidmageApprentice.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/VoidmageApprentice.java
@@ -37,7 +37,7 @@ public class VoidmageApprentice extends mage.sets.anthologyjacevschandra.Voidmag
 
     public VoidmageApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/WallOfDeceit.java b/Mage.Sets/src/mage/sets/jacevschandra/WallOfDeceit.java
index 1a4937b132..ceb799f48f 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/WallOfDeceit.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/WallOfDeceit.java
@@ -37,7 +37,7 @@ public class WallOfDeceit extends mage.sets.anthologyjacevschandra.WallOfDeceit
 
     public WallOfDeceit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Willbender.java b/Mage.Sets/src/mage/sets/jacevschandra/Willbender.java
index 980acbd995..dbd696712e 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Willbender.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Willbender.java
@@ -37,7 +37,7 @@ public class Willbender extends mage.sets.commander2014.Willbender {
 
     public Willbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java b/Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java
index 69c6c450d1..4c12662ebd 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java
@@ -37,7 +37,7 @@ public class AEtherAdept extends mage.sets.magic2011.AetherAdept {
 
     public AEtherAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java b/Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java
index 8f810c5488..461f6534e6 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java
@@ -37,7 +37,7 @@ public class AEtherFigment extends mage.sets.zendikar.AetherFigment {
 
     public AEtherFigment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AcidicSlime.java b/Mage.Sets/src/mage/sets/jacevsvraska/AcidicSlime.java
index a4c5324f13..6446f4158a 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Agoraphobia.java b/Mage.Sets/src/mage/sets/jacevsvraska/Agoraphobia.java
index cd90c23f77..48bb73fffe 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Agoraphobia.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Agoraphobia.java
@@ -37,7 +37,7 @@ public class Agoraphobia extends mage.sets.gatecrash.Agoraphobia {
 
     public Agoraphobia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Archaeomancer.java b/Mage.Sets/src/mage/sets/jacevsvraska/Archaeomancer.java
index c30cb58881..beba54d736 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Archaeomancer.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Archaeomancer.java
@@ -37,7 +37,7 @@ public class Archaeomancer extends mage.sets.magic2013.Archaeomancer {
 
     public Archaeomancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Chronomaton.java b/Mage.Sets/src/mage/sets/jacevsvraska/Chronomaton.java
index 33e1099909..e3756e6d75 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Chronomaton.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Chronomaton.java
@@ -37,7 +37,7 @@ public class Chronomaton extends mage.sets.magic2013.Chronomaton {
 
     public Chronomaton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Claustrophobia.java b/Mage.Sets/src/mage/sets/jacevsvraska/Claustrophobia.java
index b8d48aa889..02cc9b9e24 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Claustrophobia.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Claustrophobia.java
@@ -37,7 +37,7 @@ public class Claustrophobia extends mage.sets.innistrad.Claustrophobia {
 
     public Claustrophobia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/ConsumeStrength.java b/Mage.Sets/src/mage/sets/jacevsvraska/ConsumeStrength.java
index 2323cf2333..135994a661 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/ConsumeStrength.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/ConsumeStrength.java
@@ -37,7 +37,7 @@ public class ConsumeStrength extends mage.sets.apocalypse.ConsumeStrength {
 
     public ConsumeStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/ControlMagic.java b/Mage.Sets/src/mage/sets/jacevsvraska/ControlMagic.java
index 3659b9bfb4..10768ed6ca 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/ControlMagic.java
@@ -37,7 +37,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/CorpseTraders.java b/Mage.Sets/src/mage/sets/jacevsvraska/CorpseTraders.java
index aec2200dab..4ec77abb4f 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/CorpseTraders.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/CorpseTraders.java
@@ -37,7 +37,7 @@ public class CorpseTraders extends mage.sets.avacynrestored.CorpseTraders {
 
     public CorpseTraders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/CrosstownCourier.java b/Mage.Sets/src/mage/sets/jacevsvraska/CrosstownCourier.java
index f4771ef62d..cf86b53fd0 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/CrosstownCourier.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/CrosstownCourier.java
@@ -37,7 +37,7 @@ public class CrosstownCourier extends mage.sets.returntoravnica.CrosstownCourier
 
     public CrosstownCourier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/DeathHoodCobra.java b/Mage.Sets/src/mage/sets/jacevsvraska/DeathHoodCobra.java
index 618e5859ea..2fc5e55a27 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/DeathHoodCobra.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/DeathHoodCobra.java
@@ -37,7 +37,7 @@ public class DeathHoodCobra extends mage.sets.newphyrexia.DeathHoodCobra {
 
     public DeathHoodCobra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/DreadStatuary.java b/Mage.Sets/src/mage/sets/jacevsvraska/DreadStatuary.java
index 2a41b679ef..d83893e110 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/DreadStatuary.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/DreadStatuary.java
@@ -37,7 +37,7 @@ public class DreadStatuary extends mage.sets.worldwake.DreadStatuary {
 
     public DreadStatuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/ErrantEphemeron.java b/Mage.Sets/src/mage/sets/jacevsvraska/ErrantEphemeron.java
index 1f5a858586..8d527635d6 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/ErrantEphemeron.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/ErrantEphemeron.java
@@ -37,7 +37,7 @@ public class ErrantEphemeron extends mage.sets.timespiral.ErrantEphemeron {
 
     public ErrantEphemeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/FesterhideBoar.java b/Mage.Sets/src/mage/sets/jacevsvraska/FesterhideBoar.java
index 3ef9a9077e..64f0291e88 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/FesterhideBoar.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/FesterhideBoar.java
@@ -37,7 +37,7 @@ public class FesterhideBoar extends mage.sets.innistrad.FesterhideBoar {
 
     public FesterhideBoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/FutureSight.java b/Mage.Sets/src/mage/sets/jacevsvraska/FutureSight.java
index 1c799df682..7dc9fc0d67 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/FutureSight.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/FutureSight.java
@@ -37,7 +37,7 @@ public class FutureSight extends mage.sets.onslaught.FutureSight {
 
     public FutureSight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/GatecreeperVine.java b/Mage.Sets/src/mage/sets/jacevsvraska/GatecreeperVine.java
index d13cf00956..3508d0d57b 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/GatecreeperVine.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/GatecreeperVine.java
@@ -37,7 +37,7 @@ public class GatecreeperVine extends mage.sets.returntoravnica.GatecreeperVine {
 
     public GatecreeperVine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/GolgariGuildgate.java b/Mage.Sets/src/mage/sets/jacevsvraska/GolgariGuildgate.java
index bf37d0d1e3..96681c6f58 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/GolgariGuildgate.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/GolgariGuildgate.java
@@ -37,7 +37,7 @@ public class GolgariGuildgate extends mage.sets.returntoravnica.GolgariGuildgate
 
     public GolgariGuildgate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Griptide.java b/Mage.Sets/src/mage/sets/jacevsvraska/Griptide.java
index d2b19595a1..3afe2c5121 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Griptide.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Griptide.java
@@ -37,7 +37,7 @@ public class Griptide extends mage.sets.darkascension.Griptide {
 
     public Griptide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/GrislySpectacle.java b/Mage.Sets/src/mage/sets/jacevsvraska/GrislySpectacle.java
index 3a322f561a..73a2c25551 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/GrislySpectacle.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/GrislySpectacle.java
@@ -37,7 +37,7 @@ public class GrislySpectacle extends mage.sets.gatecrash.GrislySpectacle {
 
     public GrislySpectacle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/HalimarDepths.java b/Mage.Sets/src/mage/sets/jacevsvraska/HalimarDepths.java
index 2f9e9a0354..4f3a98f0df 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/HalimarDepths.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/HalimarDepths.java
@@ -37,7 +37,7 @@ public class HalimarDepths extends mage.sets.worldwake.HalimarDepths {
 
     public HalimarDepths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/HighwayRobber.java b/Mage.Sets/src/mage/sets/jacevsvraska/HighwayRobber.java
index fb9c546a5e..c9e4868d5a 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/HighwayRobber.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/HighwayRobber.java
@@ -37,7 +37,7 @@ public class HighwayRobber extends mage.sets.tenthedition.HighwayRobber {
 
     public HighwayRobber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/HypnoticCloud.java b/Mage.Sets/src/mage/sets/jacevsvraska/HypnoticCloud.java
index 4f057d393b..d2e0a1cd21 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/HypnoticCloud.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/HypnoticCloud.java
@@ -37,7 +37,7 @@ public class HypnoticCloud extends mage.sets.invasion.HypnoticCloud {
 
     public HypnoticCloud(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/IntoTheRoil.java b/Mage.Sets/src/mage/sets/jacevsvraska/IntoTheRoil.java
index dc2d760c58..8c5591c976 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/IntoTheRoil.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/IntoTheRoil.java
@@ -37,7 +37,7 @@ public class IntoTheRoil extends mage.sets.zendikar.IntoTheRoil {
 
     public IntoTheRoil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/jacevsvraska/JaceArchitectOfThought.java
index 874cee1cbf..58a879b67f 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/JaceArchitectOfThought.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/JaceArchitectOfThought.java
@@ -37,7 +37,7 @@ public class JaceArchitectOfThought extends mage.sets.returntoravnica.JaceArchit
 
     public JaceArchitectOfThought(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/JacesIngenuity.java b/Mage.Sets/src/mage/sets/jacevsvraska/JacesIngenuity.java
index 3128fdce97..3d9c2a38d6 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/JacesIngenuity.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/JacesIngenuity.java
@@ -37,7 +37,7 @@ public class JacesIngenuity extends mage.sets.magic2011.JacesIngenuity {
 
     public JacesIngenuity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/JacesMindseeker.java b/Mage.Sets/src/mage/sets/jacevsvraska/JacesMindseeker.java
index e1cbb2cb8e..ef96b11c9d 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/JacesMindseeker.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/JacesMindseeker.java
@@ -37,7 +37,7 @@ public class JacesMindseeker extends mage.sets.magic2014.JacesMindseeker {
 
     public JacesMindseeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/JacesPhantasm.java b/Mage.Sets/src/mage/sets/jacevsvraska/JacesPhantasm.java
index 63566dbcd7..018fd3c2a5 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/JacesPhantasm.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/JacesPhantasm.java
@@ -37,7 +37,7 @@ public class JacesPhantasm extends mage.sets.magic2013.JacesPhantasm {
 
     public JacesPhantasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/LastKiss.java b/Mage.Sets/src/mage/sets/jacevsvraska/LastKiss.java
index 7e5925c759..f799e5f164 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/LastKiss.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/LastKiss.java
@@ -37,7 +37,7 @@ public class LastKiss extends mage.sets.riseoftheeldrazi.LastKiss {
 
     public LastKiss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/LeylinePhantom.java b/Mage.Sets/src/mage/sets/jacevsvraska/LeylinePhantom.java
index 1fcbe94093..bde637e157 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/LeylinePhantom.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/LeylinePhantom.java
@@ -37,7 +37,7 @@ public class LeylinePhantom extends mage.sets.gatecrash.LeylinePhantom {
 
     public LeylinePhantom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/MarshCasualties.java b/Mage.Sets/src/mage/sets/jacevsvraska/MarshCasualties.java
index d4daca9ab1..ae77ffe813 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/MarshCasualties.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/MarshCasualties.java
@@ -37,7 +37,7 @@ public class MarshCasualties extends mage.sets.zendikar.MarshCasualties {
 
     public MarshCasualties(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/MemoryLapse.java b/Mage.Sets/src/mage/sets/jacevsvraska/MemoryLapse.java
index 61349623cc..906760cfe1 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/MemoryLapse.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/MemoryLapse.java
@@ -37,7 +37,7 @@ public class MemoryLapse extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/MerfolkWayfinder.java b/Mage.Sets/src/mage/sets/jacevsvraska/MerfolkWayfinder.java
index abfedacbb2..a40ae61b66 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/MerfolkWayfinder.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/MerfolkWayfinder.java
@@ -37,7 +37,7 @@ public class MerfolkWayfinder extends mage.sets.zendikar.MerfolkWayfinder {
 
     public MerfolkWayfinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/MoldShambler.java b/Mage.Sets/src/mage/sets/jacevsvraska/MoldShambler.java
index c13d30ceaa..ff1d3c7bab 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/MoldShambler.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/MoldShambler.java
@@ -37,7 +37,7 @@ public class MoldShambler extends mage.sets.zendikar.MoldShambler {
 
     public MoldShambler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Nekrataal.java b/Mage.Sets/src/mage/sets/jacevsvraska/Nekrataal.java
index 3957236564..d6f2b55378 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Nekrataal.java
@@ -37,7 +37,7 @@ public class Nekrataal extends mage.sets.ninthedition.Nekrataal {
 
     public Nekrataal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/NightsWhisper.java b/Mage.Sets/src/mage/sets/jacevsvraska/NightsWhisper.java
index 39ba91fbb2..bfe6d36e08 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/NightsWhisper.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/NightsWhisper.java
@@ -37,7 +37,7 @@ public class NightsWhisper extends mage.sets.fifthdawn.NightsWhisper {
 
     public NightsWhisper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/OranRiefRecluse.java b/Mage.Sets/src/mage/sets/jacevsvraska/OranRiefRecluse.java
index b9e48b14fd..14c69d152a 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/OranRiefRecluse.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/OranRiefRecluse.java
@@ -37,7 +37,7 @@ public class OranRiefRecluse extends mage.sets.zendikar.OranRiefRecluse {
 
     public OranRiefRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalBear.java b/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalBear.java
index 5b99ff5316..135ef7e130 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalBear.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalBear.java
@@ -37,7 +37,7 @@ public class PhantasmalBear extends mage.sets.magic2012.PhantasmalBear {
 
     public PhantasmalBear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalDragon.java b/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalDragon.java
index 7daffd9d83..933a72f4c5 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalDragon.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/PhantasmalDragon.java
@@ -37,7 +37,7 @@ public class PhantasmalDragon extends mage.sets.magic2012.PhantasmalDragon {
 
     public PhantasmalDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Prohibit.java b/Mage.Sets/src/mage/sets/jacevsvraska/Prohibit.java
index 7925367214..06d7357ca2 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Prohibit.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Prohibit.java
@@ -37,7 +37,7 @@ public class Prohibit extends mage.sets.invasion.Prohibit {
 
     public Prohibit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/PulseTracker.java b/Mage.Sets/src/mage/sets/jacevsvraska/PulseTracker.java
index 283cada349..c784e0ba3e 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/PulseTracker.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/PulseTracker.java
@@ -37,7 +37,7 @@ public class PulseTracker extends mage.sets.worldwake.PulseTracker {
 
     public PulseTracker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/PutridLeech.java b/Mage.Sets/src/mage/sets/jacevsvraska/PutridLeech.java
index 743e9dea16..56a650f6a1 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/PutridLeech.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/PutridLeech.java
@@ -37,7 +37,7 @@ public class PutridLeech extends mage.sets.alarareborn.PutridLeech {
 
     public PutridLeech(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/RayOfCommand.java b/Mage.Sets/src/mage/sets/jacevsvraska/RayOfCommand.java
index f6a13c7cf2..58bbfa8b93 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/RayOfCommand.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/RayOfCommand.java
@@ -37,7 +37,7 @@ public class RayOfCommand extends mage.sets.iceage.RayOfCommand {
 
     public RayOfCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/ReaperOfTheWilds.java b/Mage.Sets/src/mage/sets/jacevsvraska/ReaperOfTheWilds.java
index aab5adcccb..ed1f764d6e 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/ReaperOfTheWilds.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/ReaperOfTheWilds.java
@@ -37,7 +37,7 @@ public class ReaperOfTheWilds extends mage.sets.theros.ReaperOfTheWilds {
 
     public ReaperOfTheWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Remand.java b/Mage.Sets/src/mage/sets/jacevsvraska/Remand.java
index 2695e7e5cf..3524f8435c 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Remand.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Remand.java
@@ -37,7 +37,7 @@ public class Remand extends mage.sets.ravnica.Remand {
 
     public Remand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/jacevsvraska/RiftwingCloudskate.java
index c76695823a..dff7dc18fc 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/RiftwingCloudskate.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/RiftwingCloudskate.java
@@ -37,7 +37,7 @@ public class RiftwingCloudskate extends mage.sets.timespiral.RiftwingCloudskate
 
     public RiftwingCloudskate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/RiverBoa.java b/Mage.Sets/src/mage/sets/jacevsvraska/RiverBoa.java
index 8f4cce45c4..f18dd7c91e 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/RiverBoa.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/RiverBoa.java
@@ -37,7 +37,7 @@ public class RiverBoa extends mage.sets.zendikar.RiverBoa {
 
     public RiverBoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/RoguesPassage.java b/Mage.Sets/src/mage/sets/jacevsvraska/RoguesPassage.java
index b2591ad84e..1548df472e 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/RoguesPassage.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/RoguesPassage.java
@@ -37,7 +37,7 @@ public class RoguesPassage extends mage.sets.returntoravnica.RoguesPassage {
 
     public RoguesPassage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/SeaGateOracle.java b/Mage.Sets/src/mage/sets/jacevsvraska/SeaGateOracle.java
index 7e946d4db2..41eee415a7 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/SeaGateOracle.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/SeaGateOracle.java
@@ -37,7 +37,7 @@ public class SeaGateOracle extends mage.sets.riseoftheeldrazi.SeaGateOracle {
 
     public SeaGateOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/ShadowAlleyDenizen.java b/Mage.Sets/src/mage/sets/jacevsvraska/ShadowAlleyDenizen.java
index 3cdebdd735..db4bd56c50 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/ShadowAlleyDenizen.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/ShadowAlleyDenizen.java
@@ -37,7 +37,7 @@ public class ShadowAlleyDenizen extends mage.sets.gatecrash.ShadowAlleyDenizen {
 
     public ShadowAlleyDenizen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/SlateStreetRuffian.java b/Mage.Sets/src/mage/sets/jacevsvraska/SlateStreetRuffian.java
index 661c2c225d..b5a569a43a 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/SlateStreetRuffian.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/SlateStreetRuffian.java
@@ -37,7 +37,7 @@ public class SlateStreetRuffian extends mage.sets.gatecrash.SlateStreetRuffian {
 
     public SlateStreetRuffian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Spawnwrithe.java b/Mage.Sets/src/mage/sets/jacevsvraska/Spawnwrithe.java
index 5760145069..3b9ad76f17 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Spawnwrithe.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Spawnwrithe.java
@@ -37,7 +37,7 @@ public class Spawnwrithe extends mage.sets.commander.Spawnwrithe {
 
     public Spawnwrithe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/Spelltwine.java b/Mage.Sets/src/mage/sets/jacevsvraska/Spelltwine.java
index dffd3df8d9..d5fea5633a 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/Spelltwine.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/Spelltwine.java
@@ -37,7 +37,7 @@ public class Spelltwine extends mage.sets.magic2013.Spelltwine {
 
     public Spelltwine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/StabWound.java b/Mage.Sets/src/mage/sets/jacevsvraska/StabWound.java
index 45e2e0c0dd..8172364f3a 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/StabWound.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/StabWound.java
@@ -37,7 +37,7 @@ public class StabWound extends mage.sets.returntoravnica.StabWound {
 
     public StabWound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/StealerOfSecrets.java b/Mage.Sets/src/mage/sets/jacevsvraska/StealerOfSecrets.java
index 99a5cd563a..db9bd355c8 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/StealerOfSecrets.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/StealerOfSecrets.java
@@ -37,7 +37,7 @@ public class StealerOfSecrets extends mage.sets.returntoravnica.StealerOfSecrets
 
     public StealerOfSecrets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/StonefareCrocodile.java b/Mage.Sets/src/mage/sets/jacevsvraska/StonefareCrocodile.java
index c8f9fc4c5c..d009dacb39 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/StonefareCrocodile.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/StonefareCrocodile.java
@@ -37,7 +37,7 @@ public class StonefareCrocodile extends mage.sets.returntoravnica.StonefareCroco
 
     public StonefareCrocodile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/SummonersBane.java b/Mage.Sets/src/mage/sets/jacevsvraska/SummonersBane.java
index b0d2b86e4f..302a372015 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/SummonersBane.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/SummonersBane.java
@@ -37,7 +37,7 @@ public class SummonersBane extends mage.sets.zendikar.SummonersBane {
 
     public SummonersBane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/TaintedWood.java b/Mage.Sets/src/mage/sets/jacevsvraska/TaintedWood.java
index c7ac636645..85dc3baf10 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/TaintedWood.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/TaintedWood.java
@@ -37,7 +37,7 @@ public class TaintedWood extends mage.sets.torment.TaintedWood {
 
     public TaintedWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/TavernSwindler.java b/Mage.Sets/src/mage/sets/jacevsvraska/TavernSwindler.java
index 0770b77032..59a566aa19 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/TavernSwindler.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/TavernSwindler.java
@@ -37,7 +37,7 @@ public class TavernSwindler extends mage.sets.returntoravnica.TavernSwindler {
 
     public TavernSwindler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/ThoughtScour.java b/Mage.Sets/src/mage/sets/jacevsvraska/ThoughtScour.java
index daa9f2b419..06b2dfcb78 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/ThoughtScour.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/ThoughtScour.java
@@ -37,7 +37,7 @@ public class ThoughtScour extends mage.sets.darkascension.ThoughtScour {
 
     public ThoughtScour(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/TragicSlip.java b/Mage.Sets/src/mage/sets/jacevsvraska/TragicSlip.java
index 7b4b439515..80b780b27d 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/TragicSlip.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/TragicSlip.java
@@ -37,7 +37,7 @@ public class TragicSlip extends mage.sets.darkascension.TragicSlip {
 
     public TragicSlip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/TreasuredFind.java b/Mage.Sets/src/mage/sets/jacevsvraska/TreasuredFind.java
index d75e43b5e0..1ace51e5ea 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/TreasuredFind.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/TreasuredFind.java
@@ -37,7 +37,7 @@ public class TreasuredFind extends mage.sets.returntoravnica.TreasuredFind {
 
     public TreasuredFind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/UnderworldConnections.java b/Mage.Sets/src/mage/sets/jacevsvraska/UnderworldConnections.java
index 0f141f9649..b834ef5dd4 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/UnderworldConnections.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/UnderworldConnections.java
@@ -37,7 +37,7 @@ public class UnderworldConnections extends mage.sets.returntoravnica.UnderworldC
 
     public UnderworldConnections(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/VinelasherKudzu.java b/Mage.Sets/src/mage/sets/jacevsvraska/VinelasherKudzu.java
index f4b6c16608..afaed05a7f 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/VinelasherKudzu.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/VinelasherKudzu.java
@@ -37,7 +37,7 @@ public class VinelasherKudzu extends mage.sets.ravnica.VinelasherKudzu {
 
     public VinelasherKudzu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/VraskaTheUnseen.java b/Mage.Sets/src/mage/sets/jacevsvraska/VraskaTheUnseen.java
index 488d2ca536..f724c0ec5e 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/VraskaTheUnseen.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/VraskaTheUnseen.java
@@ -37,7 +37,7 @@ public class VraskaTheUnseen extends mage.sets.returntoravnica.VraskaTheUnseen {
 
     public VraskaTheUnseen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/WightOfPrecinctSix.java b/Mage.Sets/src/mage/sets/jacevsvraska/WightOfPrecinctSix.java
index ae828924bb..a1bbe90130 100644
--- a/Mage.Sets/src/mage/sets/jacevsvraska/WightOfPrecinctSix.java
+++ b/Mage.Sets/src/mage/sets/jacevsvraska/WightOfPrecinctSix.java
@@ -37,7 +37,7 @@ public class WightOfPrecinctSix extends mage.sets.gatecrash.WightOfPrecinctSix {
 
     public WightOfPrecinctSix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BladetuskBoar.java b/Mage.Sets/src/mage/sets/journeyintonyx/BladetuskBoar.java
index 5ff978e5b2..77014c27f1 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/BladetuskBoar.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/BladetuskBoar.java
@@ -37,7 +37,7 @@ public class BladetuskBoar extends mage.sets.zendikar.BladetuskBoar {
 
     public BladetuskBoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "JOU";
     }
 
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/MagmaSpray.java b/Mage.Sets/src/mage/sets/journeyintonyx/MagmaSpray.java
index 9f4fb32401..203ed8b93b 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/MagmaSpray.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/MagmaSpray.java
@@ -37,7 +37,7 @@ public class MagmaSpray extends mage.sets.shardsofalara.MagmaSpray {
 
     public MagmaSpray(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "JOU";
     }
 
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Reprisal.java b/Mage.Sets/src/mage/sets/journeyintonyx/Reprisal.java
index 4bb7bfd1f4..a74d0822ed 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/Reprisal.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/Reprisal.java
@@ -37,7 +37,7 @@ public class Reprisal extends mage.sets.seventhedition.Reprisal {
 
     public Reprisal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "JOU";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ArgothianEnchantress.java b/Mage.Sets/src/mage/sets/judgepromo/ArgothianEnchantress.java
index 62ac25c770..f4601fbb84 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ArgothianEnchantress.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ArgothianEnchantress.java
@@ -37,7 +37,7 @@ public class ArgothianEnchantress extends mage.sets.urzassaga.ArgothianEnchantre
 
     public ArgothianEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Armageddon.java b/Mage.Sets/src/mage/sets/judgepromo/Armageddon.java
index bcedb544c4..7d2b91edda 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/AzusaLostButSeeking.java b/Mage.Sets/src/mage/sets/judgepromo/AzusaLostButSeeking.java
index 0993ba02f1..677b410c4a 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/AzusaLostButSeeking.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/AzusaLostButSeeking.java
@@ -37,7 +37,7 @@ public class AzusaLostButSeeking extends mage.sets.championsofkamigawa.AzusaLost
 
     public AzusaLostButSeeking(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Balance.java b/Mage.Sets/src/mage/sets/judgepromo/Balance.java
index 166c08942e..fe3717d883 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Balance.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Balance.java
@@ -37,7 +37,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/BallLightning.java b/Mage.Sets/src/mage/sets/judgepromo/BallLightning.java
index b7afa4ad08..b0dbe4cebe 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/BallLightning.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/BallLightning.java
@@ -37,7 +37,7 @@ public class BallLightning extends mage.sets.magic2010.BallLightning {
 
     public BallLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Bitterblossom.java b/Mage.Sets/src/mage/sets/judgepromo/Bitterblossom.java
index 689091070f..f8c3010053 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Bitterblossom.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Bitterblossom.java
@@ -37,7 +37,7 @@ public class Bitterblossom extends mage.sets.morningtide.Bitterblossom {
 
     public Bitterblossom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/BloodstainedMire.java b/Mage.Sets/src/mage/sets/judgepromo/BloodstainedMire.java
index 0d42c9904d..979b38e212 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/BloodstainedMire.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/BloodstainedMire.java
@@ -37,7 +37,7 @@ public class BloodstainedMire extends mage.sets.onslaught.BloodstainedMire {
 
     public BloodstainedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Bribery.java b/Mage.Sets/src/mage/sets/judgepromo/Bribery.java
index a6f3ddd11c..8eb3108221 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Bribery.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Bribery.java
@@ -37,7 +37,7 @@ public class Bribery extends mage.sets.mercadianmasques.Bribery {
 
     public Bribery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/BurningWish.java b/Mage.Sets/src/mage/sets/judgepromo/BurningWish.java
index f4d1d19c58..09ef43ca9f 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/BurningWish.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/BurningWish.java
@@ -37,7 +37,7 @@ public class BurningWish extends mage.sets.judgment.BurningWish {
 
     public BurningWish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/CommandBeacon.java b/Mage.Sets/src/mage/sets/judgepromo/CommandBeacon.java
index d9fa0a21a2..6359351af6 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/CommandBeacon.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/CommandBeacon.java
@@ -37,7 +37,7 @@ public class CommandBeacon extends mage.sets.commander2015.CommandBeacon {
 
     public CommandBeacon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/CommandTower.java b/Mage.Sets/src/mage/sets/judgepromo/CommandTower.java
index 7ae2a758b4..a6e912e858 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/CommandTower.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/CommandTower.java
@@ -37,7 +37,7 @@ public class CommandTower extends mage.sets.commander2013.CommandTower {
 
     public CommandTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Counterspell.java b/Mage.Sets/src/mage/sets/judgepromo/Counterspell.java
index b0f793fe22..747d6cd27b 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/CrucibleOfWorlds.java b/Mage.Sets/src/mage/sets/judgepromo/CrucibleOfWorlds.java
index b1f274b292..7d550ee03f 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/CrucibleOfWorlds.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/CrucibleOfWorlds.java
@@ -37,7 +37,7 @@ public class CrucibleOfWorlds extends mage.sets.tenthedition.CrucibleOfWorlds {
 
     public CrucibleOfWorlds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/CunningWish.java b/Mage.Sets/src/mage/sets/judgepromo/CunningWish.java
index 5d815c02d4..74e136de85 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/CunningWish.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/CunningWish.java
@@ -37,7 +37,7 @@ public class CunningWish extends mage.sets.judgment.CunningWish {
 
     public CunningWish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Damnation.java b/Mage.Sets/src/mage/sets/judgepromo/Damnation.java
index 764dcae389..25ea5a2aff 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Damnation.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Damnation.java
@@ -37,7 +37,7 @@ public class Damnation extends mage.sets.planarchaos.Damnation {
 
     public Damnation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DarkConfidant.java b/Mage.Sets/src/mage/sets/judgepromo/DarkConfidant.java
index 63fd7ba2e9..54434098d9 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DarkConfidant.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DarkConfidant.java
@@ -37,7 +37,7 @@ public class DarkConfidant extends mage.sets.ravnica.DarkConfidant {
 
     public DarkConfidant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DarkRitual.java b/Mage.Sets/src/mage/sets/judgepromo/DarkRitual.java
index c7061e346d..84788879b2 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DecreeOfJustice.java b/Mage.Sets/src/mage/sets/judgepromo/DecreeOfJustice.java
index 353454bf80..7cb78d4177 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DecreeOfJustice.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DecreeOfJustice.java
@@ -37,7 +37,7 @@ public class DecreeOfJustice extends mage.sets.vintagemasters.DecreeOfJustice {
 
     public DecreeOfJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DefenseOfTheHeart.java b/Mage.Sets/src/mage/sets/judgepromo/DefenseOfTheHeart.java
index 9e72d89bf5..7c714cc176 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DefenseOfTheHeart.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DefenseOfTheHeart.java
@@ -37,7 +37,7 @@ public class DefenseOfTheHeart extends mage.sets.urzaslegacy.DefenseOfTheHeart {
 
     public DefenseOfTheHeart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DemonicTutor.java b/Mage.Sets/src/mage/sets/judgepromo/DemonicTutor.java
index ad9a3214f2..9087a2cc78 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DemonicTutor.java
@@ -37,7 +37,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DerangedHermit.java b/Mage.Sets/src/mage/sets/judgepromo/DerangedHermit.java
index b9ba7f9b34..3736bbb7ba 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DerangedHermit.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DerangedHermit.java
@@ -37,7 +37,7 @@ public class DerangedHermit extends mage.sets.urzaslegacy.DerangedHermit {
 
     public DerangedHermit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DoublingSeason.java b/Mage.Sets/src/mage/sets/judgepromo/DoublingSeason.java
index 1ec1d8a1f7..ab9d941225 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DoublingSeason.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DoublingSeason.java
@@ -37,7 +37,7 @@ public class DoublingSeason extends mage.sets.modernmasters.DoublingSeason {
 
     public DoublingSeason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java b/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java
index d1be95bb48..09d01e32a7 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java
@@ -37,7 +37,7 @@ public class DualcasterMage extends mage.sets.commander2014.DualcasterMage {
 
     public DualcasterMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/sets/judgepromo/EleshNornGrandCenobite.java
index 5e8ac82e6b..3cfa823dcf 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/EleshNornGrandCenobite.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/EleshNornGrandCenobite.java
@@ -37,7 +37,7 @@ public class EleshNornGrandCenobite extends mage.sets.newphyrexia.EleshNornGrand
 
     public EleshNornGrandCenobite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Entomb.java b/Mage.Sets/src/mage/sets/judgepromo/Entomb.java
index 5a2e5164b9..21ba2b80d4 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Entomb.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Entomb.java
@@ -37,7 +37,7 @@ public class Entomb extends mage.sets.odyssey.Entomb {
 
     public Entomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ExaltedAngel.java b/Mage.Sets/src/mage/sets/judgepromo/ExaltedAngel.java
index 643451575e..06dbb042e6 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ExaltedAngel.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ExaltedAngel.java
@@ -37,7 +37,7 @@ public class ExaltedAngel extends mage.sets.onslaught.ExaltedAngel {
 
     public ExaltedAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java
index 87d0da65db..ffaf137a77 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java
@@ -37,7 +37,7 @@ public class FeldonOfTheThirdPath extends mage.sets.commander2014.FeldonOfTheThi
 
     public FeldonOfTheThirdPath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/FloodedStrand.java b/Mage.Sets/src/mage/sets/judgepromo/FloodedStrand.java
index 45d5bac60f..5d1fcde931 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/FloodedStrand.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/FloodedStrand.java
@@ -37,7 +37,7 @@ public class FloodedStrand extends mage.sets.onslaught.FloodedStrand {
 
     public FloodedStrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Flusterstorm.java b/Mage.Sets/src/mage/sets/judgepromo/Flusterstorm.java
index 44b7b383f9..c42c130fad 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Flusterstorm.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Flusterstorm.java
@@ -37,7 +37,7 @@ public class Flusterstorm extends mage.sets.commander.Flusterstorm {
 
     public Flusterstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ForceOfWill.java b/Mage.Sets/src/mage/sets/judgepromo/ForceOfWill.java
index 21bb3034c0..ebb9d3c79c 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ForceOfWill.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ForceOfWill.java
@@ -37,7 +37,7 @@ public class ForceOfWill extends mage.sets.alliances.ForceOfWill {
 
     public ForceOfWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/GaeasCradle.java b/Mage.Sets/src/mage/sets/judgepromo/GaeasCradle.java
index 9b2b60f600..3899e9d800 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/GaeasCradle.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/GaeasCradle.java
@@ -37,7 +37,7 @@ public class GaeasCradle extends mage.sets.urzassaga.GaeasCradle {
 
     public GaeasCradle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/GemstoneMine.java b/Mage.Sets/src/mage/sets/judgepromo/GemstoneMine.java
index e46e8bb56d..bf60c50051 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/GemstoneMine.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/GemstoneMine.java
@@ -38,7 +38,7 @@ public class GemstoneMine extends mage.sets.timeshifted.GemstoneMine {
 
     public GemstoneMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "JR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Genesis.java b/Mage.Sets/src/mage/sets/judgepromo/Genesis.java
index 86620af98b..4fd2f9e271 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Genesis.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Genesis.java
@@ -37,7 +37,7 @@ public class Genesis extends mage.sets.judgment.Genesis {
 
     public Genesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/judgepromo/GoblinPiledriver.java
index 1c654dddbd..9d7908c177 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/GoblinPiledriver.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/GoblinPiledriver.java
@@ -37,7 +37,7 @@ public class GoblinPiledriver extends mage.sets.onslaught.GoblinPiledriver {
 
     public GoblinPiledriver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/GoblinWelder.java b/Mage.Sets/src/mage/sets/judgepromo/GoblinWelder.java
index bfd1aa1238..e6c7ecd7ca 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/GoblinWelder.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/GoblinWelder.java
@@ -37,7 +37,7 @@ public class GoblinWelder extends mage.sets.urzaslegacy.GoblinWelder {
 
     public GoblinWelder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/GreaterGood.java b/Mage.Sets/src/mage/sets/judgepromo/GreaterGood.java
index 4519f80810..64831a3b0d 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/GreaterGood.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/GreaterGood.java
@@ -37,7 +37,7 @@ public class GreaterGood extends mage.sets.ninthedition.GreaterGood {
 
     public GreaterGood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/GrimLavamancer.java b/Mage.Sets/src/mage/sets/judgepromo/GrimLavamancer.java
index f1ecff603a..2e393e5baa 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/GrimLavamancer.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/GrimLavamancer.java
@@ -37,7 +37,7 @@ public class GrimLavamancer extends mage.sets.magic2012.GrimLavamancer {
 
     public GrimLavamancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Grindstone.java b/Mage.Sets/src/mage/sets/judgepromo/Grindstone.java
index 3d55e32c98..83e5b37543 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Grindstone.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Grindstone.java
@@ -37,7 +37,7 @@ public class Grindstone extends mage.sets.tempest.Grindstone {
 
     public Grindstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/judgepromo/HammerOfBogardan.java
index 31b4136f43..f5ffe372b6 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/HammerOfBogardan.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/HammerOfBogardan.java
@@ -37,7 +37,7 @@ public class HammerOfBogardan extends mage.sets.mirage.HammerOfBogardan {
 
     public HammerOfBogardan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/HannaShipsNavigator.java b/Mage.Sets/src/mage/sets/judgepromo/HannaShipsNavigator.java
index dec7cfd793..a51c6ef620 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/HannaShipsNavigator.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/HannaShipsNavigator.java
@@ -37,7 +37,7 @@ public class HannaShipsNavigator extends mage.sets.invasion.HannaShipsNavigator
 
     public HannaShipsNavigator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/HermitDruid.java b/Mage.Sets/src/mage/sets/judgepromo/HermitDruid.java
index 902a2bd7bb..b3e24c52e4 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/HermitDruid.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/HermitDruid.java
@@ -37,7 +37,7 @@ public class HermitDruid extends mage.sets.stronghold.HermitDruid {
 
     public HermitDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ImperialRecruiter.java b/Mage.Sets/src/mage/sets/judgepromo/ImperialRecruiter.java
index 59edd4bea3..79720f72f1 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ImperialRecruiter.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ImperialRecruiter.java
@@ -37,7 +37,7 @@ public class ImperialRecruiter extends mage.sets.portalthreekingdoms.ImperialRec
 
     public ImperialRecruiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Intuition.java b/Mage.Sets/src/mage/sets/judgepromo/Intuition.java
index f2f89263de..66cdaf3263 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Intuition.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Intuition.java
@@ -37,7 +37,7 @@ public class Intuition extends mage.sets.tempest.Intuition {
 
     public Intuition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/KaradorGhostChieftain.java b/Mage.Sets/src/mage/sets/judgepromo/KaradorGhostChieftain.java
index 2a2c43be42..e749666c84 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/KaradorGhostChieftain.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/KaradorGhostChieftain.java
@@ -37,7 +37,7 @@ public class KaradorGhostChieftain extends mage.sets.commander.KaradorGhostChief
 
     public KaradorGhostChieftain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Karakas.java b/Mage.Sets/src/mage/sets/judgepromo/Karakas.java
index cd2c0809bd..71006b550e 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Karakas.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Karakas.java
@@ -37,7 +37,7 @@ public class Karakas extends mage.sets.legends.Karakas {
 
     public Karakas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/KarmicGuide.java b/Mage.Sets/src/mage/sets/judgepromo/KarmicGuide.java
index 62f4e9f840..4bbaac49a7 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/KarmicGuide.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/KarmicGuide.java
@@ -37,7 +37,7 @@ public class KarmicGuide extends mage.sets.urzaslegacy.KarmicGuide {
 
     public KarmicGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/LandTax.java b/Mage.Sets/src/mage/sets/judgepromo/LandTax.java
index 2de3983c41..14cee0a292 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/LandTax.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/LandTax.java
@@ -38,7 +38,7 @@ public class LandTax extends mage.sets.legends.LandTax {
 
     public LandTax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "JR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/judgepromo/LightningBolt.java b/Mage.Sets/src/mage/sets/judgepromo/LightningBolt.java
index e67116eee6..2d12b1a528 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/LivingDeath.java b/Mage.Sets/src/mage/sets/judgepromo/LivingDeath.java
index 0475b73a09..4cee342221 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/LivingDeath.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/LivingDeath.java
@@ -37,7 +37,7 @@ public class LivingDeath extends mage.sets.tempest.LivingDeath {
 
     public LivingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/LivingWish.java b/Mage.Sets/src/mage/sets/judgepromo/LivingWish.java
index cd0f7a164e..4190681644 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/LivingWish.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/LivingWish.java
@@ -37,7 +37,7 @@ public class LivingWish extends mage.sets.judgment.LivingWish {
 
     public LivingWish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ManaCrypt.java b/Mage.Sets/src/mage/sets/judgepromo/ManaCrypt.java
index b3f11a9e9c..07796dabbd 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ManaCrypt.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ManaCrypt.java
@@ -38,7 +38,7 @@ public class ManaCrypt extends mage.sets.vintagemasters.ManaCrypt {
 
     public ManaCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "JR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ManaDrain.java b/Mage.Sets/src/mage/sets/judgepromo/ManaDrain.java
index 4bbf923d3e..65010a2dbc 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ManaDrain.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ManaDrain.java
@@ -38,7 +38,7 @@ public class ManaDrain extends mage.sets.vintagemasters.ManaDrain {
 
     public ManaDrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "JR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/judgepromo/MazeOfIth.java b/Mage.Sets/src/mage/sets/judgepromo/MazeOfIth.java
index 29aa7bfba6..d5afa63ebd 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/MazeOfIth.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/MazeOfIth.java
@@ -37,7 +37,7 @@ public class MazeOfIth extends mage.sets.thedark.MazeOfIth {
 
     public MazeOfIth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/MeddlingMage.java b/Mage.Sets/src/mage/sets/judgepromo/MeddlingMage.java
index f7884a3d7d..29b8cf6d08 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/MeddlingMage.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/MeddlingMage.java
@@ -37,7 +37,7 @@ public class MeddlingMage extends mage.sets.alarareborn.MeddlingMage {
 
     public MeddlingMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/MemoryLapse.java b/Mage.Sets/src/mage/sets/judgepromo/MemoryLapse.java
index 64241fb148..83da2303c9 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/MemoryLapse.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/MemoryLapse.java
@@ -37,7 +37,7 @@ public class MemoryLapse extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/MindsDesire.java b/Mage.Sets/src/mage/sets/judgepromo/MindsDesire.java
index 0604bea91b..e23386de29 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/MindsDesire.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/MindsDesire.java
@@ -37,7 +37,7 @@ public class MindsDesire extends mage.sets.vintagemasters.MindsDesire {
 
     public MindsDesire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/MishrasFactory.java b/Mage.Sets/src/mage/sets/judgepromo/MishrasFactory.java
index b17ce71587..d143440c83 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/MishrasFactory.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/MishrasFactory.java
@@ -37,7 +37,7 @@ public class MishrasFactory extends mage.sets.elspethvstezzeret.MishrasFactory {
 
     public MishrasFactory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Morphling.java b/Mage.Sets/src/mage/sets/judgepromo/Morphling.java
index b13de9fb10..87df50cf35 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Morphling.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Morphling.java
@@ -37,7 +37,7 @@ public class Morphling extends mage.sets.urzassaga.Morphling {
 
     public Morphling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/NaturalOrder.java b/Mage.Sets/src/mage/sets/judgepromo/NaturalOrder.java
index 0397838bcf..a11cc5d268 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/NaturalOrder.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/NaturalOrder.java
@@ -37,7 +37,7 @@ public class NaturalOrder extends mage.sets.visions.NaturalOrder {
 
     public NaturalOrder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/NekusarTheMindrazer.java b/Mage.Sets/src/mage/sets/judgepromo/NekusarTheMindrazer.java
index 1e3cdf3efa..662261cec6 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/NekusarTheMindrazer.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/NekusarTheMindrazer.java
@@ -37,7 +37,7 @@ public class NekusarTheMindrazer extends mage.sets.commander2013.NekusarTheMindr
 
     public NekusarTheMindrazer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/NobleHierarch.java b/Mage.Sets/src/mage/sets/judgepromo/NobleHierarch.java
index 3052a6e39b..1ccf4478b1 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/NobleHierarch.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/NobleHierarch.java
@@ -37,7 +37,7 @@ public class NobleHierarch extends mage.sets.conflux.NobleHierarch {
 
     public NobleHierarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/OathOfDruids.java b/Mage.Sets/src/mage/sets/judgepromo/OathOfDruids.java
index f41cc4c1f3..717c762047 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/OathOfDruids.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/OathOfDruids.java
@@ -37,7 +37,7 @@ public class OathOfDruids extends mage.sets.exodus.OathOfDruids {
 
     public OathOfDruids(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/OloroAgelessAscetic.java b/Mage.Sets/src/mage/sets/judgepromo/OloroAgelessAscetic.java
index a088b0d94d..b9be78653c 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/OloroAgelessAscetic.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/OloroAgelessAscetic.java
@@ -37,7 +37,7 @@ public class OloroAgelessAscetic extends mage.sets.commander2013.OloroAgelessAsc
 
     public OloroAgelessAscetic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/OrimsChant.java b/Mage.Sets/src/mage/sets/judgepromo/OrimsChant.java
index c2b52dd8ea..5ba0729320 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/OrimsChant.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/OrimsChant.java
@@ -37,7 +37,7 @@ public class OrimsChant extends mage.sets.planeshift.OrimsChant {
 
     public OrimsChant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/OverwhelmingForces.java b/Mage.Sets/src/mage/sets/judgepromo/OverwhelmingForces.java
index 98568b39b1..1f9e9e9772 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/OverwhelmingForces.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/OverwhelmingForces.java
@@ -37,7 +37,7 @@ public class OverwhelmingForces extends mage.sets.portalthreekingdoms.Overwhelmi
 
     public OverwhelmingForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/PerniciousDeed.java b/Mage.Sets/src/mage/sets/judgepromo/PerniciousDeed.java
index 903d8c8e4e..b01c2604ae 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/PerniciousDeed.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/PerniciousDeed.java
@@ -37,7 +37,7 @@ public class PerniciousDeed extends mage.sets.apocalypse.PerniciousDeed {
 
     public PerniciousDeed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/PhyrexianDreadnought.java b/Mage.Sets/src/mage/sets/judgepromo/PhyrexianDreadnought.java
index a557ac7a07..2e5c2d7315 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/PhyrexianDreadnought.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/PhyrexianDreadnought.java
@@ -37,7 +37,7 @@ public class PhyrexianDreadnought extends mage.sets.mirage.PhyrexianDreadnought
 
     public PhyrexianDreadnought(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/PhyrexianNegator.java b/Mage.Sets/src/mage/sets/judgepromo/PhyrexianNegator.java
index 96e14b138f..6a7c174922 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/PhyrexianNegator.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/PhyrexianNegator.java
@@ -37,7 +37,7 @@ public class PhyrexianNegator extends mage.sets.urzasdestiny.PhyrexianNegator {
 
     public PhyrexianNegator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/PollutedDelta.java b/Mage.Sets/src/mage/sets/judgepromo/PollutedDelta.java
index f251482980..eb95ce4108 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/PollutedDelta.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/PollutedDelta.java
@@ -37,7 +37,7 @@ public class PollutedDelta extends mage.sets.onslaught.PollutedDelta {
 
     public PollutedDelta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java b/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java
index 9287aef52e..47f9f44d18 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java
@@ -37,7 +37,7 @@ public class RavagesOfWar extends mage.sets.portalthreekingdoms.RavagesOfWar {
 
     public RavagesOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/RavenousBaloth.java b/Mage.Sets/src/mage/sets/judgepromo/RavenousBaloth.java
index 8a187b7e24..df28d8eceb 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/RavenousBaloth.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/RavenousBaloth.java
@@ -37,7 +37,7 @@ public class RavenousBaloth extends mage.sets.onslaught.RavenousBaloth {
 
     public RavenousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Regrowth.java b/Mage.Sets/src/mage/sets/judgepromo/Regrowth.java
index 2afc2ff20c..a5e8a22946 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Regrowth.java
@@ -37,7 +37,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/RikuOfTwoReflections.java b/Mage.Sets/src/mage/sets/judgepromo/RikuOfTwoReflections.java
index 676f7aeaa2..93bbcddad6 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/RikuOfTwoReflections.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/RikuOfTwoReflections.java
@@ -37,7 +37,7 @@ public class RikuOfTwoReflections extends mage.sets.commander.RikuOfTwoReflectio
 
     public RikuOfTwoReflections(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/RishadanPort.java b/Mage.Sets/src/mage/sets/judgepromo/RishadanPort.java
index 124ef61d9b..880711592a 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/RishadanPort.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/RishadanPort.java
@@ -37,7 +37,7 @@ public class RishadanPort extends mage.sets.mercadianmasques.RishadanPort {
 
     public RishadanPort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ShardlessAgent.java b/Mage.Sets/src/mage/sets/judgepromo/ShardlessAgent.java
index 4a5ff4aef7..44b68736b5 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ShardlessAgent.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ShardlessAgent.java
@@ -37,7 +37,7 @@ public class ShardlessAgent extends mage.sets.planechase2012.ShardlessAgent {
 
     public ShardlessAgent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ShowAndTell.java b/Mage.Sets/src/mage/sets/judgepromo/ShowAndTell.java
index f1d4dfa4fa..cd0c9a27e5 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ShowAndTell.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ShowAndTell.java
@@ -37,7 +37,7 @@ public class ShowAndTell extends mage.sets.urzassaga.ShowAndTell {
 
     public ShowAndTell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Sinkhole.java b/Mage.Sets/src/mage/sets/judgepromo/Sinkhole.java
index 5710fbacc4..7d0a9d573d 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Sinkhole.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Sinkhole.java
@@ -37,7 +37,7 @@ public class Sinkhole extends mage.sets.limitedalpha.Sinkhole {
 
     public Sinkhole(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SneakAttack.java b/Mage.Sets/src/mage/sets/judgepromo/SneakAttack.java
index 852a7770b2..e52f15b528 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SneakAttack.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SneakAttack.java
@@ -37,7 +37,7 @@ public class SneakAttack extends mage.sets.urzassaga.SneakAttack {
 
     public SneakAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SolRing.java b/Mage.Sets/src/mage/sets/judgepromo/SolRing.java
index 52e7b2ea29..38979ebe01 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SolRing.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Stifle.java b/Mage.Sets/src/mage/sets/judgepromo/Stifle.java
index f2847cf43f..332cc654f2 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Stifle.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Stifle.java
@@ -37,7 +37,7 @@ public class Stifle extends mage.sets.scourge.Stifle {
 
     public Stifle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/judgepromo/StrokeOfGenius.java
index f2040faabc..500881af89 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/StrokeOfGenius.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/StrokeOfGenius.java
@@ -37,7 +37,7 @@ public class StrokeOfGenius extends mage.sets.urzassaga.StrokeOfGenius {
 
     public StrokeOfGenius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/sets/judgepromo/SurvivalOfTheFittest.java
index 2ab3f0bc8c..a01d7a6135 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SurvivalOfTheFittest.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SurvivalOfTheFittest.java
@@ -37,7 +37,7 @@ public class SurvivalOfTheFittest extends mage.sets.exodus.SurvivalOfTheFittest
 
     public SurvivalOfTheFittest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SwordOfFeastAndFamine.java b/Mage.Sets/src/mage/sets/judgepromo/SwordOfFeastAndFamine.java
index 4da88cb243..df28682e77 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SwordOfFeastAndFamine.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SwordOfFeastAndFamine.java
@@ -37,7 +37,7 @@ public class SwordOfFeastAndFamine extends mage.sets.mirrodinbesieged.SwordOfFea
 
     public SwordOfFeastAndFamine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/judgepromo/SwordOfFireAndIce.java
index 6a9ba8f461..059981afb5 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SwordOfFireAndIce.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SwordOfFireAndIce.java
@@ -37,7 +37,7 @@ public class SwordOfFireAndIce extends mage.sets.darksteel.SwordOfFireAndIce {
 
     public SwordOfFireAndIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SwordOfLightAndShadow.java b/Mage.Sets/src/mage/sets/judgepromo/SwordOfLightAndShadow.java
index 3da8c068a3..8cfa504cb6 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SwordOfLightAndShadow.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SwordOfLightAndShadow.java
@@ -37,7 +37,7 @@ public class SwordOfLightAndShadow extends mage.sets.darksteel.SwordOfLightAndSh
 
     public SwordOfLightAndShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/judgepromo/SwordsToPlowshares.java
index 665e0233ed..71e4d42fba 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/ThawingGlaciers.java b/Mage.Sets/src/mage/sets/judgepromo/ThawingGlaciers.java
index bbed8f8840..8303b979b1 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/ThawingGlaciers.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/ThawingGlaciers.java
@@ -37,7 +37,7 @@ public class ThawingGlaciers extends mage.sets.vintagemasters.ThawingGlaciers {
 
     public ThawingGlaciers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/TimeWarp.java b/Mage.Sets/src/mage/sets/judgepromo/TimeWarp.java
index 5f30fe83dc..d081367a26 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/TimeWarp.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/TimeWarp.java
@@ -37,7 +37,7 @@ public class TimeWarp extends mage.sets.magic2010.TimeWarp {
 
     public TimeWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/TradewindRider.java b/Mage.Sets/src/mage/sets/judgepromo/TradewindRider.java
index 849c3f8f48..89f2cead7d 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/TradewindRider.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/TradewindRider.java
@@ -37,7 +37,7 @@ public class TradewindRider extends mage.sets.tempest.TradewindRider {
 
     public TradewindRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/VampiricTutor.java b/Mage.Sets/src/mage/sets/judgepromo/VampiricTutor.java
index 3e19b9b33a..8b989b4596 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/VampiricTutor.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/VampiricTutor.java
@@ -37,7 +37,7 @@ public class VampiricTutor extends mage.sets.visions.VampiricTutor {
 
     public VampiricTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/VendilionClique.java b/Mage.Sets/src/mage/sets/judgepromo/VendilionClique.java
index 550a3d4076..c71216f71c 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/VendilionClique.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/VendilionClique.java
@@ -37,7 +37,7 @@ public class VendilionClique extends mage.sets.morningtide.VendilionClique {
 
     public VendilionClique(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Vindicate1.java b/Mage.Sets/src/mage/sets/judgepromo/Vindicate1.java
index 4a32103980..476f42bf70 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Vindicate1.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Vindicate1.java
@@ -37,7 +37,7 @@ public class Vindicate1 extends mage.sets.apocalypse.Vindicate {
 
     public Vindicate1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Vindicate2.java b/Mage.Sets/src/mage/sets/judgepromo/Vindicate2.java
index 009a03cd50..a009c4d76f 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Vindicate2.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Vindicate2.java
@@ -37,7 +37,7 @@ public class Vindicate2 extends mage.sets.apocalypse.Vindicate {
 
     public Vindicate2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java b/Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java
index 4b0cf0a571..5a8e56a830 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java
@@ -37,7 +37,7 @@ public class Wasteland1 extends mage.sets.tempest.Wasteland {
 
     public Wasteland1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java b/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java
index c9154fd22f..84b3153b58 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java
@@ -38,7 +38,7 @@ public class Wasteland2 extends mage.sets.tempest.Wasteland {
 
     public Wasteland2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "JR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/judgepromo/WheelOfFortune.java b/Mage.Sets/src/mage/sets/judgepromo/WheelOfFortune.java
index 639ffbd322..e128fdd5b9 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/WheelOfFortune.java
@@ -37,7 +37,7 @@ public class WheelOfFortune extends mage.sets.limitedalpha.WheelOfFortune {
 
     public WheelOfFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/WindsweptHeath.java b/Mage.Sets/src/mage/sets/judgepromo/WindsweptHeath.java
index 2d584e08c1..440c6c07ea 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/WindsweptHeath.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/WindsweptHeath.java
@@ -37,7 +37,7 @@ public class WindsweptHeath extends mage.sets.onslaught.WindsweptHeath {
 
     public WindsweptHeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/WoodedFoothills.java b/Mage.Sets/src/mage/sets/judgepromo/WoodedFoothills.java
index 357e0ac5aa..7c6805d63b 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/WoodedFoothills.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/WoodedFoothills.java
@@ -37,7 +37,7 @@ public class WoodedFoothills extends mage.sets.onslaught.WoodedFoothills {
 
     public WoodedFoothills(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/XiahouDunTheOneEyed.java b/Mage.Sets/src/mage/sets/judgepromo/XiahouDunTheOneEyed.java
index b26be669bf..4008badf43 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/XiahouDunTheOneEyed.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/XiahouDunTheOneEyed.java
@@ -37,7 +37,7 @@ public class XiahouDunTheOneEyed extends mage.sets.portalthreekingdoms.XiahouDun
 
     public XiahouDunTheOneEyed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgepromo/YawgmothsWill.java b/Mage.Sets/src/mage/sets/judgepromo/YawgmothsWill.java
index f7f9e5064c..c4a3f08c74 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/YawgmothsWill.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/YawgmothsWill.java
@@ -37,7 +37,7 @@ public class YawgmothsWill extends mage.sets.urzassaga.YawgmothsWill {
 
     public YawgmothsWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "JR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/AncestorsChosen.java b/Mage.Sets/src/mage/sets/judgment/AncestorsChosen.java
index 8c66c76d4c..0ae5f28640 100644
--- a/Mage.Sets/src/mage/sets/judgment/AncestorsChosen.java
+++ b/Mage.Sets/src/mage/sets/judgment/AncestorsChosen.java
@@ -37,7 +37,7 @@ public class AncestorsChosen extends mage.sets.tenthedition.AncestorsChosen {
 
     public AncestorsChosen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java b/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java
index 7e93670622..d8ca7ae37a 100644
--- a/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java
+++ b/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java
@@ -38,7 +38,7 @@ public class ArcaneTeachings extends mage.sets.tenthedition.ArcaneTeachings {
 
     public ArcaneTeachings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "JUD";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/judgment/BenevolentBodyguard.java b/Mage.Sets/src/mage/sets/judgment/BenevolentBodyguard.java
index 2a7a29f2e4..0114d0091c 100644
--- a/Mage.Sets/src/mage/sets/judgment/BenevolentBodyguard.java
+++ b/Mage.Sets/src/mage/sets/judgment/BenevolentBodyguard.java
@@ -37,7 +37,7 @@ public class BenevolentBodyguard extends mage.sets.vintagemasters.BenevolentBody
 
     public BenevolentBodyguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/Chastise.java b/Mage.Sets/src/mage/sets/judgment/Chastise.java
index 1d878f5cc1..e600460c74 100644
--- a/Mage.Sets/src/mage/sets/judgment/Chastise.java
+++ b/Mage.Sets/src/mage/sets/judgment/Chastise.java
@@ -37,7 +37,7 @@ public class Chastise extends mage.sets.ninthedition.Chastise {
 
     public Chastise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/Glory.java b/Mage.Sets/src/mage/sets/judgment/Glory.java
index c04ecb6cd3..c54ade2c41 100644
--- a/Mage.Sets/src/mage/sets/judgment/Glory.java
+++ b/Mage.Sets/src/mage/sets/judgment/Glory.java
@@ -38,7 +38,7 @@ public class Glory extends mage.sets.prereleaseevents.Glory {
 
     public Glory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "JUD";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/judgment/GuidedStrike.java b/Mage.Sets/src/mage/sets/judgment/GuidedStrike.java
index 7545602758..40575c9ec8 100644
--- a/Mage.Sets/src/mage/sets/judgment/GuidedStrike.java
+++ b/Mage.Sets/src/mage/sets/judgment/GuidedStrike.java
@@ -38,7 +38,7 @@ public class GuidedStrike extends mage.sets.weatherlight.GuidedStrike {
 
     public GuidedStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java b/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java
index 11868ad18c..65620ab833 100644
--- a/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java
+++ b/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java
@@ -37,7 +37,7 @@ public class KrosanVerge extends mage.sets.planechase2012.KrosanVerge {
 
     public KrosanVerge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/NantukoMonastery.java b/Mage.Sets/src/mage/sets/judgment/NantukoMonastery.java
index fd2d3d3507..27a05d22e8 100644
--- a/Mage.Sets/src/mage/sets/judgment/NantukoMonastery.java
+++ b/Mage.Sets/src/mage/sets/judgment/NantukoMonastery.java
@@ -37,7 +37,7 @@ public class NantukoMonastery extends mage.sets.archenemy.NantukoMonastery {
 
     public NantukoMonastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/NullmageAdvocate.java b/Mage.Sets/src/mage/sets/judgment/NullmageAdvocate.java
index 85edf84683..068cb4b0f9 100644
--- a/Mage.Sets/src/mage/sets/judgment/NullmageAdvocate.java
+++ b/Mage.Sets/src/mage/sets/judgment/NullmageAdvocate.java
@@ -37,7 +37,7 @@ public class NullmageAdvocate extends mage.sets.planechase2012.NullmageAdvocate
 
     public NullmageAdvocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/PhantomNantuko.java b/Mage.Sets/src/mage/sets/judgment/PhantomNantuko.java
index 7c300806cf..399dcc8c93 100644
--- a/Mage.Sets/src/mage/sets/judgment/PhantomNantuko.java
+++ b/Mage.Sets/src/mage/sets/judgment/PhantomNantuko.java
@@ -37,7 +37,7 @@ public class PhantomNantuko extends mage.sets.commander2013.PhantomNantuko {
 
     public PhantomNantuko(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/RayOfRevelation.java b/Mage.Sets/src/mage/sets/judgment/RayOfRevelation.java
index 505b1bfaf3..b3193f4602 100644
--- a/Mage.Sets/src/mage/sets/judgment/RayOfRevelation.java
+++ b/Mage.Sets/src/mage/sets/judgment/RayOfRevelation.java
@@ -37,7 +37,7 @@ public class RayOfRevelation extends mage.sets.darkascension.RayOfRevelation {
 
     public RayOfRevelation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/Scalpelexis.java b/Mage.Sets/src/mage/sets/judgment/Scalpelexis.java
index 0dfc969b11..54f6547f0a 100644
--- a/Mage.Sets/src/mage/sets/judgment/Scalpelexis.java
+++ b/Mage.Sets/src/mage/sets/judgment/Scalpelexis.java
@@ -37,7 +37,7 @@ public class Scalpelexis extends mage.sets.tenthedition.Scalpelexis {
 
     public Scalpelexis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/SpiritCairn.java b/Mage.Sets/src/mage/sets/judgment/SpiritCairn.java
index ee8d23b73c..b2d440e254 100644
--- a/Mage.Sets/src/mage/sets/judgment/SpiritCairn.java
+++ b/Mage.Sets/src/mage/sets/judgment/SpiritCairn.java
@@ -38,7 +38,7 @@ public class SpiritCairn extends mage.sets.vintagemasters.SpiritCairn {
 
     public SpiritCairn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "JUD";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/judgment/SpurnmageAdvocate.java b/Mage.Sets/src/mage/sets/judgment/SpurnmageAdvocate.java
index ebd6fdf512..cac0fc251f 100644
--- a/Mage.Sets/src/mage/sets/judgment/SpurnmageAdvocate.java
+++ b/Mage.Sets/src/mage/sets/judgment/SpurnmageAdvocate.java
@@ -37,7 +37,7 @@ public class SpurnmageAdvocate extends mage.sets.commander.SpurnmageAdvocate {
 
     public SpurnmageAdvocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/StitchTogether.java b/Mage.Sets/src/mage/sets/judgment/StitchTogether.java
index a1a294f561..a0efb7a094 100644
--- a/Mage.Sets/src/mage/sets/judgment/StitchTogether.java
+++ b/Mage.Sets/src/mage/sets/judgment/StitchTogether.java
@@ -37,7 +37,7 @@ public class StitchTogether extends mage.sets.commander.StitchTogether {
 
     public StitchTogether(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/SuntailHawk.java b/Mage.Sets/src/mage/sets/judgment/SuntailHawk.java
index 2b74f513d9..673b711ba8 100644
--- a/Mage.Sets/src/mage/sets/judgment/SuntailHawk.java
+++ b/Mage.Sets/src/mage/sets/judgment/SuntailHawk.java
@@ -37,7 +37,7 @@ public class SuntailHawk extends mage.sets.tenthedition.SuntailHawk {
 
     public SuntailHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/judgment/SuturedGhoul.java b/Mage.Sets/src/mage/sets/judgment/SuturedGhoul.java
index c4cb3bd202..f46858a63f 100644
--- a/Mage.Sets/src/mage/sets/judgment/SuturedGhoul.java
+++ b/Mage.Sets/src/mage/sets/judgment/SuturedGhoul.java
@@ -37,7 +37,7 @@ public class SuturedGhoul extends mage.sets.magic2012.SuturedGhoul {
 
     public SuturedGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "JUD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ActOfTreason.java b/Mage.Sets/src/mage/sets/khansoftarkir/ActOfTreason.java
index 97d5952910..2922d503d3 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/ActOfTreason.java
@@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "KTK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ArcLightning.java b/Mage.Sets/src/mage/sets/khansoftarkir/ArcLightning.java
index c877ae1d01..724127af06 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/ArcLightning.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/ArcLightning.java
@@ -38,7 +38,7 @@ public class ArcLightning extends mage.sets.urzassaga.ArcLightning {
 
     public ArcLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "KTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BloodstainedMire.java b/Mage.Sets/src/mage/sets/khansoftarkir/BloodstainedMire.java
index f2433bdd71..b6b01442f0 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/BloodstainedMire.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/BloodstainedMire.java
@@ -37,7 +37,7 @@ public class BloodstainedMire extends mage.sets.onslaught.BloodstainedMire {
 
     public BloodstainedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Cancel.java b/Mage.Sets/src/mage/sets/khansoftarkir/Cancel.java
index 794a66f460..811a725e03 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/Cancel.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/CripplingChill.java b/Mage.Sets/src/mage/sets/khansoftarkir/CripplingChill.java
index 220d4004aa..1f3c7de65e 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/CripplingChill.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/CripplingChill.java
@@ -37,7 +37,7 @@ public class CripplingChill extends mage.sets.avacynrestored.CripplingChill {
 
     public CripplingChill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Despise.java b/Mage.Sets/src/mage/sets/khansoftarkir/Despise.java
index 6aac603fdc..f8dbf106b2 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/Despise.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/Despise.java
@@ -37,7 +37,7 @@ public class Despise extends mage.sets.newphyrexia.Despise {
 
     public Despise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Erase.java b/Mage.Sets/src/mage/sets/khansoftarkir/Erase.java
index c9c713353a..2c4639268f 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/Erase.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/Erase.java
@@ -37,7 +37,7 @@ public class Erase extends mage.sets.urzaslegacy.Erase {
 
     public Erase(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/FloodedStrand.java b/Mage.Sets/src/mage/sets/khansoftarkir/FloodedStrand.java
index 1e8f19b752..e7652a8bac 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/FloodedStrand.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/FloodedStrand.java
@@ -37,7 +37,7 @@ public class FloodedStrand extends mage.sets.onslaught.FloodedStrand {
 
     public FloodedStrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/IncrementalGrowth.java b/Mage.Sets/src/mage/sets/khansoftarkir/IncrementalGrowth.java
index a46425b36f..d21e0e861c 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/IncrementalGrowth.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/IncrementalGrowth.java
@@ -37,7 +37,7 @@ public class IncrementalGrowth extends mage.sets.modernmasters.IncrementalGrowth
 
     public IncrementalGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Naturalize.java b/Mage.Sets/src/mage/sets/khansoftarkir/Naturalize.java
index fb7d41c34a..0f6c04dc66 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/PollutedDelta.java b/Mage.Sets/src/mage/sets/khansoftarkir/PollutedDelta.java
index de23fb865d..34d99d362e 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/PollutedDelta.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/PollutedDelta.java
@@ -37,7 +37,7 @@ public class PollutedDelta extends mage.sets.onslaught.PollutedDelta {
 
     public PollutedDelta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SeekTheHorizon.java b/Mage.Sets/src/mage/sets/khansoftarkir/SeekTheHorizon.java
index 06b90f61ef..f399cd9582 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/SeekTheHorizon.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/SeekTheHorizon.java
@@ -37,7 +37,7 @@ public class SeekTheHorizon extends mage.sets.saviorsofkamigawa.SeekTheHorizon {
 
     public SeekTheHorizon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Shatter.java b/Mage.Sets/src/mage/sets/khansoftarkir/Shatter.java
index dce30dc147..6611474578 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/Shatter.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/khansoftarkir/SmiteTheMonstrous.java
index 1a3908d345..336cb941a5 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/SmiteTheMonstrous.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/SmiteTheMonstrous.java
@@ -37,7 +37,7 @@ public class SmiteTheMonstrous extends mage.sets.innistrad.SmiteTheMonstrous {
 
     public SmiteTheMonstrous(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/TrumpetBlast.java b/Mage.Sets/src/mage/sets/khansoftarkir/TrumpetBlast.java
index 9d8c2130f0..eeaa032220 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/TrumpetBlast.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/TrumpetBlast.java
@@ -37,7 +37,7 @@ public class TrumpetBlast extends mage.sets.magic2010.TrumpetBlast {
 
     public TrumpetBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Windstorm.java b/Mage.Sets/src/mage/sets/khansoftarkir/Windstorm.java
index 3e2c1736b6..119b0b0a69 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/Windstorm.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/Windstorm.java
@@ -37,7 +37,7 @@ public class Windstorm extends mage.sets.magic2010.Windstorm {
 
     public Windstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WindsweptHeath.java b/Mage.Sets/src/mage/sets/khansoftarkir/WindsweptHeath.java
index bec64cb9a0..84a20c0e90 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/WindsweptHeath.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/WindsweptHeath.java
@@ -37,7 +37,7 @@ public class WindsweptHeath extends mage.sets.onslaught.WindsweptHeath {
 
     public WindsweptHeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/WoodedFoothills.java b/Mage.Sets/src/mage/sets/khansoftarkir/WoodedFoothills.java
index df9876f286..882f479593 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/WoodedFoothills.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/WoodedFoothills.java
@@ -37,7 +37,7 @@ public class WoodedFoothills extends mage.sets.onslaught.WoodedFoothills {
 
     public WoodedFoothills(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "KTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/AlabornCavalier.java b/Mage.Sets/src/mage/sets/knightsvsdragons/AlabornCavalier.java
index ac34ffcf46..9190ba5bb8 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/AlabornCavalier.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/AlabornCavalier.java
@@ -37,7 +37,7 @@ public class AlabornCavalier extends mage.sets.portalsecondage.AlabornCavalier {
 
     public AlabornCavalier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ArmillarySphere.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ArmillarySphere.java
index 973c78d729..437789fbc8 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/ArmillarySphere.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ArmillarySphere.java
@@ -37,7 +37,7 @@ public class ArmillarySphere extends mage.sets.conflux.ArmillarySphere {
 
     public ArmillarySphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/BenalishLancer.java b/Mage.Sets/src/mage/sets/knightsvsdragons/BenalishLancer.java
index d9b88abbb4..f4354d55a2 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/BenalishLancer.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/BenalishLancer.java
@@ -37,7 +37,7 @@ public class BenalishLancer extends mage.sets.invasion.BenalishLancer {
 
     public BenalishLancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/BloodmarkMentor.java b/Mage.Sets/src/mage/sets/knightsvsdragons/BloodmarkMentor.java
index b744a8670f..bb2948bf8d 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/BloodmarkMentor.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/BloodmarkMentor.java
@@ -37,7 +37,7 @@ public class BloodmarkMentor extends mage.sets.shadowmoor.BloodmarkMentor {
 
     public BloodmarkMentor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanHellkite.java b/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanHellkite.java
index f2d281c140..2c6f93e0df 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanHellkite.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanHellkite.java
@@ -37,7 +37,7 @@ public class BogardanHellkite extends mage.sets.magic2010.BogardanHellkite {
 
     public BogardanHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanRager.java b/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanRager.java
index 4239a8b4d6..ecad3747bb 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanRager.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/BogardanRager.java
@@ -37,7 +37,7 @@ public class BogardanRager extends mage.sets.planechase.BogardanRager {
 
     public BogardanRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/BreathOfDarigaaz.java b/Mage.Sets/src/mage/sets/knightsvsdragons/BreathOfDarigaaz.java
index 234763f560..b431104b2a 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/BreathOfDarigaaz.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/BreathOfDarigaaz.java
@@ -37,7 +37,7 @@ public class BreathOfDarigaaz extends mage.sets.commander.BreathOfDarigaaz {
 
     public BreathOfDarigaaz(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/CaptiveFlame.java b/Mage.Sets/src/mage/sets/knightsvsdragons/CaptiveFlame.java
index a31e0001d0..8272ffbcfe 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/CaptiveFlame.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/CaptiveFlame.java
@@ -37,7 +37,7 @@ public class CaptiveFlame extends mage.sets.saviorsofkamigawa.CaptiveFlame {
 
     public CaptiveFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/CaravanEscort.java b/Mage.Sets/src/mage/sets/knightsvsdragons/CaravanEscort.java
index e543acd2ff..8cd81ce930 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/CaravanEscort.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/CaravanEscort.java
@@ -37,7 +37,7 @@ public class CaravanEscort extends mage.sets.riseoftheeldrazi.CaravanEscort {
 
     public CaravanEscort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ClawsOfValakut.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ClawsOfValakut.java
index 7f5b92b063..553705e5a4 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/ClawsOfValakut.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ClawsOfValakut.java
@@ -37,7 +37,7 @@ public class ClawsOfValakut extends mage.sets.worldwake.ClawsOfValakut {
 
     public ClawsOfValakut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonFodder.java b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonFodder.java
index 4029a70056..5a3df2492b 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonFodder.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonFodder.java
@@ -37,7 +37,7 @@ public class DragonFodder extends mage.sets.shardsofalara.DragonFodder {
 
     public DragonFodder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonWhelp.java b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonWhelp.java
index c6be400a14..b752a4763d 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonsClaw.java b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonsClaw.java
index 2df70d1797..5b4384200b 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonsClaw.java
@@ -37,7 +37,7 @@ public class DragonsClaw extends mage.sets.tenthedition.DragonsClaw {
 
     public DragonsClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonspeakerShaman.java b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonspeakerShaman.java
index e9eff50585..210fa099f5 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/DragonspeakerShaman.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/DragonspeakerShaman.java
@@ -37,7 +37,7 @@ public class DragonspeakerShaman extends mage.sets.scourge.DragonspeakerShaman {
 
     public DragonspeakerShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/FieryFall.java b/Mage.Sets/src/mage/sets/knightsvsdragons/FieryFall.java
index 690db3e9c3..c83fce533c 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/FieryFall.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/FieryFall.java
@@ -37,7 +37,7 @@ public class FieryFall extends mage.sets.conflux.FieryFall {
 
     public FieryFall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/GriffinGuide.java b/Mage.Sets/src/mage/sets/knightsvsdragons/GriffinGuide.java
index f4d652e2f9..7b94ed91c8 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/GriffinGuide.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/GriffinGuide.java
@@ -37,7 +37,7 @@ public class GriffinGuide extends mage.sets.timespiral.GriffinGuide {
 
     public GriffinGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/HarmsWay.java b/Mage.Sets/src/mage/sets/knightsvsdragons/HarmsWay.java
index da7bae8224..08db4f311e 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/HarmsWay.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/HarmsWay.java
@@ -37,7 +37,7 @@ public class HarmsWay extends mage.sets.magic2010.HarmsWay {
 
     public HarmsWay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/HengeGuardian.java b/Mage.Sets/src/mage/sets/knightsvsdragons/HengeGuardian.java
index 79ebfdf18d..267455d59e 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/HengeGuardian.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/HengeGuardian.java
@@ -37,7 +37,7 @@ public class HengeGuardian extends mage.sets.mercadianmasques.HengeGuardian {
 
     public HengeGuardian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/HeroesReunion.java b/Mage.Sets/src/mage/sets/knightsvsdragons/HeroesReunion.java
index 5549944ae4..6242e7c484 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/HeroesReunion.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/HeroesReunion.java
@@ -37,7 +37,7 @@ public class HeroesReunion extends mage.sets.invasion.HeroesReunion {
 
     public HeroesReunion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/JawsOfStone.java b/Mage.Sets/src/mage/sets/knightsvsdragons/JawsOfStone.java
index 9351860189..44245c1c85 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/JawsOfStone.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/JawsOfStone.java
@@ -37,7 +37,7 @@ public class JawsOfStone extends mage.sets.shadowmoor.JawsOfStone {
 
     public JawsOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/JuniperOrderRanger.java b/Mage.Sets/src/mage/sets/knightsvsdragons/JuniperOrderRanger.java
index f7888d9665..c5dbad3d65 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/JuniperOrderRanger.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/JuniperOrderRanger.java
@@ -37,7 +37,7 @@ public class JuniperOrderRanger extends mage.sets.coldsnap.JuniperOrderRanger {
 
     public JuniperOrderRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KabiraVindicator.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KabiraVindicator.java
index 3194197231..7daa077e1e 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KabiraVindicator.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KabiraVindicator.java
@@ -37,7 +37,7 @@ public class KabiraVindicator extends mage.sets.riseoftheeldrazi.KabiraVindicato
 
     public KabiraVindicator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KinsbaileCavalier.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KinsbaileCavalier.java
index 4300324a45..4a1928ccba 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KinsbaileCavalier.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KinsbaileCavalier.java
@@ -37,7 +37,7 @@ public class KinsbaileCavalier extends mage.sets.morningtide.KinsbaileCavalier {
 
     public KinsbaileCavalier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightExemplar.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightExemplar.java
index 254559501f..92c8eea28b 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightExemplar.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightExemplar.java
@@ -37,7 +37,7 @@ public class KnightExemplar extends mage.sets.magic2011.KnightExemplar {
 
     public KnightExemplar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfCliffhaven.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfCliffhaven.java
index f2de8ced93..fc51ab17cb 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfCliffhaven.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfCliffhaven.java
@@ -37,7 +37,7 @@ public class KnightOfCliffhaven extends mage.sets.riseoftheeldrazi.KnightOfCliff
 
     public KnightOfCliffhaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfMeadowgrain.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfMeadowgrain.java
index f176b90fb2..1f65e26c15 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfMeadowgrain.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfMeadowgrain.java
@@ -37,7 +37,7 @@ public class KnightOfMeadowgrain extends mage.sets.lorwyn.KnightOfMeadowgrain {
 
     public KnightOfMeadowgrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheReliquary.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheReliquary.java
index 48319e3d93..269b162c44 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheReliquary.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheReliquary.java
@@ -38,7 +38,7 @@ public class KnightOfTheReliquary extends mage.sets.conflux.KnightOfTheReliquary
 
     public KnightOfTheReliquary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDG";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheWhiteOrchid.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheWhiteOrchid.java
index 399134b41b..4a8bc7609b 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheWhiteOrchid.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KnightOfTheWhiteOrchid.java
@@ -37,7 +37,7 @@ public class KnightOfTheWhiteOrchid extends mage.sets.shardsofalara.KnightOfTheW
 
     public KnightOfTheWhiteOrchid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/KnotvinePaladin.java b/Mage.Sets/src/mage/sets/knightsvsdragons/KnotvinePaladin.java
index 44a2c8c560..616a2ab98a 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/KnotvinePaladin.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/KnotvinePaladin.java
@@ -37,7 +37,7 @@ public class KnotvinePaladin extends mage.sets.alarareborn.KnotvinePaladin {
 
     public KnotvinePaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/knightsvsdragons/LeoninSkyhunter.java
index 80d1e8adca..83c75dc957 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/LeoninSkyhunter.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/LeoninSkyhunter.java
@@ -37,7 +37,7 @@ public class LeoninSkyhunter extends mage.sets.mirrodin.LeoninSkyhunter {
 
     public LeoninSkyhunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/LionheartMaverick.java b/Mage.Sets/src/mage/sets/knightsvsdragons/LionheartMaverick.java
index 099770d2f7..785979f525 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/LionheartMaverick.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/LionheartMaverick.java
@@ -37,7 +37,7 @@ public class LionheartMaverick extends mage.sets.guildpact.LionheartMaverick {
 
     public LionheartMaverick(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/knightsvsdragons/LoxodonWarhammer.java
index cdb09932e4..0e786d5bcc 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/LoxodonWarhammer.java
@@ -37,7 +37,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
 
     public LoxodonWarhammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/MightyLeap.java b/Mage.Sets/src/mage/sets/knightsvsdragons/MightyLeap.java
index c3ac483dc5..0bb0e943ba 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/MightyLeap.java
@@ -37,7 +37,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/MordantDragon.java b/Mage.Sets/src/mage/sets/knightsvsdragons/MordantDragon.java
index 59dbf346b6..dc16885b36 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/MordantDragon.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/MordantDragon.java
@@ -37,7 +37,7 @@ public class MordantDragon extends mage.sets.worldwake.MordantDragon {
 
     public MordantDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/knightsvsdragons/MudbuttonTorchrunner.java
index 33e401646b..3715e6df0a 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/MudbuttonTorchrunner.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/MudbuttonTorchrunner.java
@@ -37,7 +37,7 @@ public class MudbuttonTorchrunner extends mage.sets.lorwyn.MudbuttonTorchrunner
 
     public MudbuttonTorchrunner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/OblivionRing.java b/Mage.Sets/src/mage/sets/knightsvsdragons/OblivionRing.java
index 316605a427..d6dcfda59a 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/OblivionRing.java
@@ -37,7 +37,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/PloverKnights.java b/Mage.Sets/src/mage/sets/knightsvsdragons/PloverKnights.java
index 58408329ec..f0b859d317 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/PloverKnights.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/PloverKnights.java
@@ -37,7 +37,7 @@ public class PloverKnights extends mage.sets.lorwyn.PloverKnights {
 
     public PloverKnights(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/PunishingFire.java b/Mage.Sets/src/mage/sets/knightsvsdragons/PunishingFire.java
index 820f28f20f..6bb3120552 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/PunishingFire.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/PunishingFire.java
@@ -37,7 +37,7 @@ public class PunishingFire extends mage.sets.zendikar.PunishingFire {
 
     public PunishingFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/Reciprocate.java b/Mage.Sets/src/mage/sets/knightsvsdragons/Reciprocate.java
index 54d6c38df6..3b75b15a88 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/Reciprocate.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/Reciprocate.java
@@ -37,7 +37,7 @@ public class Reciprocate extends mage.sets.championsofkamigawa.Reciprocate {
 
     public Reciprocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/Reprisal.java b/Mage.Sets/src/mage/sets/knightsvsdragons/Reprisal.java
index d02fab46f6..78fa23f436 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/Reprisal.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/Reprisal.java
@@ -37,7 +37,7 @@ public class Reprisal extends mage.sets.seventhedition.Reprisal {
 
     public Reprisal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SeethingSong.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SeethingSong.java
index 155aa272dd..78582c2a91 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SeethingSong.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SeethingSong.java
@@ -37,7 +37,7 @@ public class SeethingSong extends mage.sets.mirrodin.SeethingSong {
 
     public SeethingSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SeismicStrike.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SeismicStrike.java
index 39e1c33f1b..c0cede0959 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SeismicStrike.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SeismicStrike.java
@@ -37,7 +37,7 @@ public class SeismicStrike extends mage.sets.magic2010.SeismicStrike {
 
     public SeismicStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SejiriSteppe.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SejiriSteppe.java
index c1eaeeac39..7595da7f04 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SejiriSteppe.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SejiriSteppe.java
@@ -37,7 +37,7 @@ public class SejiriSteppe extends mage.sets.worldwake.SejiriSteppe {
 
     public SejiriSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SelesnyaSanctuary.java
index 69d1e0e6a9..c486686295 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SelesnyaSanctuary.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SelesnyaSanctuary.java
@@ -37,7 +37,7 @@ public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
 
     public SelesnyaSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ShivanHellkite.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ShivanHellkite.java
index 840dd86d8b..144a70e262 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/ShivanHellkite.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ShivanHellkite.java
@@ -37,7 +37,7 @@ public class ShivanHellkite extends mage.sets.tenthedition.ShivanHellkite {
 
     public ShivanHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ShivsEmbrace.java
index 42b260fb13..7aa6072ec0 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/ShivsEmbrace.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ShivsEmbrace.java
@@ -37,7 +37,7 @@ public class ShivsEmbrace extends mage.sets.magic2011.ShivsEmbrace {
 
     public ShivsEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SigilBlessing.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SigilBlessing.java
index 09cc1f631f..991bfb0b05 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SigilBlessing.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SigilBlessing.java
@@ -37,7 +37,7 @@ public class SigilBlessing extends mage.sets.shardsofalara.SigilBlessing {
 
     public SigilBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SkirkProspector.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SkirkProspector.java
index 7de1a0d5ad..d0e68a714e 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SkirkProspector.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SkirkProspector.java
@@ -37,7 +37,7 @@ public class SkirkProspector extends mage.sets.onslaught.SkirkProspector {
 
     public SkirkProspector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SkyhunterPatrol.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SkyhunterPatrol.java
index 27a281cbac..417dba003e 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SkyhunterPatrol.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SkyhunterPatrol.java
@@ -37,7 +37,7 @@ public class SkyhunterPatrol extends mage.sets.tenthedition.SkyhunterPatrol {
 
     public SkyhunterPatrol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/SpittingEarth.java b/Mage.Sets/src/mage/sets/knightsvsdragons/SpittingEarth.java
index a1d84c246d..5081737f89 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/StewardOfValeron.java b/Mage.Sets/src/mage/sets/knightsvsdragons/StewardOfValeron.java
index 3eaf325537..b447fe0029 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/StewardOfValeron.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/StewardOfValeron.java
@@ -37,7 +37,7 @@ public class StewardOfValeron extends mage.sets.shardsofalara.StewardOfValeron {
 
     public StewardOfValeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/TemporaryInsanity.java b/Mage.Sets/src/mage/sets/knightsvsdragons/TemporaryInsanity.java
index f8b8b2f14f..09d84bb944 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/TemporaryInsanity.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/TemporaryInsanity.java
@@ -37,7 +37,7 @@ public class TemporaryInsanity extends mage.sets.torment.TemporaryInsanity {
 
     public TemporaryInsanity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/TestOfFaith.java b/Mage.Sets/src/mage/sets/knightsvsdragons/TestOfFaith.java
index 5456377925..76625f9546 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/TestOfFaith.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/TestOfFaith.java
@@ -38,7 +38,7 @@ public class TestOfFaith extends mage.sets.modernmasters.TestOfFaith {
 
     public TestOfFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ThunderDragon.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ThunderDragon.java
index c13f81d0f9..4e28977127 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/ThunderDragon.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ThunderDragon.java
@@ -37,7 +37,7 @@ public class ThunderDragon extends mage.sets.starter1999.ThunderDragon {
 
     public ThunderDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/TreetopVillage.java b/Mage.Sets/src/mage/sets/knightsvsdragons/TreetopVillage.java
index 72940148e0..f3cc9c153b 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/TreetopVillage.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/TreetopVillage.java
@@ -37,7 +37,7 @@ public class TreetopVillage extends mage.sets.tenthedition.TreetopVillage {
 
     public TreetopVillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/VoraciousDragon.java b/Mage.Sets/src/mage/sets/knightsvsdragons/VoraciousDragon.java
index 9edb89ffa9..e8d0d9465c 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/VoraciousDragon.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/VoraciousDragon.java
@@ -37,7 +37,7 @@ public class VoraciousDragon extends mage.sets.conflux.VoraciousDragon {
 
     public VoraciousDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/WhiteKnight.java b/Mage.Sets/src/mage/sets/knightsvsdragons/WhiteKnight.java
index f339661684..a55aefcf1c 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/WiltLeafCavaliers.java b/Mage.Sets/src/mage/sets/knightsvsdragons/WiltLeafCavaliers.java
index f19f60ee96..8a71d80327 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/WiltLeafCavaliers.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/WiltLeafCavaliers.java
@@ -37,7 +37,7 @@ public class WiltLeafCavaliers extends mage.sets.shadowmoor.WiltLeafCavaliers {
 
     public WiltLeafCavaliers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/knightsvsdragons/ZhalfirinCommander.java
index f1ab460788..ad6573b0fa 100644
--- a/Mage.Sets/src/mage/sets/knightsvsdragons/ZhalfirinCommander.java
+++ b/Mage.Sets/src/mage/sets/knightsvsdragons/ZhalfirinCommander.java
@@ -38,7 +38,7 @@ public class ZhalfirinCommander extends mage.sets.timeshifted.ZhalfirinCommander
 
     public ZhalfirinCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/launchparty/AjaniVengeant.java b/Mage.Sets/src/mage/sets/launchparty/AjaniVengeant.java
index 3b8e665a33..3777216e19 100644
--- a/Mage.Sets/src/mage/sets/launchparty/AjaniVengeant.java
+++ b/Mage.Sets/src/mage/sets/launchparty/AjaniVengeant.java
@@ -37,7 +37,7 @@ public class AjaniVengeant extends mage.sets.shardsofalara.AjaniVengeant {
 
     public AjaniVengeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/AncientHellkite.java b/Mage.Sets/src/mage/sets/launchparty/AncientHellkite.java
index d3cf9f8a10..d91cbc976d 100644
--- a/Mage.Sets/src/mage/sets/launchparty/AncientHellkite.java
+++ b/Mage.Sets/src/mage/sets/launchparty/AncientHellkite.java
@@ -37,7 +37,7 @@ public class AncientHellkite extends mage.sets.magic2011.AncientHellkite {
 
     public AncientHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/AngelOfDeliverance.java b/Mage.Sets/src/mage/sets/launchparty/AngelOfDeliverance.java
index 5fa52a5d3a..27d8db82f4 100644
--- a/Mage.Sets/src/mage/sets/launchparty/AngelOfDeliverance.java
+++ b/Mage.Sets/src/mage/sets/launchparty/AngelOfDeliverance.java
@@ -37,7 +37,7 @@ public class AngelOfDeliverance extends mage.sets.shadowsoverinnistrad.AngelOfDe
 
     public AngelOfDeliverance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/AntQueen.java b/Mage.Sets/src/mage/sets/launchparty/AntQueen.java
index 01f2bd0b09..cedb8e69d4 100644
--- a/Mage.Sets/src/mage/sets/launchparty/AntQueen.java
+++ b/Mage.Sets/src/mage/sets/launchparty/AntQueen.java
@@ -37,7 +37,7 @@ public class AntQueen extends mage.sets.magic2010.AntQueen {
 
     public AntQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/BidentOfThassa.java b/Mage.Sets/src/mage/sets/launchparty/BidentOfThassa.java
index a2dfb3767b..4bb011ff2c 100644
--- a/Mage.Sets/src/mage/sets/launchparty/BidentOfThassa.java
+++ b/Mage.Sets/src/mage/sets/launchparty/BidentOfThassa.java
@@ -37,7 +37,7 @@ public class BidentOfThassa extends mage.sets.theros.BidentOfThassa {
 
     public BidentOfThassa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/BlightHerder.java b/Mage.Sets/src/mage/sets/launchparty/BlightHerder.java
index 01bebfd847..6c69df18c7 100644
--- a/Mage.Sets/src/mage/sets/launchparty/BlightHerder.java
+++ b/Mage.Sets/src/mage/sets/launchparty/BlightHerder.java
@@ -37,7 +37,7 @@ public class BlightHerder extends mage.sets.battleforzendikar.BlightHerder {
 
     public BlightHerder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/BreakingEntering.java b/Mage.Sets/src/mage/sets/launchparty/BreakingEntering.java
index a0391da370..09b259d6bd 100644
--- a/Mage.Sets/src/mage/sets/launchparty/BreakingEntering.java
+++ b/Mage.Sets/src/mage/sets/launchparty/BreakingEntering.java
@@ -37,7 +37,7 @@ public class BreakingEntering extends mage.sets.dragonsmaze.BreakingEntering {
 
     public BreakingEntering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/ColossalWhale.java b/Mage.Sets/src/mage/sets/launchparty/ColossalWhale.java
index 6bdb6e548e..1e02e481fa 100644
--- a/Mage.Sets/src/mage/sets/launchparty/ColossalWhale.java
+++ b/Mage.Sets/src/mage/sets/launchparty/ColossalWhale.java
@@ -37,7 +37,7 @@ public class ColossalWhale extends mage.sets.magic2014.ColossalWhale {
 
     public ColossalWhale(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/DeadbridgeGoliath.java b/Mage.Sets/src/mage/sets/launchparty/DeadbridgeGoliath.java
index d265ea68b6..1ab67af7bb 100644
--- a/Mage.Sets/src/mage/sets/launchparty/DeadbridgeGoliath.java
+++ b/Mage.Sets/src/mage/sets/launchparty/DeadbridgeGoliath.java
@@ -37,7 +37,7 @@ public class DeadbridgeGoliath extends mage.sets.returntoravnica.DeadbridgeGolia
 
     public DeadbridgeGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/DeathbringerRegent.java b/Mage.Sets/src/mage/sets/launchparty/DeathbringerRegent.java
index 84d35f8dc6..c111e35cce 100644
--- a/Mage.Sets/src/mage/sets/launchparty/DeathbringerRegent.java
+++ b/Mage.Sets/src/mage/sets/launchparty/DeathbringerRegent.java
@@ -37,7 +37,7 @@ public class DeathbringerRegent extends mage.sets.dragonsoftarkir.DeathbringerRe
 
     public DeathbringerRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/DictateOfTheTwinGods.java b/Mage.Sets/src/mage/sets/launchparty/DictateOfTheTwinGods.java
index 7e2872a997..f7488df1c3 100644
--- a/Mage.Sets/src/mage/sets/launchparty/DictateOfTheTwinGods.java
+++ b/Mage.Sets/src/mage/sets/launchparty/DictateOfTheTwinGods.java
@@ -37,7 +37,7 @@ public class DictateOfTheTwinGods extends mage.sets.journeyintonyx.DictateOfTheT
 
     public DictateOfTheTwinGods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/DragonThroneOfTarkir.java b/Mage.Sets/src/mage/sets/launchparty/DragonThroneOfTarkir.java
index 62d86f4fc2..03202ba778 100644
--- a/Mage.Sets/src/mage/sets/launchparty/DragonThroneOfTarkir.java
+++ b/Mage.Sets/src/mage/sets/launchparty/DragonThroneOfTarkir.java
@@ -37,7 +37,7 @@ public class DragonThroneOfTarkir extends mage.sets.khansoftarkir.DragonThroneOf
 
     public DragonThroneOfTarkir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/EarwigSquad.java b/Mage.Sets/src/mage/sets/launchparty/EarwigSquad.java
index 7ab214fe17..4377ae5b37 100644
--- a/Mage.Sets/src/mage/sets/launchparty/EarwigSquad.java
+++ b/Mage.Sets/src/mage/sets/launchparty/EarwigSquad.java
@@ -37,7 +37,7 @@ public class EarwigSquad extends mage.sets.modernmasters.EarwigSquad {
 
     public EarwigSquad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/Endbringer.java b/Mage.Sets/src/mage/sets/launchparty/Endbringer.java
index 1452f6294b..52420579df 100644
--- a/Mage.Sets/src/mage/sets/launchparty/Endbringer.java
+++ b/Mage.Sets/src/mage/sets/launchparty/Endbringer.java
@@ -37,7 +37,7 @@ public class Endbringer extends mage.sets.oathofthegatewatch.Endbringer {
 
     public Endbringer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/launchparty/FigureOfDestiny.java
index b61973a52a..d34431f48d 100644
--- a/Mage.Sets/src/mage/sets/launchparty/FigureOfDestiny.java
+++ b/Mage.Sets/src/mage/sets/launchparty/FigureOfDestiny.java
@@ -37,7 +37,7 @@ public class FigureOfDestiny extends mage.sets.eventide.FigureOfDestiny {
 
     public FigureOfDestiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/GarruksHorde.java b/Mage.Sets/src/mage/sets/launchparty/GarruksHorde.java
index 6c882498ee..ebdc3fd5eb 100644
--- a/Mage.Sets/src/mage/sets/launchparty/GarruksHorde.java
+++ b/Mage.Sets/src/mage/sets/launchparty/GarruksHorde.java
@@ -37,7 +37,7 @@ public class GarruksHorde extends mage.sets.magic2012.GarruksHorde {
 
     public GarruksHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/IdentityThief.java b/Mage.Sets/src/mage/sets/launchparty/IdentityThief.java
index a3dfe684eb..ba83962639 100644
--- a/Mage.Sets/src/mage/sets/launchparty/IdentityThief.java
+++ b/Mage.Sets/src/mage/sets/launchparty/IdentityThief.java
@@ -37,7 +37,7 @@ public class IdentityThief extends mage.sets.eldritchmoon.IdentityThief {
 
     public IdentityThief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/InGarruksWake.java b/Mage.Sets/src/mage/sets/launchparty/InGarruksWake.java
index 2a242a2635..d4408d5ddd 100644
--- a/Mage.Sets/src/mage/sets/launchparty/InGarruksWake.java
+++ b/Mage.Sets/src/mage/sets/launchparty/InGarruksWake.java
@@ -37,7 +37,7 @@ public class InGarruksWake extends mage.sets.magic2015.InGarruksWake {
 
     public InGarruksWake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/JoragaWarcaller.java b/Mage.Sets/src/mage/sets/launchparty/JoragaWarcaller.java
index e9fa2cc443..bbbd1c9f8f 100644
--- a/Mage.Sets/src/mage/sets/launchparty/JoragaWarcaller.java
+++ b/Mage.Sets/src/mage/sets/launchparty/JoragaWarcaller.java
@@ -37,7 +37,7 @@ public class JoragaWarcaller extends mage.sets.worldwake.JoragaWarcaller {
 
     public JoragaWarcaller(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/KnightOfNewAlara.java b/Mage.Sets/src/mage/sets/launchparty/KnightOfNewAlara.java
index 48618f8881..428f256770 100644
--- a/Mage.Sets/src/mage/sets/launchparty/KnightOfNewAlara.java
+++ b/Mage.Sets/src/mage/sets/launchparty/KnightOfNewAlara.java
@@ -37,7 +37,7 @@ public class KnightOfNewAlara extends mage.sets.alarareborn.KnightOfNewAlara {
 
     public KnightOfNewAlara(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/LordOfShatterskullPass.java b/Mage.Sets/src/mage/sets/launchparty/LordOfShatterskullPass.java
index 6e6988ee9a..bbece44aaf 100644
--- a/Mage.Sets/src/mage/sets/launchparty/LordOfShatterskullPass.java
+++ b/Mage.Sets/src/mage/sets/launchparty/LordOfShatterskullPass.java
@@ -37,7 +37,7 @@ public class LordOfShatterskullPass extends mage.sets.riseoftheeldrazi.LordOfSha
 
     public LordOfShatterskullPass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/LudevicsTestSubject.java b/Mage.Sets/src/mage/sets/launchparty/LudevicsTestSubject.java
index c5b9014ac5..9cdc8ed71e 100644
--- a/Mage.Sets/src/mage/sets/launchparty/LudevicsTestSubject.java
+++ b/Mage.Sets/src/mage/sets/launchparty/LudevicsTestSubject.java
@@ -37,7 +37,7 @@ public class LudevicsTestSubject extends mage.sets.innistrad.LudevicsTestSubject
 
     public LudevicsTestSubject(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/MizziumMeddler.java b/Mage.Sets/src/mage/sets/launchparty/MizziumMeddler.java
index 1e3d9aa7c2..d5827bf426 100644
--- a/Mage.Sets/src/mage/sets/launchparty/MizziumMeddler.java
+++ b/Mage.Sets/src/mage/sets/launchparty/MizziumMeddler.java
@@ -37,7 +37,7 @@ public class MizziumMeddler extends mage.sets.magicorigins.MizziumMeddler {
 
     public MizziumMeddler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/MondronenShaman.java b/Mage.Sets/src/mage/sets/launchparty/MondronenShaman.java
index f23952b33b..7765a967ce 100644
--- a/Mage.Sets/src/mage/sets/launchparty/MondronenShaman.java
+++ b/Mage.Sets/src/mage/sets/launchparty/MondronenShaman.java
@@ -37,7 +37,7 @@ public class MondronenShaman extends mage.sets.darkascension.MondronenShaman {
 
     public MondronenShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/ObeliskOfAlara.java b/Mage.Sets/src/mage/sets/launchparty/ObeliskOfAlara.java
index 8802e6f465..1cc531e4ee 100644
--- a/Mage.Sets/src/mage/sets/launchparty/ObeliskOfAlara.java
+++ b/Mage.Sets/src/mage/sets/launchparty/ObeliskOfAlara.java
@@ -37,7 +37,7 @@ public class ObeliskOfAlara extends mage.sets.conflux.ObeliskOfAlara {
 
     public ObeliskOfAlara(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/launchparty/PhyrexianMetamorph.java
index bdffb6e373..6de453ff14 100644
--- a/Mage.Sets/src/mage/sets/launchparty/PhyrexianMetamorph.java
+++ b/Mage.Sets/src/mage/sets/launchparty/PhyrexianMetamorph.java
@@ -37,7 +37,7 @@ public class PhyrexianMetamorph extends mage.sets.newphyrexia.PhyrexianMetamorph
 
     public PhyrexianMetamorph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/RestorationAngel.java b/Mage.Sets/src/mage/sets/launchparty/RestorationAngel.java
index 0dfbce43d4..d4f36b44f8 100644
--- a/Mage.Sets/src/mage/sets/launchparty/RestorationAngel.java
+++ b/Mage.Sets/src/mage/sets/launchparty/RestorationAngel.java
@@ -37,7 +37,7 @@ public class RestorationAngel extends mage.sets.avacynrestored.RestorationAngel
 
     public RestorationAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/SandsteppeMastodon.java b/Mage.Sets/src/mage/sets/launchparty/SandsteppeMastodon.java
index 20b14b6af4..d1652f2552 100644
--- a/Mage.Sets/src/mage/sets/launchparty/SandsteppeMastodon.java
+++ b/Mage.Sets/src/mage/sets/launchparty/SandsteppeMastodon.java
@@ -37,7 +37,7 @@ public class SandsteppeMastodon extends mage.sets.fatereforged.SandsteppeMastodo
 
     public SandsteppeMastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/SkarrgGoliath.java b/Mage.Sets/src/mage/sets/launchparty/SkarrgGoliath.java
index 133492cccf..eeefeb24d8 100644
--- a/Mage.Sets/src/mage/sets/launchparty/SkarrgGoliath.java
+++ b/Mage.Sets/src/mage/sets/launchparty/SkarrgGoliath.java
@@ -37,7 +37,7 @@ public class SkarrgGoliath extends mage.sets.gatecrash.SkarrgGoliath {
 
     public SkarrgGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/StaffOfNin.java b/Mage.Sets/src/mage/sets/launchparty/StaffOfNin.java
index beb10d5910..6f24b3ae60 100644
--- a/Mage.Sets/src/mage/sets/launchparty/StaffOfNin.java
+++ b/Mage.Sets/src/mage/sets/launchparty/StaffOfNin.java
@@ -37,7 +37,7 @@ public class StaffOfNin extends mage.sets.magic2013.StaffOfNin {
 
     public StaffOfNin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/SteelHellkite.java b/Mage.Sets/src/mage/sets/launchparty/SteelHellkite.java
index 3cf207ba73..8e448d780e 100644
--- a/Mage.Sets/src/mage/sets/launchparty/SteelHellkite.java
+++ b/Mage.Sets/src/mage/sets/launchparty/SteelHellkite.java
@@ -37,7 +37,7 @@ public class SteelHellkite extends mage.sets.scarsofmirrodin.SteelHellkite {
 
     public SteelHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/ThopterAssembly.java b/Mage.Sets/src/mage/sets/launchparty/ThopterAssembly.java
index a883bead5b..8b707dfb60 100644
--- a/Mage.Sets/src/mage/sets/launchparty/ThopterAssembly.java
+++ b/Mage.Sets/src/mage/sets/launchparty/ThopterAssembly.java
@@ -37,7 +37,7 @@ public class ThopterAssembly extends mage.sets.mirrodinbesieged.ThopterAssembly
 
     public ThopterAssembly(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/Tromokratis.java b/Mage.Sets/src/mage/sets/launchparty/Tromokratis.java
index 6b2babdab1..cb25a8e22c 100644
--- a/Mage.Sets/src/mage/sets/launchparty/Tromokratis.java
+++ b/Mage.Sets/src/mage/sets/launchparty/Tromokratis.java
@@ -37,7 +37,7 @@ public class Tromokratis extends mage.sets.bornofthegods.Tromokratis {
 
     public Tromokratis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/sets/launchparty/ValakutTheMoltenPinnacle.java
index 654738e61b..8e6c1314e3 100644
--- a/Mage.Sets/src/mage/sets/launchparty/ValakutTheMoltenPinnacle.java
+++ b/Mage.Sets/src/mage/sets/launchparty/ValakutTheMoltenPinnacle.java
@@ -37,7 +37,7 @@ public class ValakutTheMoltenPinnacle extends mage.sets.zendikar.ValakutTheMolte
 
     public ValakutTheMoltenPinnacle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/launchparty/VexingShusher.java b/Mage.Sets/src/mage/sets/launchparty/VexingShusher.java
index c9ef5b4b24..b741026ce1 100644
--- a/Mage.Sets/src/mage/sets/launchparty/VexingShusher.java
+++ b/Mage.Sets/src/mage/sets/launchparty/VexingShusher.java
@@ -37,7 +37,7 @@ public class VexingShusher extends mage.sets.shadowmoor.VexingShusher {
 
     public VexingShusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "MLP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/AlchorsTomb.java b/Mage.Sets/src/mage/sets/legends/AlchorsTomb.java
index 3556caf0ee..dd9eb0ee24 100644
--- a/Mage.Sets/src/mage/sets/legends/AlchorsTomb.java
+++ b/Mage.Sets/src/mage/sets/legends/AlchorsTomb.java
@@ -37,7 +37,7 @@ public class AlchorsTomb extends mage.sets.masterseditioniv.AlchorsTomb {
 
     public AlchorsTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/ArcadesSabboth.java b/Mage.Sets/src/mage/sets/legends/ArcadesSabboth.java
index 0fe40090c4..6b19e6ca01 100644
--- a/Mage.Sets/src/mage/sets/legends/ArcadesSabboth.java
+++ b/Mage.Sets/src/mage/sets/legends/ArcadesSabboth.java
@@ -37,7 +37,7 @@ public class ArcadesSabboth extends mage.sets.masterseditioniii.ArcadesSabboth {
 
     public ArcadesSabboth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/AzureDrake.java b/Mage.Sets/src/mage/sets/legends/AzureDrake.java
index ab3ecb41ae..e3355fc5ad 100644
--- a/Mage.Sets/src/mage/sets/legends/AzureDrake.java
+++ b/Mage.Sets/src/mage/sets/legends/AzureDrake.java
@@ -38,7 +38,7 @@ public class AzureDrake extends mage.sets.magic2011.AzureDrake {
 
     public AzureDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/BeastsOfBogardan.java b/Mage.Sets/src/mage/sets/legends/BeastsOfBogardan.java
index 6a8bf99075..8c30234ddc 100644
--- a/Mage.Sets/src/mage/sets/legends/BeastsOfBogardan.java
+++ b/Mage.Sets/src/mage/sets/legends/BeastsOfBogardan.java
@@ -37,7 +37,7 @@ public class BeastsOfBogardan extends mage.sets.chronicles.BeastsOfBogardan {
 
     public BeastsOfBogardan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Blight.java b/Mage.Sets/src/mage/sets/legends/Blight.java
index 7c604f1c94..ddcf51457e 100644
--- a/Mage.Sets/src/mage/sets/legends/Blight.java
+++ b/Mage.Sets/src/mage/sets/legends/Blight.java
@@ -37,7 +37,7 @@ public class Blight extends mage.sets.fifthedition.Blight {
 
     public Blight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/BloodLust.java b/Mage.Sets/src/mage/sets/legends/BloodLust.java
index e065305fb1..f63582e98c 100644
--- a/Mage.Sets/src/mage/sets/legends/BloodLust.java
+++ b/Mage.Sets/src/mage/sets/legends/BloodLust.java
@@ -38,7 +38,7 @@ public class BloodLust extends mage.sets.fourthedition.BloodLust {
 
     public BloodLust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/Boomerang.java b/Mage.Sets/src/mage/sets/legends/Boomerang.java
index a24b2226fd..7ad3bad1d6 100644
--- a/Mage.Sets/src/mage/sets/legends/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/legends/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/CarrionAnts.java b/Mage.Sets/src/mage/sets/legends/CarrionAnts.java
index 2ad9431243..b4ecd322fa 100644
--- a/Mage.Sets/src/mage/sets/legends/CarrionAnts.java
+++ b/Mage.Sets/src/mage/sets/legends/CarrionAnts.java
@@ -38,7 +38,7 @@ public class CarrionAnts extends mage.sets.fifthedition.CarrionAnts {
 
     public CarrionAnts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/CatWarriors.java b/Mage.Sets/src/mage/sets/legends/CatWarriors.java
index 7cdc410e64..be09053d9c 100644
--- a/Mage.Sets/src/mage/sets/legends/CatWarriors.java
+++ b/Mage.Sets/src/mage/sets/legends/CatWarriors.java
@@ -37,7 +37,7 @@ public class CatWarriors extends mage.sets.fifthedition.CatWarriors {
 
     public CatWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Chromium.java b/Mage.Sets/src/mage/sets/legends/Chromium.java
index 517fdd04a0..fe675ef318 100644
--- a/Mage.Sets/src/mage/sets/legends/Chromium.java
+++ b/Mage.Sets/src/mage/sets/legends/Chromium.java
@@ -37,7 +37,7 @@ public class Chromium extends mage.sets.masterseditioniii.Chromium {
 
     public Chromium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java b/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java
index 421d353dfb..c3eeb5e28d 100644
--- a/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java
+++ b/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java
@@ -37,7 +37,7 @@ public class ConcordantCrossroads extends mage.sets.masterseditioniii.Concordant
 
     public ConcordantCrossroads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/DAvenantArcher.java b/Mage.Sets/src/mage/sets/legends/DAvenantArcher.java
index c9879676a3..1e87ac4895 100644
--- a/Mage.Sets/src/mage/sets/legends/DAvenantArcher.java
+++ b/Mage.Sets/src/mage/sets/legends/DAvenantArcher.java
@@ -37,7 +37,7 @@ public class DAvenantArcher extends mage.sets.fifthedition.DAvenantArcher {
 
     public DAvenantArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Darkness.java b/Mage.Sets/src/mage/sets/legends/Darkness.java
index 69345ddbea..abd4b0b3fa 100644
--- a/Mage.Sets/src/mage/sets/legends/Darkness.java
+++ b/Mage.Sets/src/mage/sets/legends/Darkness.java
@@ -38,7 +38,7 @@ public class Darkness extends mage.sets.timeshifted.Darkness {
 
     public Darkness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/DivineIntervention.java b/Mage.Sets/src/mage/sets/legends/DivineIntervention.java
index b310d9167b..4a759a2697 100644
--- a/Mage.Sets/src/mage/sets/legends/DivineIntervention.java
+++ b/Mage.Sets/src/mage/sets/legends/DivineIntervention.java
@@ -37,7 +37,7 @@ public class DivineIntervention extends mage.sets.masterseditioniii.DivineInterv
 
     public DivineIntervention(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/DivineOffering.java b/Mage.Sets/src/mage/sets/legends/DivineOffering.java
index 05dd668dee..9f17fa4f53 100644
--- a/Mage.Sets/src/mage/sets/legends/DivineOffering.java
+++ b/Mage.Sets/src/mage/sets/legends/DivineOffering.java
@@ -37,7 +37,7 @@ public class DivineOffering extends mage.sets.mirrodinbesieged.DivineOffering {
 
     public DivineOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/DivineTransformation.java b/Mage.Sets/src/mage/sets/legends/DivineTransformation.java
index 2d05947a96..e8991a98c6 100644
--- a/Mage.Sets/src/mage/sets/legends/DivineTransformation.java
+++ b/Mage.Sets/src/mage/sets/legends/DivineTransformation.java
@@ -38,7 +38,7 @@ public class DivineTransformation extends mage.sets.fifthedition.DivineTransform
 
     public DivineTransformation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/DurkwoodBoars.java b/Mage.Sets/src/mage/sets/legends/DurkwoodBoars.java
index 78d486d45f..60f58b40a2 100644
--- a/Mage.Sets/src/mage/sets/legends/DurkwoodBoars.java
+++ b/Mage.Sets/src/mage/sets/legends/DurkwoodBoars.java
@@ -37,7 +37,7 @@ public class DurkwoodBoars extends mage.sets.fifthedition.DurkwoodBoars {
 
     public DurkwoodBoars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/ElvenRiders.java b/Mage.Sets/src/mage/sets/legends/ElvenRiders.java
index e02fd5b894..9635ff15d9 100644
--- a/Mage.Sets/src/mage/sets/legends/ElvenRiders.java
+++ b/Mage.Sets/src/mage/sets/legends/ElvenRiders.java
@@ -38,7 +38,7 @@ public class ElvenRiders extends mage.sets.onslaught.ElvenRiders {
 
     public ElvenRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/EternalWarrior.java b/Mage.Sets/src/mage/sets/legends/EternalWarrior.java
index 2716ff4d8e..fa1e97e071 100644
--- a/Mage.Sets/src/mage/sets/legends/EternalWarrior.java
+++ b/Mage.Sets/src/mage/sets/legends/EternalWarrior.java
@@ -38,7 +38,7 @@ public class EternalWarrior extends mage.sets.fifthedition.EternalWarrior {
 
     public EternalWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/Eureka.java b/Mage.Sets/src/mage/sets/legends/Eureka.java
index 7b1611b559..eab2dfb182 100644
--- a/Mage.Sets/src/mage/sets/legends/Eureka.java
+++ b/Mage.Sets/src/mage/sets/legends/Eureka.java
@@ -38,7 +38,7 @@ public class Eureka extends mage.sets.vintagemasters.Eureka {
 
     public Eureka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/sets/legends/EvilEyeOfOrmsByGore.java
index 107e88aaca..17f5402f1d 100644
--- a/Mage.Sets/src/mage/sets/legends/EvilEyeOfOrmsByGore.java
+++ b/Mage.Sets/src/mage/sets/legends/EvilEyeOfOrmsByGore.java
@@ -37,7 +37,7 @@ public class EvilEyeOfOrmsByGore extends mage.sets.fifthedition.EvilEyeOfOrmsByG
 
     public EvilEyeOfOrmsByGore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/FallenAngel.java b/Mage.Sets/src/mage/sets/legends/FallenAngel.java
index afd288df2a..d365ddd089 100644
--- a/Mage.Sets/src/mage/sets/legends/FallenAngel.java
+++ b/Mage.Sets/src/mage/sets/legends/FallenAngel.java
@@ -38,7 +38,7 @@ public class FallenAngel extends mage.sets.seventhedition.FallenAngel {
 
     public FallenAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/FireSprites.java b/Mage.Sets/src/mage/sets/legends/FireSprites.java
index 891f8adff9..5106401781 100644
--- a/Mage.Sets/src/mage/sets/legends/FireSprites.java
+++ b/Mage.Sets/src/mage/sets/legends/FireSprites.java
@@ -37,7 +37,7 @@ public class FireSprites extends mage.sets.masterseditioniii.FireSprites {
 
     public FireSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/FlashCounter.java b/Mage.Sets/src/mage/sets/legends/FlashCounter.java
index d383d1c8c0..ad281eebb6 100644
--- a/Mage.Sets/src/mage/sets/legends/FlashCounter.java
+++ b/Mage.Sets/src/mage/sets/legends/FlashCounter.java
@@ -37,7 +37,7 @@ public class FlashCounter extends mage.sets.eighthedition.FlashCounter {
 
     public FlashCounter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/ForceSpike.java b/Mage.Sets/src/mage/sets/legends/ForceSpike.java
index 72189f3c7e..448de23dd9 100644
--- a/Mage.Sets/src/mage/sets/legends/ForceSpike.java
+++ b/Mage.Sets/src/mage/sets/legends/ForceSpike.java
@@ -37,7 +37,7 @@ public class ForceSpike extends mage.sets.seventhedition.ForceSpike {
 
     public ForceSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/GaseousForm.java b/Mage.Sets/src/mage/sets/legends/GaseousForm.java
index eaf1428e24..deae89c662 100644
--- a/Mage.Sets/src/mage/sets/legends/GaseousForm.java
+++ b/Mage.Sets/src/mage/sets/legends/GaseousForm.java
@@ -37,7 +37,7 @@ public class GaseousForm extends mage.sets.tempest.GaseousForm {
 
     public GaseousForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java b/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java
index 37538e1bdc..824c2d9c7e 100644
--- a/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java
+++ b/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java
@@ -37,7 +37,7 @@ public class GhostsOfTheDamned extends mage.sets.masterseditioniii.GhostsOfTheDa
 
     public GhostsOfTheDamned(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/GiantStrength.java b/Mage.Sets/src/mage/sets/legends/GiantStrength.java
index b04e6d69a2..a58a52f177 100644
--- a/Mage.Sets/src/mage/sets/legends/GiantStrength.java
+++ b/Mage.Sets/src/mage/sets/legends/GiantStrength.java
@@ -37,7 +37,7 @@ public class GiantStrength extends mage.sets.tempest.GiantStrength {
 
     public GiantStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Greed.java b/Mage.Sets/src/mage/sets/legends/Greed.java
index 4a36f012b6..efd2ea72cd 100644
--- a/Mage.Sets/src/mage/sets/legends/Greed.java
+++ b/Mage.Sets/src/mage/sets/legends/Greed.java
@@ -37,7 +37,7 @@ public class Greed extends mage.sets.commander2013.Greed {
 
     public Greed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Hellfire.java b/Mage.Sets/src/mage/sets/legends/Hellfire.java
index c3628791fb..cb9b4ec302 100644
--- a/Mage.Sets/src/mage/sets/legends/Hellfire.java
+++ b/Mage.Sets/src/mage/sets/legends/Hellfire.java
@@ -37,7 +37,7 @@ public class Hellfire extends mage.sets.masterseditioniii.Hellfire {
 
     public Hellfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/HellsCaretaker.java b/Mage.Sets/src/mage/sets/legends/HellsCaretaker.java
index 1c12ff1dc2..580430728c 100644
--- a/Mage.Sets/src/mage/sets/legends/HellsCaretaker.java
+++ b/Mage.Sets/src/mage/sets/legends/HellsCaretaker.java
@@ -37,7 +37,7 @@ public class HellsCaretaker extends mage.sets.ninthedition.HellsCaretaker {
 
     public HellsCaretaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/HolyDay.java b/Mage.Sets/src/mage/sets/legends/HolyDay.java
index 7a31610cf4..28b3c0177d 100644
--- a/Mage.Sets/src/mage/sets/legends/HolyDay.java
+++ b/Mage.Sets/src/mage/sets/legends/HolyDay.java
@@ -37,7 +37,7 @@ public class HolyDay extends mage.sets.invasion.HolyDay {
 
     public HolyDay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Immolation.java b/Mage.Sets/src/mage/sets/legends/Immolation.java
index f5f28fd181..63e89a55f9 100644
--- a/Mage.Sets/src/mage/sets/legends/Immolation.java
+++ b/Mage.Sets/src/mage/sets/legends/Immolation.java
@@ -37,7 +37,7 @@ public class Immolation extends mage.sets.fourthedition.Immolation {
 
     public Immolation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java b/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java
index d4f568d9b8..41dcba3406 100644
--- a/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java
+++ b/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java
@@ -38,7 +38,7 @@ public class JasmineBoreal extends mage.sets.timeshifted.JasmineBoreal {
 
     public JasmineBoreal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/Juxtapose.java b/Mage.Sets/src/mage/sets/legends/Juxtapose.java
index 3f0269fdfb..99d586bd88 100644
--- a/Mage.Sets/src/mage/sets/legends/Juxtapose.java
+++ b/Mage.Sets/src/mage/sets/legends/Juxtapose.java
@@ -37,7 +37,7 @@ public class Juxtapose extends mage.sets.fifthedition.Juxtapose {
 
     public Juxtapose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/KeiTakahashi.java b/Mage.Sets/src/mage/sets/legends/KeiTakahashi.java
index ebc26302d2..68e3e8c45f 100644
--- a/Mage.Sets/src/mage/sets/legends/KeiTakahashi.java
+++ b/Mage.Sets/src/mage/sets/legends/KeiTakahashi.java
@@ -38,7 +38,7 @@ public class KeiTakahashi extends mage.sets.masterseditioniii.KeiTakahashi {
 
     public KeiTakahashi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/KillerBees.java b/Mage.Sets/src/mage/sets/legends/KillerBees.java
index 7ae16f2bf5..b173bbfe98 100644
--- a/Mage.Sets/src/mage/sets/legends/KillerBees.java
+++ b/Mage.Sets/src/mage/sets/legends/KillerBees.java
@@ -38,7 +38,7 @@ public class KillerBees extends mage.sets.fifthedition.KillerBees {
 
     public KillerBees(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/Kismet.java b/Mage.Sets/src/mage/sets/legends/Kismet.java
index b0b1a4c559..a5a18acfa4 100644
--- a/Mage.Sets/src/mage/sets/legends/Kismet.java
+++ b/Mage.Sets/src/mage/sets/legends/Kismet.java
@@ -37,7 +37,7 @@ public class Kismet extends mage.sets.fifthedition.Kismet {
 
     public Kismet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/KoboldDrillSergeant.java b/Mage.Sets/src/mage/sets/legends/KoboldDrillSergeant.java
index 3474688032..c298eec775 100644
--- a/Mage.Sets/src/mage/sets/legends/KoboldDrillSergeant.java
+++ b/Mage.Sets/src/mage/sets/legends/KoboldDrillSergeant.java
@@ -37,7 +37,7 @@ public class KoboldDrillSergeant extends mage.sets.masterseditioniii.KoboldDrill
 
     public KoboldDrillSergeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/KoboldTaskmaster.java b/Mage.Sets/src/mage/sets/legends/KoboldTaskmaster.java
index bcd2afa76c..97ae2a7f70 100644
--- a/Mage.Sets/src/mage/sets/legends/KoboldTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/legends/KoboldTaskmaster.java
@@ -38,7 +38,7 @@ public class KoboldTaskmaster extends mage.sets.timeshifted.KoboldTaskmaster {
 
     public KoboldTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/LadyCaleria.java b/Mage.Sets/src/mage/sets/legends/LadyCaleria.java
index 7882a5da97..2706831426 100644
--- a/Mage.Sets/src/mage/sets/legends/LadyCaleria.java
+++ b/Mage.Sets/src/mage/sets/legends/LadyCaleria.java
@@ -38,7 +38,7 @@ public class LadyCaleria extends mage.sets.masterseditioniii.LadyCaleria {
 
     public LadyCaleria(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/LivonyaSilone.java b/Mage.Sets/src/mage/sets/legends/LivonyaSilone.java
index 0f3933a461..b9d2a4f041 100644
--- a/Mage.Sets/src/mage/sets/legends/LivonyaSilone.java
+++ b/Mage.Sets/src/mage/sets/legends/LivonyaSilone.java
@@ -38,7 +38,7 @@ public class LivonyaSilone extends mage.sets.masterseditioniii.LivonyaSilone {
 
     public LivonyaSilone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/LostSoul.java b/Mage.Sets/src/mage/sets/legends/LostSoul.java
index 9657942f03..766bda08bd 100644
--- a/Mage.Sets/src/mage/sets/legends/LostSoul.java
+++ b/Mage.Sets/src/mage/sets/legends/LostSoul.java
@@ -37,7 +37,7 @@ public class LostSoul extends mage.sets.fifthedition.LostSoul {
 
     public LostSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/ManaDrain.java b/Mage.Sets/src/mage/sets/legends/ManaDrain.java
index f514620d3e..6ca8592510 100644
--- a/Mage.Sets/src/mage/sets/legends/ManaDrain.java
+++ b/Mage.Sets/src/mage/sets/legends/ManaDrain.java
@@ -38,7 +38,7 @@ public class ManaDrain extends mage.sets.vintagemasters.ManaDrain {
 
     public ManaDrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/ManaMatrix.java b/Mage.Sets/src/mage/sets/legends/ManaMatrix.java
index 115fc8bfe1..776834cbed 100644
--- a/Mage.Sets/src/mage/sets/legends/ManaMatrix.java
+++ b/Mage.Sets/src/mage/sets/legends/ManaMatrix.java
@@ -37,7 +37,7 @@ public class ManaMatrix extends mage.sets.masterseditioniv.ManaMatrix {
 
     public ManaMatrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/MossMonster.java b/Mage.Sets/src/mage/sets/legends/MossMonster.java
index 0000fd2710..5e894ff618 100644
--- a/Mage.Sets/src/mage/sets/legends/MossMonster.java
+++ b/Mage.Sets/src/mage/sets/legends/MossMonster.java
@@ -37,7 +37,7 @@ public class MossMonster extends mage.sets.eighthedition.MossMonster {
 
     public MossMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/PalladiaMors.java b/Mage.Sets/src/mage/sets/legends/PalladiaMors.java
index 5e4cf10fea..4eefdb0048 100644
--- a/Mage.Sets/src/mage/sets/legends/PalladiaMors.java
+++ b/Mage.Sets/src/mage/sets/legends/PalladiaMors.java
@@ -37,7 +37,7 @@ public class PalladiaMors extends mage.sets.masterseditioniii.PalladiaMors {
 
     public PalladiaMors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Pendelhaven.java b/Mage.Sets/src/mage/sets/legends/Pendelhaven.java
index 55036b2482..d0d5158eef 100644
--- a/Mage.Sets/src/mage/sets/legends/Pendelhaven.java
+++ b/Mage.Sets/src/mage/sets/legends/Pendelhaven.java
@@ -38,7 +38,7 @@ public class Pendelhaven extends mage.sets.timeshifted.Pendelhaven {
 
     public Pendelhaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/PitScorpion.java b/Mage.Sets/src/mage/sets/legends/PitScorpion.java
index a9cb98c210..d47463de38 100644
--- a/Mage.Sets/src/mage/sets/legends/PitScorpion.java
+++ b/Mage.Sets/src/mage/sets/legends/PitScorpion.java
@@ -37,7 +37,7 @@ public class PitScorpion extends mage.sets.fifthedition.PitScorpion {
 
     public PitScorpion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/PlanarGate.java b/Mage.Sets/src/mage/sets/legends/PlanarGate.java
index 3fcf178cbc..a181027a27 100644
--- a/Mage.Sets/src/mage/sets/legends/PlanarGate.java
+++ b/Mage.Sets/src/mage/sets/legends/PlanarGate.java
@@ -38,7 +38,7 @@ public class PlanarGate extends mage.sets.masterseditioniv.PlanarGate {
 
     public PlanarGate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/PradeshGypsies.java b/Mage.Sets/src/mage/sets/legends/PradeshGypsies.java
index d70c6ff92e..c5195a2588 100644
--- a/Mage.Sets/src/mage/sets/legends/PradeshGypsies.java
+++ b/Mage.Sets/src/mage/sets/legends/PradeshGypsies.java
@@ -38,7 +38,7 @@ public class PradeshGypsies extends mage.sets.fifthedition.PradeshGypsies {
 
     public PradeshGypsies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/PrincessLucrezia.java b/Mage.Sets/src/mage/sets/legends/PrincessLucrezia.java
index 416d2e6371..74ff6ddbf4 100644
--- a/Mage.Sets/src/mage/sets/legends/PrincessLucrezia.java
+++ b/Mage.Sets/src/mage/sets/legends/PrincessLucrezia.java
@@ -37,7 +37,7 @@ public class PrincessLucrezia extends mage.sets.masterseditioniii.PrincessLucrez
 
     public PrincessLucrezia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Pyrotechnics.java b/Mage.Sets/src/mage/sets/legends/Pyrotechnics.java
index 14a9b5a110..0c228c47cc 100644
--- a/Mage.Sets/src/mage/sets/legends/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/legends/Pyrotechnics.java
@@ -38,7 +38,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/RadjanSpirit.java b/Mage.Sets/src/mage/sets/legends/RadjanSpirit.java
index 10c12a87b8..27fb1e34d0 100644
--- a/Mage.Sets/src/mage/sets/legends/RadjanSpirit.java
+++ b/Mage.Sets/src/mage/sets/legends/RadjanSpirit.java
@@ -37,7 +37,7 @@ public class RadjanSpirit extends mage.sets.fifthedition.RadjanSpirit {
 
     public RadjanSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/RamsesOverdark.java b/Mage.Sets/src/mage/sets/legends/RamsesOverdark.java
index c1fab09480..5145250989 100644
--- a/Mage.Sets/src/mage/sets/legends/RamsesOverdark.java
+++ b/Mage.Sets/src/mage/sets/legends/RamsesOverdark.java
@@ -38,7 +38,7 @@ public class RamsesOverdark extends mage.sets.masterseditioniii.RamsesOverdark {
 
     public RamsesOverdark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/Recall.java b/Mage.Sets/src/mage/sets/legends/Recall.java
index 22f37e080f..5f1357dc89 100644
--- a/Mage.Sets/src/mage/sets/legends/Recall.java
+++ b/Mage.Sets/src/mage/sets/legends/Recall.java
@@ -37,7 +37,7 @@ public class Recall extends mage.sets.fifthedition.Recall {
 
     public Recall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/Reincarnation.java b/Mage.Sets/src/mage/sets/legends/Reincarnation.java
index f0a7b6df77..1f942bad21 100644
--- a/Mage.Sets/src/mage/sets/legends/Reincarnation.java
+++ b/Mage.Sets/src/mage/sets/legends/Reincarnation.java
@@ -37,7 +37,7 @@ public class Reincarnation extends mage.sets.commander2013.Reincarnation {
 
     public Reincarnation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/RemoveSoul.java b/Mage.Sets/src/mage/sets/legends/RemoveSoul.java
index 34583fac65..7209d432f6 100644
--- a/Mage.Sets/src/mage/sets/legends/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/legends/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/RubiniaSoulsinger.java b/Mage.Sets/src/mage/sets/legends/RubiniaSoulsinger.java
index a26b571672..b25109febe 100644
--- a/Mage.Sets/src/mage/sets/legends/RubiniaSoulsinger.java
+++ b/Mage.Sets/src/mage/sets/legends/RubiniaSoulsinger.java
@@ -37,7 +37,7 @@ public class RubiniaSoulsinger extends mage.sets.commander2013.RubiniaSoulsinger
 
     public RubiniaSoulsinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/SegovianLeviathan.java b/Mage.Sets/src/mage/sets/legends/SegovianLeviathan.java
index c044809d80..8cd3ab316e 100644
--- a/Mage.Sets/src/mage/sets/legends/SegovianLeviathan.java
+++ b/Mage.Sets/src/mage/sets/legends/SegovianLeviathan.java
@@ -37,7 +37,7 @@ public class SegovianLeviathan extends mage.sets.fifthedition.SegovianLeviathan
 
     public SegovianLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/SerpentGenerator.java b/Mage.Sets/src/mage/sets/legends/SerpentGenerator.java
index 31fd73fd02..adc27209c1 100644
--- a/Mage.Sets/src/mage/sets/legends/SerpentGenerator.java
+++ b/Mage.Sets/src/mage/sets/legends/SerpentGenerator.java
@@ -37,7 +37,7 @@ public class SerpentGenerator extends mage.sets.fifthedition.SerpentGenerator {
 
     public SerpentGenerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java
index 2eb863a76f..1c5f047576 100644
--- a/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java
+++ b/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java
@@ -38,7 +38,7 @@ public class SolkanarTheSwampKing extends mage.sets.timeshifted.SolkanarTheSwamp
 
     public SolkanarTheSwampKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/SpiritLink.java b/Mage.Sets/src/mage/sets/legends/SpiritLink.java
index 8e2b8ad74d..77ae8ea10f 100644
--- a/Mage.Sets/src/mage/sets/legends/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/legends/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/StormSeeker.java b/Mage.Sets/src/mage/sets/legends/StormSeeker.java
index 91f5494643..26123975e3 100644
--- a/Mage.Sets/src/mage/sets/legends/StormSeeker.java
+++ b/Mage.Sets/src/mage/sets/legends/StormSeeker.java
@@ -37,7 +37,7 @@ public class StormSeeker extends mage.sets.mastersedition.StormSeeker {
 
     public StormSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/SylvanLibrary.java b/Mage.Sets/src/mage/sets/legends/SylvanLibrary.java
index b6f6b40ac1..4e08996517 100644
--- a/Mage.Sets/src/mage/sets/legends/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/legends/SylvanLibrary.java
@@ -38,7 +38,7 @@ public class SylvanLibrary extends mage.sets.fifthedition.SylvanLibrary {
 
     public SylvanLibrary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/SyphonSoul.java b/Mage.Sets/src/mage/sets/legends/SyphonSoul.java
index fcd2fc2a44..a22571b1d5 100644
--- a/Mage.Sets/src/mage/sets/legends/SyphonSoul.java
+++ b/Mage.Sets/src/mage/sets/legends/SyphonSoul.java
@@ -37,7 +37,7 @@ public class SyphonSoul extends mage.sets.planechase.SyphonSoul {
 
     public SyphonSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/TheWretched.java b/Mage.Sets/src/mage/sets/legends/TheWretched.java
index 286edc703d..3c8f3140df 100644
--- a/Mage.Sets/src/mage/sets/legends/TheWretched.java
+++ b/Mage.Sets/src/mage/sets/legends/TheWretched.java
@@ -37,7 +37,7 @@ public class TheWretched extends mage.sets.fifthedition.TheWretched {
 
     public TheWretched(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/TuknirDeathlock.java b/Mage.Sets/src/mage/sets/legends/TuknirDeathlock.java
index 2de2bf7ac4..373eb4c950 100644
--- a/Mage.Sets/src/mage/sets/legends/TuknirDeathlock.java
+++ b/Mage.Sets/src/mage/sets/legends/TuknirDeathlock.java
@@ -38,7 +38,7 @@ public class TuknirDeathlock extends mage.sets.masterseditioniii.TuknirDeathlock
 
     public TuknirDeathlock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/TundraWolves.java b/Mage.Sets/src/mage/sets/legends/TundraWolves.java
index 812dafcfb7..43495a624a 100644
--- a/Mage.Sets/src/mage/sets/legends/TundraWolves.java
+++ b/Mage.Sets/src/mage/sets/legends/TundraWolves.java
@@ -37,7 +37,7 @@ public class TundraWolves extends mage.sets.tenthedition.TundraWolves {
 
     public TundraWolves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/UnderworldDreams.java b/Mage.Sets/src/mage/sets/legends/UnderworldDreams.java
index 1936730235..4a020f24b7 100644
--- a/Mage.Sets/src/mage/sets/legends/UnderworldDreams.java
+++ b/Mage.Sets/src/mage/sets/legends/UnderworldDreams.java
@@ -38,7 +38,7 @@ public class UnderworldDreams extends mage.sets.magic2010.UnderworldDreams {
 
     public UnderworldDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/UntamedWilds.java b/Mage.Sets/src/mage/sets/legends/UntamedWilds.java
index 2010fb361b..b6d4212832 100644
--- a/Mage.Sets/src/mage/sets/legends/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/legends/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/VaevictisAsmadi.java b/Mage.Sets/src/mage/sets/legends/VaevictisAsmadi.java
index 9b5303fc0b..12d205b366 100644
--- a/Mage.Sets/src/mage/sets/legends/VaevictisAsmadi.java
+++ b/Mage.Sets/src/mage/sets/legends/VaevictisAsmadi.java
@@ -37,7 +37,7 @@ public class VaevictisAsmadi extends mage.sets.masterseditioniii.VaevictisAsmadi
 
     public VaevictisAsmadi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/VampireBats.java b/Mage.Sets/src/mage/sets/legends/VampireBats.java
index bed216470a..6bea91d124 100644
--- a/Mage.Sets/src/mage/sets/legends/VampireBats.java
+++ b/Mage.Sets/src/mage/sets/legends/VampireBats.java
@@ -37,7 +37,7 @@ public class VampireBats extends mage.sets.fifthedition.VampireBats {
 
     public VampireBats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legends/WallOfLight.java b/Mage.Sets/src/mage/sets/legends/WallOfLight.java
index 2246d32ff4..546ea85f76 100644
--- a/Mage.Sets/src/mage/sets/legends/WallOfLight.java
+++ b/Mage.Sets/src/mage/sets/legends/WallOfLight.java
@@ -38,7 +38,7 @@ public class WallOfLight extends mage.sets.masterseditioniii.WallOfLight {
 
     public WallOfLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/WallOfWonder.java b/Mage.Sets/src/mage/sets/legends/WallOfWonder.java
index a03cf022f0..6957ef852c 100644
--- a/Mage.Sets/src/mage/sets/legends/WallOfWonder.java
+++ b/Mage.Sets/src/mage/sets/legends/WallOfWonder.java
@@ -39,7 +39,7 @@ public class WallOfWonder extends mage.sets.seventhedition.WallOfWonder {
 
     public WallOfWonder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/WhirlingDervish.java b/Mage.Sets/src/mage/sets/legends/WhirlingDervish.java
index a48c9beccd..9b9d05cfa3 100644
--- a/Mage.Sets/src/mage/sets/legends/WhirlingDervish.java
+++ b/Mage.Sets/src/mage/sets/legends/WhirlingDervish.java
@@ -38,7 +38,7 @@ public class WhirlingDervish extends mage.sets.timeshifted.WhirlingDervish {
 
     public WhirlingDervish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/WindsOfChange.java b/Mage.Sets/src/mage/sets/legends/WindsOfChange.java
index 6fc984605e..55683b5dd9 100644
--- a/Mage.Sets/src/mage/sets/legends/WindsOfChange.java
+++ b/Mage.Sets/src/mage/sets/legends/WindsOfChange.java
@@ -38,7 +38,7 @@ public class WindsOfChange extends mage.sets.fifthedition.WindsOfChange {
 
     public WindsOfChange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "LEG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legends/ZephyrFalcon.java b/Mage.Sets/src/mage/sets/legends/ZephyrFalcon.java
index dfd62f7999..a40b236b9a 100644
--- a/Mage.Sets/src/mage/sets/legends/ZephyrFalcon.java
+++ b/Mage.Sets/src/mage/sets/legends/ZephyrFalcon.java
@@ -37,7 +37,7 @@ public class ZephyrFalcon extends mage.sets.fifthedition.ZephyrFalcon {
 
     public ZephyrFalcon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "LEG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/legions/AkromaAngelOfWrath.java
index 622d84e1ce..f1558adac7 100644
--- a/Mage.Sets/src/mage/sets/legions/AkromaAngelOfWrath.java
+++ b/Mage.Sets/src/mage/sets/legions/AkromaAngelOfWrath.java
@@ -38,7 +38,7 @@ public class AkromaAngelOfWrath extends mage.sets.timeshifted.AkromaAngelOfWrath
 
     public AkromaAngelOfWrath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "LGN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java b/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java
index 89d6e431aa..ca312d95f4 100644
--- a/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java
+++ b/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java
@@ -37,7 +37,7 @@ public class ChromeshellCrab extends mage.sets.commander.ChromeshellCrab {
 
     public ChromeshellCrab(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/Clickslither.java b/Mage.Sets/src/mage/sets/legions/Clickslither.java
index 112094c39f..a57b44e532 100644
--- a/Mage.Sets/src/mage/sets/legions/Clickslither.java
+++ b/Mage.Sets/src/mage/sets/legions/Clickslither.java
@@ -37,7 +37,7 @@ public class Clickslither extends mage.sets.elvesvsgoblins.Clickslither {
 
     public Clickslither(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/CorpseHarvester.java b/Mage.Sets/src/mage/sets/legions/CorpseHarvester.java
index 027ee6bb30..48280de89d 100644
--- a/Mage.Sets/src/mage/sets/legions/CorpseHarvester.java
+++ b/Mage.Sets/src/mage/sets/legions/CorpseHarvester.java
@@ -37,7 +37,7 @@ public class CorpseHarvester extends mage.sets.planechase.CorpseHarvester {
 
     public CorpseHarvester(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/DeftbladeElite.java b/Mage.Sets/src/mage/sets/legions/DeftbladeElite.java
index 757cd6d81c..8f434a4b31 100644
--- a/Mage.Sets/src/mage/sets/legions/DeftbladeElite.java
+++ b/Mage.Sets/src/mage/sets/legions/DeftbladeElite.java
@@ -37,7 +37,7 @@ public class DeftbladeElite extends mage.sets.vintagemasters.DeftbladeElite {
 
     public DeftbladeElite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/EchoTracer.java b/Mage.Sets/src/mage/sets/legions/EchoTracer.java
index 80d6db49a3..ee3f5ecbcf 100644
--- a/Mage.Sets/src/mage/sets/legions/EchoTracer.java
+++ b/Mage.Sets/src/mage/sets/legions/EchoTracer.java
@@ -37,7 +37,7 @@ public class EchoTracer extends mage.sets.speedvscunning.EchoTracer {
 
     public EchoTracer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/EnormousBaloth.java b/Mage.Sets/src/mage/sets/legions/EnormousBaloth.java
index e59b6f2b19..17f4ed354e 100644
--- a/Mage.Sets/src/mage/sets/legions/EnormousBaloth.java
+++ b/Mage.Sets/src/mage/sets/legions/EnormousBaloth.java
@@ -37,7 +37,7 @@ public class EnormousBaloth extends mage.sets.magic2010.EnormousBaloth {
 
     public EnormousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/EssenceSliver.java b/Mage.Sets/src/mage/sets/legions/EssenceSliver.java
index fcc4e8ef7e..3630d5be7e 100644
--- a/Mage.Sets/src/mage/sets/legions/EssenceSliver.java
+++ b/Mage.Sets/src/mage/sets/legions/EssenceSliver.java
@@ -38,7 +38,7 @@ public class EssenceSliver extends mage.sets.timeshifted.EssenceSliver {
 
     public EssenceSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "LGN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legions/FeralThrowback.java b/Mage.Sets/src/mage/sets/legions/FeralThrowback.java
index d7e4944edf..287f4eb503 100644
--- a/Mage.Sets/src/mage/sets/legions/FeralThrowback.java
+++ b/Mage.Sets/src/mage/sets/legions/FeralThrowback.java
@@ -38,7 +38,7 @@ public class FeralThrowback extends mage.sets.prereleaseevents.FeralThrowback {
 
     public FeralThrowback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "LGN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java
index c8ed5ec894..98f4951f97 100644
--- a/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java
+++ b/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java
@@ -38,7 +38,7 @@ public class FlamewaveInvoker extends mage.sets.tenthedition.FlamewaveInvoker {
 
     public FlamewaveInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "LGN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legions/FugitiveWizard.java b/Mage.Sets/src/mage/sets/legions/FugitiveWizard.java
index 2511f2f9e8..f94ed22a88 100644
--- a/Mage.Sets/src/mage/sets/legions/FugitiveWizard.java
+++ b/Mage.Sets/src/mage/sets/legions/FugitiveWizard.java
@@ -37,7 +37,7 @@ public class FugitiveWizard extends mage.sets.tenthedition.FugitiveWizard {
 
     public FugitiveWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/GempalmStrider.java b/Mage.Sets/src/mage/sets/legions/GempalmStrider.java
index 50a8f604be..cdd4775385 100644
--- a/Mage.Sets/src/mage/sets/legions/GempalmStrider.java
+++ b/Mage.Sets/src/mage/sets/legions/GempalmStrider.java
@@ -37,7 +37,7 @@ public class GempalmStrider extends mage.sets.elvesvsgoblins.GempalmStrider {
 
     public GempalmStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/GravebornMuse.java b/Mage.Sets/src/mage/sets/legions/GravebornMuse.java
index 4459c2bb39..1902ad7e50 100644
--- a/Mage.Sets/src/mage/sets/legions/GravebornMuse.java
+++ b/Mage.Sets/src/mage/sets/legions/GravebornMuse.java
@@ -37,7 +37,7 @@ public class GravebornMuse extends mage.sets.tenthedition.GravebornMuse {
 
     public GravebornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/ImperialHellkite.java b/Mage.Sets/src/mage/sets/legions/ImperialHellkite.java
index 6a3e96faf3..0fc29a8882 100644
--- a/Mage.Sets/src/mage/sets/legions/ImperialHellkite.java
+++ b/Mage.Sets/src/mage/sets/legions/ImperialHellkite.java
@@ -37,7 +37,7 @@ public class ImperialHellkite extends mage.sets.archenemy.ImperialHellkite {
 
     public ImperialHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/KilnmouthDragon.java b/Mage.Sets/src/mage/sets/legions/KilnmouthDragon.java
index ba4f9bdf5c..a27ccbd9f3 100644
--- a/Mage.Sets/src/mage/sets/legions/KilnmouthDragon.java
+++ b/Mage.Sets/src/mage/sets/legions/KilnmouthDragon.java
@@ -37,7 +37,7 @@ public class KilnmouthDragon extends mage.sets.knightsvsdragons.KilnmouthDragon
 
     public KilnmouthDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/KrosanCloudscraper.java b/Mage.Sets/src/mage/sets/legions/KrosanCloudscraper.java
index edf4f60023..05224c95bc 100644
--- a/Mage.Sets/src/mage/sets/legions/KrosanCloudscraper.java
+++ b/Mage.Sets/src/mage/sets/legions/KrosanCloudscraper.java
@@ -38,7 +38,7 @@ public class KrosanCloudscraper extends mage.sets.timeshifted.KrosanCloudscraper
 
     public KrosanCloudscraper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "LGN";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/legions/KrosanVorine.java b/Mage.Sets/src/mage/sets/legions/KrosanVorine.java
index 03790aa82e..e3bac8bdb1 100644
--- a/Mage.Sets/src/mage/sets/legions/KrosanVorine.java
+++ b/Mage.Sets/src/mage/sets/legions/KrosanVorine.java
@@ -37,7 +37,7 @@ public class KrosanVorine extends mage.sets.vintagemasters.KrosanVorine {
 
     public KrosanVorine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/LavabornMuse.java b/Mage.Sets/src/mage/sets/legions/LavabornMuse.java
index 20948d6ccc..906272b619 100644
--- a/Mage.Sets/src/mage/sets/legions/LavabornMuse.java
+++ b/Mage.Sets/src/mage/sets/legions/LavabornMuse.java
@@ -37,7 +37,7 @@ public class LavabornMuse extends mage.sets.sorinvstibalt.LavabornMuse {
 
     public LavabornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/NoxiousGhoul.java b/Mage.Sets/src/mage/sets/legions/NoxiousGhoul.java
index 5ff6a646ca..62fda47325 100644
--- a/Mage.Sets/src/mage/sets/legions/NoxiousGhoul.java
+++ b/Mage.Sets/src/mage/sets/legions/NoxiousGhoul.java
@@ -37,7 +37,7 @@ public class NoxiousGhoul extends mage.sets.planechase.NoxiousGhoul {
 
     public NoxiousGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/PhageTheUntouchable.java b/Mage.Sets/src/mage/sets/legions/PhageTheUntouchable.java
index eabda5035e..f62d4f6d19 100644
--- a/Mage.Sets/src/mage/sets/legions/PhageTheUntouchable.java
+++ b/Mage.Sets/src/mage/sets/legions/PhageTheUntouchable.java
@@ -37,7 +37,7 @@ public class PhageTheUntouchable extends mage.sets.tenthedition.PhageTheUntoucha
 
     public PhageTheUntouchable(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/SeedbornMuse.java b/Mage.Sets/src/mage/sets/legions/SeedbornMuse.java
index 82f15f2ae5..61826fea3f 100644
--- a/Mage.Sets/src/mage/sets/legions/SeedbornMuse.java
+++ b/Mage.Sets/src/mage/sets/legions/SeedbornMuse.java
@@ -37,7 +37,7 @@ public class SeedbornMuse extends mage.sets.ninthedition.SeedbornMuse {
 
     public SeedbornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/SkirkDrillSergeant.java b/Mage.Sets/src/mage/sets/legions/SkirkDrillSergeant.java
index 63efdd2d69..facf15562e 100644
--- a/Mage.Sets/src/mage/sets/legions/SkirkDrillSergeant.java
+++ b/Mage.Sets/src/mage/sets/legions/SkirkDrillSergeant.java
@@ -37,7 +37,7 @@ public class SkirkDrillSergeant extends mage.sets.elvesvsgoblins.SkirkDrillSerge
 
     public SkirkDrillSergeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java b/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java
index 12a3db7be9..51bef69722 100644
--- a/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java
+++ b/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java
@@ -38,7 +38,7 @@ public class StarlightInvoker extends mage.sets.tenthedition.StarlightInvoker {
 
     public StarlightInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "LGN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/legions/StoicChampion.java b/Mage.Sets/src/mage/sets/legions/StoicChampion.java
index 47bb9c3a8f..9e7223ea5a 100644
--- a/Mage.Sets/src/mage/sets/legions/StoicChampion.java
+++ b/Mage.Sets/src/mage/sets/legions/StoicChampion.java
@@ -37,7 +37,7 @@ public class StoicChampion extends mage.sets.vintagemasters.StoicChampion {
 
     public StoicChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/StonewoodInvoker.java b/Mage.Sets/src/mage/sets/legions/StonewoodInvoker.java
index 6a5b7283fb..bb71713a5b 100644
--- a/Mage.Sets/src/mage/sets/legions/StonewoodInvoker.java
+++ b/Mage.Sets/src/mage/sets/legions/StonewoodInvoker.java
@@ -37,7 +37,7 @@ public class StonewoodInvoker extends mage.sets.elvesvsgoblins.StonewoodInvoker
 
     public StonewoodInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/TimberwatchElf.java b/Mage.Sets/src/mage/sets/legions/TimberwatchElf.java
index 1b9cb95937..0154f94ce0 100644
--- a/Mage.Sets/src/mage/sets/legions/TimberwatchElf.java
+++ b/Mage.Sets/src/mage/sets/legions/TimberwatchElf.java
@@ -37,7 +37,7 @@ public class TimberwatchElf extends mage.sets.elvesvsgoblins.TimberwatchElf {
 
     public TimberwatchElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/VoidmageApprentice.java b/Mage.Sets/src/mage/sets/legions/VoidmageApprentice.java
index ee6b984635..c4b0f92127 100644
--- a/Mage.Sets/src/mage/sets/legions/VoidmageApprentice.java
+++ b/Mage.Sets/src/mage/sets/legions/VoidmageApprentice.java
@@ -37,7 +37,7 @@ public class VoidmageApprentice extends mage.sets.anthologyjacevschandra.Voidmag
 
     public VoidmageApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/WallOfDeceit.java b/Mage.Sets/src/mage/sets/legions/WallOfDeceit.java
index 5fb5480b78..3e917efdbe 100644
--- a/Mage.Sets/src/mage/sets/legions/WallOfDeceit.java
+++ b/Mage.Sets/src/mage/sets/legions/WallOfDeceit.java
@@ -37,7 +37,7 @@ public class WallOfDeceit extends mage.sets.anthologyjacevschandra.WallOfDeceit
 
     public WallOfDeceit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/WhiteKnight.java b/Mage.Sets/src/mage/sets/legions/WhiteKnight.java
index c380058d50..ebb9aa35c2 100644
--- a/Mage.Sets/src/mage/sets/legions/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/legions/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/Willbender.java b/Mage.Sets/src/mage/sets/legions/Willbender.java
index 74e37ac562..9ad3d2d7b9 100644
--- a/Mage.Sets/src/mage/sets/legions/Willbender.java
+++ b/Mage.Sets/src/mage/sets/legions/Willbender.java
@@ -37,7 +37,7 @@ public class Willbender extends mage.sets.commander2014.Willbender {
 
     public Willbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/WindbornMuse.java b/Mage.Sets/src/mage/sets/legions/WindbornMuse.java
index 8e53fcff8f..4612c12d89 100644
--- a/Mage.Sets/src/mage/sets/legions/WindbornMuse.java
+++ b/Mage.Sets/src/mage/sets/legions/WindbornMuse.java
@@ -37,7 +37,7 @@ public class WindbornMuse extends mage.sets.tenthedition.WindbornMuse {
 
     public WindbornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/legions/WitheredWretch.java b/Mage.Sets/src/mage/sets/legions/WitheredWretch.java
index a0d0ff76d2..cf6fc94165 100644
--- a/Mage.Sets/src/mage/sets/legions/WitheredWretch.java
+++ b/Mage.Sets/src/mage/sets/legions/WitheredWretch.java
@@ -37,7 +37,7 @@ public class WitheredWretch extends mage.sets.planechase.WitheredWretch {
 
     public WitheredWretch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "LGN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AirElemental.java b/Mage.Sets/src/mage/sets/limitedalpha/AirElemental.java
index 86f99f55d6..7d8a23fb7c 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Armageddon.java b/Mage.Sets/src/mage/sets/limitedalpha/Armageddon.java
index 0640791b9c..59f3858216 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BadMoon.java b/Mage.Sets/src/mage/sets/limitedalpha/BadMoon.java
index 18b8d9ddbf..33067b6c02 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Balance.java b/Mage.Sets/src/mage/sets/limitedalpha/Balance.java
index 11000a181c..a85e9e6758 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Balance.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Balance.java
@@ -37,7 +37,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/limitedalpha/BirdsOfParadise.java
index 1c32c9f385..305d48cfb7 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BlackKnight.java b/Mage.Sets/src/mage/sets/limitedalpha/BlackKnight.java
index 430b5496ef..de62ee3728 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BlackWard.java b/Mage.Sets/src/mage/sets/limitedalpha/BlackWard.java
index 2921718734..6e0118d23c 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/BlackWard.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/BlackWard.java
@@ -37,7 +37,7 @@ public class BlackWard extends mage.sets.revisededition.BlackWard {
 
     public BlackWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Blessing.java b/Mage.Sets/src/mage/sets/limitedalpha/Blessing.java
index bef23168ae..1832ce4356 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Blessing.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Blessing.java
@@ -37,7 +37,7 @@ public class Blessing extends mage.sets.fourthedition.Blessing {
 
     public Blessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BlueWard.java b/Mage.Sets/src/mage/sets/limitedalpha/BlueWard.java
index 696c3cc937..fdc4ccb34e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/BlueWard.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/BlueWard.java
@@ -37,7 +37,7 @@ public class BlueWard extends mage.sets.unlimitededition.BlueWard {
 
     public BlueWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BogWraith.java b/Mage.Sets/src/mage/sets/limitedalpha/BogWraith.java
index e932f3173b..d04db9c99b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Channel.java b/Mage.Sets/src/mage/sets/limitedalpha/Channel.java
index dcc52a5254..c4a5a0fd3e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Channel.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Channel.java
@@ -37,7 +37,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Chaoslace.java b/Mage.Sets/src/mage/sets/limitedalpha/Chaoslace.java
index 0c9258bab6..cff0d727c7 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Chaoslace.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Chaoslace.java
@@ -37,7 +37,7 @@ public class Chaoslace extends mage.sets.fourthedition.Chaoslace {
 
     public Chaoslace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionBlue.java
index 3aade26d5a..6b5f50884a 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionGreen.java
index 27128f7f32..40638fa2d8 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionRed.java
index ba24fcffdd..d1f4e6acd6 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionWhite.java
index a20c4095c9..a79f0a4478 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Clone.java b/Mage.Sets/src/mage/sets/limitedalpha/Clone.java
index 0fceb6ddba..1d78ba8cb0 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Clone.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Clone.java
@@ -38,7 +38,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java b/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java
index 6a1ed7bffc..ab4cd9bf1d 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CrawWurm.java b/Mage.Sets/src/mage/sets/limitedalpha/CrawWurm.java
index eecd52cfad..aec67f85fb 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Crusade.java b/Mage.Sets/src/mage/sets/limitedalpha/Crusade.java
index 7ce413f7bb..5429c1cd87 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Crusade.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CursedLand.java b/Mage.Sets/src/mage/sets/limitedalpha/CursedLand.java
index fab278499d..b4bbc8964d 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CursedLand.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CursedLand.java
@@ -37,7 +37,7 @@ public class CursedLand extends mage.sets.fourthedition.CursedLand {
 
     public CursedLand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DarkRitual.java b/Mage.Sets/src/mage/sets/limitedalpha/DarkRitual.java
index 4f7b787139..625eca3dd5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Deathgrip.java b/Mage.Sets/src/mage/sets/limitedalpha/Deathgrip.java
index 715a851e5a..4ec00f2130 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Deathgrip.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Deathgrip.java
@@ -37,7 +37,7 @@ public class Deathgrip extends mage.sets.limitedbeta.Deathgrip {
 
     public Deathgrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Deathlace.java b/Mage.Sets/src/mage/sets/limitedalpha/Deathlace.java
index 15a9f29743..abb0753a45 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Deathlace.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Deathlace.java
@@ -37,7 +37,7 @@ public class Deathlace extends mage.sets.limitedbeta.Deathlace {
 
     public Deathlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Disenchant.java b/Mage.Sets/src/mage/sets/limitedalpha/Disenchant.java
index e7475c7b3e..923bf1b8db 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DisruptingScepter.java b/Mage.Sets/src/mage/sets/limitedalpha/DisruptingScepter.java
index fbe955cf7c..b3c16ad748 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DragonWhelp.java b/Mage.Sets/src/mage/sets/limitedalpha/DragonWhelp.java
index 309e290aaf..099abc50d1 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/limitedalpha/DrudgeSkeletons.java
index c93f9e7384..b4cd1b0227 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/sets/limitedalpha/DwarvenDemolitionTeam.java
index 474a5dc7a1..866ab5ad1c 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DwarvenDemolitionTeam.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DwarvenDemolitionTeam.java
@@ -37,7 +37,7 @@ public class DwarvenDemolitionTeam extends mage.sets.eighthedition.DwarvenDemoli
 
     public DwarvenDemolitionTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DwarvenWarriors.java b/Mage.Sets/src/mage/sets/limitedalpha/DwarvenWarriors.java
index 1668159f4f..ef061ba377 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DwarvenWarriors.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DwarvenWarriors.java
@@ -37,7 +37,7 @@ public class DwarvenWarriors extends mage.sets.revisededition.DwarvenWarriors {
 
     public DwarvenWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/EarthElemental.java b/Mage.Sets/src/mage/sets/limitedalpha/EarthElemental.java
index 526124394e..262c282fc6 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/EarthElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/EarthElemental.java
@@ -37,7 +37,7 @@ public class EarthElemental extends mage.sets.tenthedition.EarthElemental {
 
     public EarthElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Earthbind.java b/Mage.Sets/src/mage/sets/limitedalpha/Earthbind.java
index 48d7f3e7f9..cc81aeb35a 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Earthbind.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Earthbind.java
@@ -37,7 +37,7 @@ public class Earthbind extends mage.sets.limitedbeta.Earthbind {
 
     public Earthbind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Earthquake.java b/Mage.Sets/src/mage/sets/limitedalpha/Earthquake.java
index b4e0dd36c1..d5959ab522 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ElvishArchers.java b/Mage.Sets/src/mage/sets/limitedalpha/ElvishArchers.java
index ef59114d65..24548d0b55 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java b/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java
index 2d70bd7cae..a4d8aca3ed 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java
@@ -38,7 +38,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Farmstead.java b/Mage.Sets/src/mage/sets/limitedalpha/Farmstead.java
index cfeafba036..75f3aba23b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Farmstead.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Farmstead.java
@@ -37,7 +37,7 @@ public class Farmstead extends mage.sets.unlimitededition.Farmstead {
 
     public Farmstead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fear.java b/Mage.Sets/src/mage/sets/limitedalpha/Fear.java
index f2d84b84b7..ea6ab53195 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Fear.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java b/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java
index f0a320dba0..94f159956b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java b/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java
index f3ac130201..73ec052530 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Firebreathing.java b/Mage.Sets/src/mage/sets/limitedalpha/Firebreathing.java
index 9bd9ec575c..9ba15a9424 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Flashfires.java b/Mage.Sets/src/mage/sets/limitedalpha/Flashfires.java
index e150c368e4..93572d93ad 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Flight.java b/Mage.Sets/src/mage/sets/limitedalpha/Flight.java
index 40b3e76731..054c44ebc7 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Flight.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fog.java b/Mage.Sets/src/mage/sets/limitedalpha/Fog.java
index beb36400eb..49327dea8d 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Fog.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ForceOfNature.java b/Mage.Sets/src/mage/sets/limitedalpha/ForceOfNature.java
index e273e458e0..c8e6bbe253 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Forcefield.java b/Mage.Sets/src/mage/sets/limitedalpha/Forcefield.java
index 9e04886c36..ace5cd585b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Forcefield.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Forcefield.java
@@ -37,7 +37,7 @@ public class Forcefield extends mage.sets.mastersedition.Forcefield {
 
     public Forcefield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fork.java b/Mage.Sets/src/mage/sets/limitedalpha/Fork.java
index 75793a58b0..41828b5eac 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Fork.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Fork.java
@@ -37,7 +37,7 @@ public class Fork extends mage.sets.limitedbeta.Fork {
 
     public Fork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GiantGrowth.java b/Mage.Sets/src/mage/sets/limitedalpha/GiantGrowth.java
index e71a46ecb4..0a885966f4 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GiantSpider.java b/Mage.Sets/src/mage/sets/limitedalpha/GiantSpider.java
index b3660582fa..9353a3a571 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java
index 33951e90a9..c41d48bedb 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java
@@ -38,7 +38,7 @@ public class GoblinBalloonBrigade extends mage.sets.magic2011.GoblinBalloonBriga
 
     public GoblinBalloonBrigade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GoblinKing.java b/Mage.Sets/src/mage/sets/limitedalpha/GoblinKing.java
index 915864b602..57b7b63606 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GraniteGargoyle.java b/Mage.Sets/src/mage/sets/limitedalpha/GraniteGargoyle.java
index 90224e962d..dc4521bcd1 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GraniteGargoyle.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GraniteGargoyle.java
@@ -37,7 +37,7 @@ public class GraniteGargoyle extends mage.sets.revisededition.GraniteGargoyle {
 
     public GraniteGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GrayOgre.java b/Mage.Sets/src/mage/sets/limitedalpha/GrayOgre.java
index a011021306..2d720123cf 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GrayOgre.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GrayOgre.java
@@ -37,7 +37,7 @@ public class GrayOgre extends mage.sets.fourthedition.GrayOgre {
 
     public GrayOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GreenWard.java b/Mage.Sets/src/mage/sets/limitedalpha/GreenWard.java
index 37d7f55638..ee8ef0ce48 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GreenWard.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GreenWard.java
@@ -37,7 +37,7 @@ public class GreenWard extends mage.sets.unlimitededition.GreenWard {
 
     public GreenWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GrizzlyBears.java b/Mage.Sets/src/mage/sets/limitedalpha/GrizzlyBears.java
index a5b85067ae..a4fa6ee819 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HealingSalve.java b/Mage.Sets/src/mage/sets/limitedalpha/HealingSalve.java
index 588ec1a404..64364cc093 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HillGiant.java b/Mage.Sets/src/mage/sets/limitedalpha/HillGiant.java
index 188fb680ed..371e3c056c 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HolyArmor.java b/Mage.Sets/src/mage/sets/limitedalpha/HolyArmor.java
index 6da3da4996..3bb6e9293f 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HolyArmor.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HolyArmor.java
@@ -37,7 +37,7 @@ public class HolyArmor extends mage.sets.fourthedition.HolyArmor {
 
     public HolyArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HolyStrength.java b/Mage.Sets/src/mage/sets/limitedalpha/HolyStrength.java
index 69a02569e2..35724c6c72 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HowlingMine.java b/Mage.Sets/src/mage/sets/limitedalpha/HowlingMine.java
index 55408ff152..b755fedf30 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/limitedalpha/HurloonMinotaur.java
index 118ab9184a..f3e0d8a752 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HurloonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HurloonMinotaur.java
@@ -37,7 +37,7 @@ public class HurloonMinotaur extends mage.sets.fifthedition.HurloonMinotaur {
 
     public HurloonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java
index a7b4f965ff..4c9c384bb6 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java
@@ -38,7 +38,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/IcyManipulator.java b/Mage.Sets/src/mage/sets/limitedalpha/IcyManipulator.java
index af7a8906a5..8edaf2f34e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/InstillEnergy.java b/Mage.Sets/src/mage/sets/limitedalpha/InstillEnergy.java
index 8e897863c1..60e9270a41 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/InstillEnergy.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/InstillEnergy.java
@@ -37,7 +37,7 @@ public class InstillEnergy extends mage.sets.fifthedition.InstillEnergy {
 
     public InstillEnergy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/limitedalpha/IronrootTreefolk.java
index 2804b20c02..92d56fd8ce 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/IronrootTreefolk.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/IronrootTreefolk.java
@@ -37,7 +37,7 @@ public class IronrootTreefolk extends mage.sets.fifthedition.IronrootTreefolk {
 
     public IronrootTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/JayemdaeTome.java b/Mage.Sets/src/mage/sets/limitedalpha/JayemdaeTome.java
index 42952357ca..0efe1a3f07 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Juggernaut.java b/Mage.Sets/src/mage/sets/limitedalpha/Juggernaut.java
index 08dd1ba529..07b61cf6e4 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Jump.java b/Mage.Sets/src/mage/sets/limitedalpha/Jump.java
index e1d838cd26..6ef7c71f70 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Jump.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Jump.java
@@ -37,7 +37,7 @@ public class Jump extends mage.sets.magic2010.Jump {
 
     public Jump(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Karma.java b/Mage.Sets/src/mage/sets/limitedalpha/Karma.java
index ad05f0c262..071692f6b1 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Karma.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Karma.java
@@ -37,7 +37,7 @@ public class Karma extends mage.sets.fifthedition.Karma {
 
     public Karma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/KeldonWarlord.java b/Mage.Sets/src/mage/sets/limitedalpha/KeldonWarlord.java
index e4709f60ae..a6b9343c49 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/KeldonWarlord.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/KeldonWarlord.java
@@ -37,7 +37,7 @@ public class KeldonWarlord extends mage.sets.unlimitededition.KeldonWarlord {
 
     public KeldonWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LibraryOfLeng.java b/Mage.Sets/src/mage/sets/limitedalpha/LibraryOfLeng.java
index 9893f07668..1eef74024f 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LibraryOfLeng.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LibraryOfLeng.java
@@ -37,7 +37,7 @@ public class LibraryOfLeng extends mage.sets.limitedbeta.LibraryOfLeng {
 
     public LibraryOfLeng(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Lich.java b/Mage.Sets/src/mage/sets/limitedalpha/Lich.java
index e289bcbd65..769b51fae2 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Lich.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Lich.java
@@ -37,7 +37,7 @@ public class Lich extends mage.sets.masterseditioniv.Lich {
 
     public Lich(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Lifeforce.java b/Mage.Sets/src/mage/sets/limitedalpha/Lifeforce.java
index 368cd90560..02572a533b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Lifeforce.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Lifeforce.java
@@ -38,7 +38,7 @@ public class Lifeforce extends mage.sets.masterseditioniv.Lifeforce {
 
     public Lifeforce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Lifetap.java b/Mage.Sets/src/mage/sets/limitedalpha/Lifetap.java
index 41f08b7ac6..882b8f7d03 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Lifetap.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Lifetap.java
@@ -37,7 +37,7 @@ public class Lifetap extends mage.sets.fifthedition.Lifetap {
 
     public Lifetap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LightningBolt.java b/Mage.Sets/src/mage/sets/limitedalpha/LightningBolt.java
index 8761e5c465..1dc3610f46 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LivingArtifact.java b/Mage.Sets/src/mage/sets/limitedalpha/LivingArtifact.java
index d5a96fe0b9..166620bf3b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LivingArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LivingArtifact.java
@@ -37,7 +37,7 @@ public class LivingArtifact extends mage.sets.fifthedition.LivingArtifact {
 
     public LivingArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LivingWall.java b/Mage.Sets/src/mage/sets/limitedalpha/LivingWall.java
index b8c919c3cf..a99db08730 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LivingWall.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LivingWall.java
@@ -37,7 +37,7 @@ public class LivingWall extends mage.sets.unlimitededition.LivingWall {
 
     public LivingWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LlanowarElves.java b/Mage.Sets/src/mage/sets/limitedalpha/LlanowarElves.java
index fd84139cd9..c9fcd95db8 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/limitedalpha/LordOfAtlantis.java
index 37a1f7b4b3..062b9daf91 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/LordOfThePit.java b/Mage.Sets/src/mage/sets/limitedalpha/LordOfThePit.java
index ed69d9bde9..fc386c0035 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Lure.java b/Mage.Sets/src/mage/sets/limitedalpha/Lure.java
index 5419a03349..a771017612 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Lure.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/limitedalpha/MahamotiDjinn.java
index 245451aa89..58ecea73bd 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ManaFlare.java b/Mage.Sets/src/mage/sets/limitedalpha/ManaFlare.java
index 54692e9c2f..3768983fc8 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ManaFlare.java
@@ -37,7 +37,7 @@ public class ManaFlare extends mage.sets.fourthedition.ManaFlare {
 
     public ManaFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Manabarbs.java b/Mage.Sets/src/mage/sets/limitedalpha/Manabarbs.java
index 89adbc8e2f..b9afa1f9b5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/limitedalpha/MerfolkOfThePearlTrident.java
index 5a297c24be..950cfb30d2 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/limitedalpha/MonssGoblinRaiders.java
index c317a92c4b..4bbfd0ebc1 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/MonssGoblinRaiders.java
@@ -37,7 +37,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/limitedalpha/NevinyrralsDisk.java
index 1693e2c452..93048558df 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Nightmare.java b/Mage.Sets/src/mage/sets/limitedalpha/Nightmare.java
index faa43bd168..8f3a3dc312 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java b/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java
index e852c21261..ac3b53a673 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java
@@ -37,7 +37,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/OrcishArtillery.java b/Mage.Sets/src/mage/sets/limitedalpha/OrcishArtillery.java
index 9fc82e4991..aaf8feb2c7 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PearledUnicorn.java b/Mage.Sets/src/mage/sets/limitedalpha/PearledUnicorn.java
index 3899bd341a..9e89c0d7d3 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PearledUnicorn.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PearledUnicorn.java
@@ -37,7 +37,7 @@ public class PearledUnicorn extends mage.sets.fifthedition.PearledUnicorn {
 
     public PearledUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Pestilence.java b/Mage.Sets/src/mage/sets/limitedalpha/Pestilence.java
index 0d68ece850..3a3df53479 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java b/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java
index 2dd9eabf26..b4814a9480 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java
@@ -37,7 +37,7 @@ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
 
     public PhantasmalForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PhantomMonster.java b/Mage.Sets/src/mage/sets/limitedalpha/PhantomMonster.java
index b68147d86c..ec44a24b18 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PhantomMonster.java
@@ -37,7 +37,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java b/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java
index 34987095ec..c36867faf5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java
@@ -37,7 +37,7 @@ public class PlagueRats extends mage.sets.unlimitededition.PlagueRats {
 
     public PlagueRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java
index 6d50e6cd66..33f787c476 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java
index 9306ecbcc5..67f28f4c31 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java
@@ -38,7 +38,7 @@ public class PsionicBlast extends mage.sets.timeshifted.PsionicBlast {
 
     public PsionicBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Purelace.java b/Mage.Sets/src/mage/sets/limitedalpha/Purelace.java
index 3651a9766c..d807997574 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Purelace.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Purelace.java
@@ -37,7 +37,7 @@ public class Purelace extends mage.sets.unlimitededition.Purelace {
 
     public Purelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RaiseDead.java b/Mage.Sets/src/mage/sets/limitedalpha/RaiseDead.java
index 709818de1b..d7848d821d 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RedWard.java b/Mage.Sets/src/mage/sets/limitedalpha/RedWard.java
index fd4d76e784..ec77c53916 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/RedWard.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/RedWard.java
@@ -37,7 +37,7 @@ public class RedWard extends mage.sets.revisededition.RedWard {
 
     public RedWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Regeneration.java b/Mage.Sets/src/mage/sets/limitedalpha/Regeneration.java
index 51440ecead..0f139c335e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Righteousness.java b/Mage.Sets/src/mage/sets/limitedalpha/Righteousness.java
index 905e88fa5e..22d2aadd20 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RodOfRuin.java b/Mage.Sets/src/mage/sets/limitedalpha/RodOfRuin.java
index c00238f846..e59650b0d5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RoyalAssassin.java b/Mage.Sets/src/mage/sets/limitedalpha/RoyalAssassin.java
index 0f836bc23f..153cde80c9 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Sacrifice.java b/Mage.Sets/src/mage/sets/limitedalpha/Sacrifice.java
index fa05562982..aaa836f711 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Sacrifice.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Sacrifice.java
@@ -37,7 +37,7 @@ public class Sacrifice extends mage.sets.unlimitededition.Sacrifice {
 
     public Sacrifice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SamiteHealer.java b/Mage.Sets/src/mage/sets/limitedalpha/SamiteHealer.java
index b0fd20fa43..19f8a536bf 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SavannahLions.java b/Mage.Sets/src/mage/sets/limitedalpha/SavannahLions.java
index 0b1177b943..d765800b2a 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SavannahLions.java
@@ -37,7 +37,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ScatheZombies.java b/Mage.Sets/src/mage/sets/limitedalpha/ScatheZombies.java
index 3fe3a64179..f21ab0dbba 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ScrybSprites.java b/Mage.Sets/src/mage/sets/limitedalpha/ScrybSprites.java
index dbc12ed4f0..dd676f4043 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java b/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java
index 07ae33e3dd..5fa02d150b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java
@@ -37,7 +37,7 @@ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
 
     public SedgeTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java b/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java
index 5592606c47..be0c54a93f 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java b/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java
index de8a15b66d..7fa6b1a1b1 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ShanodinDryads.java b/Mage.Sets/src/mage/sets/limitedalpha/ShanodinDryads.java
index a590b9a35b..110cfbe9c8 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Shatter.java b/Mage.Sets/src/mage/sets/limitedalpha/Shatter.java
index 36d956ee66..f4ab5c2d9b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Shatter.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ShivanDragon.java b/Mage.Sets/src/mage/sets/limitedalpha/ShivanDragon.java
index fd24d782e4..79dddebe3b 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SirensCall.java b/Mage.Sets/src/mage/sets/limitedalpha/SirensCall.java
index fea37e9593..6554160717 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SirensCall.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SirensCall.java
@@ -37,7 +37,7 @@ public class SirensCall extends mage.sets.fourthedition.SirensCall {
 
     public SirensCall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SolRing.java b/Mage.Sets/src/mage/sets/limitedalpha/SolRing.java
index b491c37da1..15dbb4857c 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SolRing.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Stasis.java b/Mage.Sets/src/mage/sets/limitedalpha/Stasis.java
index d762016121..b28e972918 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Stasis.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Stasis.java
@@ -37,7 +37,7 @@ public class Stasis extends mage.sets.fifthedition.Stasis {
 
     public Stasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/StealArtifact.java b/Mage.Sets/src/mage/sets/limitedalpha/StealArtifact.java
index 7292f73ec1..34a52daa0e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/StoneGiant.java b/Mage.Sets/src/mage/sets/limitedalpha/StoneGiant.java
index 3334e92160..dc962f6665 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/StoneRain.java b/Mage.Sets/src/mage/sets/limitedalpha/StoneRain.java
index d212709db4..79d0b0c5ee 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/StreamOfLife.java b/Mage.Sets/src/mage/sets/limitedalpha/StreamOfLife.java
index 9f58847586..10b603d9b4 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/limitedalpha/SwordsToPlowshares.java
index 48b938e32a..dd00f213f4 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Terror.java b/Mage.Sets/src/mage/sets/limitedalpha/Terror.java
index 1bad3c4ab4..126a78c9bd 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Terror.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/TheHive.java b/Mage.Sets/src/mage/sets/limitedalpha/TheHive.java
index 2b2af5a11a..358a3265b5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/TheHive.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Thoughtlace.java b/Mage.Sets/src/mage/sets/limitedalpha/Thoughtlace.java
index e426d3ec9f..450034759a 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Thoughtlace.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Thoughtlace.java
@@ -37,7 +37,7 @@ public class Thoughtlace extends mage.sets.limitedbeta.Thoughtlace {
 
     public Thoughtlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/TimeVault.java b/Mage.Sets/src/mage/sets/limitedalpha/TimeVault.java
index 3f8925870d..caec5a56dd 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/TimeVault.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/TimeVault.java
@@ -37,7 +37,7 @@ public class TimeVault extends mage.sets.unlimitededition.TimeVault {
 
     public TimeVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Tranquility.java b/Mage.Sets/src/mage/sets/limitedalpha/Tranquility.java
index fa8659f9f6..6fc6b0292e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Tsunami.java b/Mage.Sets/src/mage/sets/limitedalpha/Tsunami.java
index 092e447ed4..ad6815f2e5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Tsunami.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Tsunami.java
@@ -37,7 +37,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
 
     public Tsunami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Tunnel.java b/Mage.Sets/src/mage/sets/limitedalpha/Tunnel.java
index b526667ca6..e3d8e4aba9 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Tunnel.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Tunnel.java
@@ -37,7 +37,7 @@ public class Tunnel extends mage.sets.revisededition.Tunnel {
 
     public Tunnel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Twiddle.java b/Mage.Sets/src/mage/sets/limitedalpha/Twiddle.java
index dd587c133b..90f7973e4d 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Twiddle.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Twiddle.java
@@ -37,7 +37,7 @@ public class Twiddle extends mage.sets.unlimitededition.Twiddle {
 
     public Twiddle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/TwoHeadedGiantOfForiys.java b/Mage.Sets/src/mage/sets/limitedalpha/TwoHeadedGiantOfForiys.java
index d28e4f5ecf..600bff750a 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/TwoHeadedGiantOfForiys.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/TwoHeadedGiantOfForiys.java
@@ -38,7 +38,7 @@ public class TwoHeadedGiantOfForiys extends mage.sets.masterseditioniv.TwoHeaded
 
     public TwoHeadedGiantOfForiys(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "LEA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/UnholyStrength.java b/Mage.Sets/src/mage/sets/limitedalpha/UnholyStrength.java
index f2bdddc26b..ad579e9edc 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Unsummon.java b/Mage.Sets/src/mage/sets/limitedalpha/Unsummon.java
index 31cec21dd6..b985b478e9 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/limitedalpha/VerduranEnchantress.java
index 54d637c60d..d63c7cc331 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/VesuvanDoppelganger.java b/Mage.Sets/src/mage/sets/limitedalpha/VesuvanDoppelganger.java
index 032d31ae1c..21541523fd 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/VesuvanDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/VesuvanDoppelganger.java
@@ -37,7 +37,7 @@ public class VesuvanDoppelganger extends mage.sets.unlimitededition.VesuvanDoppe
 
     public VesuvanDoppelganger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/VolcanicEruption.java b/Mage.Sets/src/mage/sets/limitedalpha/VolcanicEruption.java
index cf4d8a6a71..f097cd86ca 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/VolcanicEruption.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/VolcanicEruption.java
@@ -37,7 +37,7 @@ public class VolcanicEruption extends mage.sets.unlimitededition.VolcanicEruptio
 
     public VolcanicEruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfAir.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfAir.java
index 986c8e875a..144066a07e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfBone.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfBone.java
index b515b7503e..82d4ef89d6 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfFire.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfFire.java
index c6cf46186d..001fc9c307 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfIce.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfIce.java
index 7ed9ba1e2e..4e6202bda5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfIce.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfIce.java
@@ -37,7 +37,7 @@ public class WallOfIce extends mage.sets.fourthedition.WallOfIce {
 
     public WallOfIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfStone.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfStone.java
index 88edef8bfb..48698ee72f 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfStone.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfStone.java
@@ -37,7 +37,7 @@ public class WallOfStone extends mage.sets.fifthedition.WallOfStone {
 
     public WallOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfSwords.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfSwords.java
index e04aaed243..0354f1a76e 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfWood.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfWood.java
index 828b9121a8..a5dc5f4c5c 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WallOfWood.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfWood.java
@@ -37,7 +37,7 @@ public class WallOfWood extends mage.sets.tenthedition.WallOfWood {
 
     public WallOfWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Wanderlust.java b/Mage.Sets/src/mage/sets/limitedalpha/Wanderlust.java
index 6fbd28b9ab..792daf2c93 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Wanderlust.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Wanderlust.java
@@ -37,7 +37,7 @@ public class Wanderlust extends mage.sets.unlimitededition.Wanderlust {
 
     public Wanderlust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WarMammoth.java b/Mage.Sets/src/mage/sets/limitedalpha/WarMammoth.java
index 2b355f2d17..3cfb09b160 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WarMammoth.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WarMammoth.java
@@ -37,7 +37,7 @@ public class WarMammoth extends mage.sets.fifthedition.WarMammoth {
 
     public WarMammoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WarpArtifact.java b/Mage.Sets/src/mage/sets/limitedalpha/WarpArtifact.java
index 0c9962aa3f..a7be2579ee 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WarpArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WarpArtifact.java
@@ -37,7 +37,7 @@ public class WarpArtifact extends mage.sets.fifthedition.WarpArtifact {
 
     public WarpArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WaterElemental.java b/Mage.Sets/src/mage/sets/limitedalpha/WaterElemental.java
index ce2009ebdf..fcfc8e3daa 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WaterElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WaterElemental.java
@@ -37,7 +37,7 @@ public class WaterElemental extends mage.sets.fourthedition.WaterElemental {
 
     public WaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Weakness.java b/Mage.Sets/src/mage/sets/limitedalpha/Weakness.java
index 2708289816..3449cce16a 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Weakness.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WhiteKnight.java b/Mage.Sets/src/mage/sets/limitedalpha/WhiteKnight.java
index 11cdfb3440..7039f53d73 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WhiteWard.java b/Mage.Sets/src/mage/sets/limitedalpha/WhiteWard.java
index f0d3fc0da8..7d89cb35ef 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WhiteWard.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WhiteWard.java
@@ -37,7 +37,7 @@ public class WhiteWard extends mage.sets.limitedbeta.WhiteWard {
 
     public WhiteWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WildGrowth.java b/Mage.Sets/src/mage/sets/limitedalpha/WildGrowth.java
index bf4054df94..624009ed98 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WrathOfGod.java b/Mage.Sets/src/mage/sets/limitedalpha/WrathOfGod.java
index 2eb7d49b5f..17ab65cb52 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "LEA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/AirElemental.java b/Mage.Sets/src/mage/sets/limitedbeta/AirElemental.java
index 007f336260..5a724757b3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/AncestralRecall.java b/Mage.Sets/src/mage/sets/limitedbeta/AncestralRecall.java
index 29f8c54e4e..5abbedf102 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/AncestralRecall.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/AncestralRecall.java
@@ -37,7 +37,7 @@ public class AncestralRecall extends mage.sets.limitedalpha.AncestralRecall {
 
     public AncestralRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/AnimateDead.java b/Mage.Sets/src/mage/sets/limitedbeta/AnimateDead.java
index 7da42add03..f3fc80fdd6 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/AnimateWall.java b/Mage.Sets/src/mage/sets/limitedbeta/AnimateWall.java
index 71ff8b7784..23afa26474 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/AnimateWall.java
@@ -37,7 +37,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/limitedbeta/AnkhOfMishra.java
index f63f5fc4f0..caa14d9245 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/AnkhOfMishra.java
@@ -38,7 +38,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Armageddon.java b/Mage.Sets/src/mage/sets/limitedbeta/Armageddon.java
index 77a7aae9ba..3d4c3e56a9 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/AspectOfWolf.java b/Mage.Sets/src/mage/sets/limitedbeta/AspectOfWolf.java
index 600d9ccee0..f153a4ce9b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/AspectOfWolf.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/AspectOfWolf.java
@@ -38,7 +38,7 @@ public class AspectOfWolf extends mage.sets.limitedalpha.AspectOfWolf {
 
     public AspectOfWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BadMoon.java b/Mage.Sets/src/mage/sets/limitedbeta/BadMoon.java
index f0fa677dc3..07bb6fd344 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Badlands.java b/Mage.Sets/src/mage/sets/limitedbeta/Badlands.java
index 5eaf6cf5fc..9df6c79699 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Badlands.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Badlands.java
@@ -37,7 +37,7 @@ public class Badlands extends mage.sets.limitedalpha.Badlands {
 
     public Badlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BasaltMonolith.java b/Mage.Sets/src/mage/sets/limitedbeta/BasaltMonolith.java
index 9f0466dfaf..6b036b1463 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BasaltMonolith.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BasaltMonolith.java
@@ -37,7 +37,7 @@ public class BasaltMonolith extends mage.sets.limitedalpha.BasaltMonolith {
 
     public BasaltMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Bayou.java b/Mage.Sets/src/mage/sets/limitedbeta/Bayou.java
index 2b80674b7b..5fdf36ffc2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Bayou.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Bayou.java
@@ -37,7 +37,7 @@ public class Bayou extends mage.sets.limitedalpha.Bayou {
 
     public Bayou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Berserk.java b/Mage.Sets/src/mage/sets/limitedbeta/Berserk.java
index 8fcf9bd307..d0520a0c52 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Berserk.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Berserk.java
@@ -37,7 +37,7 @@ public class Berserk extends mage.sets.limitedalpha.Berserk {
 
     public Berserk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/limitedbeta/BirdsOfParadise.java
index 1ecb2a8459..1a3daecdf9 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BlackKnight.java b/Mage.Sets/src/mage/sets/limitedbeta/BlackKnight.java
index 7babf50685..74b2ed0eab 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BlackLotus.java b/Mage.Sets/src/mage/sets/limitedbeta/BlackLotus.java
index 9adbe416d9..1bf1bbd9ad 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BlackLotus.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BlackLotus.java
@@ -37,7 +37,7 @@ public class BlackLotus extends mage.sets.limitedalpha.BlackLotus {
 
     public BlackLotus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BlackVise.java b/Mage.Sets/src/mage/sets/limitedbeta/BlackVise.java
index c2e16e2f51..f32755d757 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BlackVise.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BlackVise.java
@@ -37,7 +37,7 @@ public class BlackVise extends mage.sets.limitedalpha.BlackVise {
 
     public BlackVise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BlackWard.java b/Mage.Sets/src/mage/sets/limitedbeta/BlackWard.java
index 125315cfff..b22cb1ffb2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BlackWard.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BlackWard.java
@@ -37,7 +37,7 @@ public class BlackWard extends mage.sets.revisededition.BlackWard {
 
     public BlackWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Blessing.java b/Mage.Sets/src/mage/sets/limitedbeta/Blessing.java
index 7d9d611773..4ec5e9cf02 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Blessing.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Blessing.java
@@ -37,7 +37,7 @@ public class Blessing extends mage.sets.fourthedition.Blessing {
 
     public Blessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/limitedbeta/BlueElementalBlast.java
index 424e54b7f5..b059609db8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BlueElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BlueElementalBlast.java
@@ -37,7 +37,7 @@ public class BlueElementalBlast extends mage.sets.limitedalpha.BlueElementalBlas
 
     public BlueElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BlueWard.java b/Mage.Sets/src/mage/sets/limitedbeta/BlueWard.java
index 9fd06509da..bc73f3435d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BlueWard.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BlueWard.java
@@ -37,7 +37,7 @@ public class BlueWard extends mage.sets.unlimitededition.BlueWard {
 
     public BlueWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/BogWraith.java b/Mage.Sets/src/mage/sets/limitedbeta/BogWraith.java
index afb57331b3..8d99544a51 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Braingeyser.java b/Mage.Sets/src/mage/sets/limitedbeta/Braingeyser.java
index 2235f5f581..5c7f2890a9 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Braingeyser.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Braingeyser.java
@@ -38,7 +38,7 @@ public class Braingeyser extends mage.sets.limitedalpha.Braingeyser {
 
     public Braingeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Burrowing.java b/Mage.Sets/src/mage/sets/limitedbeta/Burrowing.java
index 565db182d7..aa754abd7d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Burrowing.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Burrowing.java
@@ -38,7 +38,7 @@ public class Burrowing extends mage.sets.limitedalpha.Burrowing {
 
     public Burrowing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Castle.java b/Mage.Sets/src/mage/sets/limitedbeta/Castle.java
index f1fadc54c5..f8b740c66f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Castle.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CelestialPrism.java b/Mage.Sets/src/mage/sets/limitedbeta/CelestialPrism.java
index 0586e10d05..43d9c4b8d8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CelestialPrism.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CelestialPrism.java
@@ -37,7 +37,7 @@ public class CelestialPrism extends mage.sets.limitedalpha.CelestialPrism {
 
     public CelestialPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Channel.java b/Mage.Sets/src/mage/sets/limitedbeta/Channel.java
index 90f4f9dcbd..1a0c251b0c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Channel.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Channel.java
@@ -37,7 +37,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Chaoslace.java b/Mage.Sets/src/mage/sets/limitedbeta/Chaoslace.java
index 5dd7ab9c79..9adfd73207 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Chaoslace.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Chaoslace.java
@@ -37,7 +37,7 @@ public class Chaoslace extends mage.sets.fourthedition.Chaoslace {
 
     public Chaoslace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlack.java
index 4b325c3598..10a069f483 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlue.java
index 05e338ff84..aff309a4b3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionGreen.java
index e9bf95bffa..5e10cf3936 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionRed.java
index c57d84bda1..9dbf0b39d2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionWhite.java
index 14be7d89a0..dc80f9cce7 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ClockworkBeast.java b/Mage.Sets/src/mage/sets/limitedbeta/ClockworkBeast.java
index 08b3d33c9e..b5e1d0c85f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ClockworkBeast.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ClockworkBeast.java
@@ -37,7 +37,7 @@ public class ClockworkBeast extends mage.sets.limitedalpha.ClockworkBeast {
 
     public ClockworkBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Clone.java b/Mage.Sets/src/mage/sets/limitedbeta/Clone.java
index dd89087f71..6ccdad80d5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Clone.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Clone.java
@@ -38,7 +38,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Cockatrice.java b/Mage.Sets/src/mage/sets/limitedbeta/Cockatrice.java
index 1239af9de7..fcb1b4981d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Cockatrice.java
@@ -37,7 +37,7 @@ public class Cockatrice extends mage.sets.limitedalpha.Cockatrice {
 
     public Cockatrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Conservator.java b/Mage.Sets/src/mage/sets/limitedbeta/Conservator.java
index 574207d20c..9e9ece3aac 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Conservator.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Conservator.java
@@ -38,7 +38,7 @@ public class Conservator extends mage.sets.limitedalpha.Conservator {
 
     public Conservator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ControlMagic.java b/Mage.Sets/src/mage/sets/limitedbeta/ControlMagic.java
index a6105ff1fa..61c7db2c16 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Conversion.java b/Mage.Sets/src/mage/sets/limitedbeta/Conversion.java
index ba47bbc38c..2688857876 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Conversion.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Conversion.java
@@ -37,7 +37,7 @@ public class Conversion extends mage.sets.limitedalpha.Conversion {
 
     public Conversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CopperTablet.java b/Mage.Sets/src/mage/sets/limitedbeta/CopperTablet.java
index a81d1c5935..385c477ef4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CopperTablet.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CopperTablet.java
@@ -38,7 +38,7 @@ public class CopperTablet extends mage.sets.limitedalpha.CopperTablet {
 
     public CopperTablet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CopyArtifact.java b/Mage.Sets/src/mage/sets/limitedbeta/CopyArtifact.java
index 4124436ccd..e066f54bb6 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CopyArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CopyArtifact.java
@@ -38,7 +38,7 @@ public class CopyArtifact extends mage.sets.limitedalpha.CopyArtifact {
 
     public CopyArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java b/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java
index faf9560c20..47129c701c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CrawWurm.java b/Mage.Sets/src/mage/sets/limitedbeta/CrawWurm.java
index 4977e8d33c..eb4a9a8795 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Crusade.java b/Mage.Sets/src/mage/sets/limitedbeta/Crusade.java
index 28db5f596c..64117ee3d2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Crusade.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CrystalRod.java b/Mage.Sets/src/mage/sets/limitedbeta/CrystalRod.java
index 6b32cb2c60..ffd1ad3d95 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/CursedLand.java b/Mage.Sets/src/mage/sets/limitedbeta/CursedLand.java
index 08dad0985e..9445a5f418 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/CursedLand.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/CursedLand.java
@@ -37,7 +37,7 @@ public class CursedLand extends mage.sets.fourthedition.CursedLand {
 
     public CursedLand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DarkRitual.java b/Mage.Sets/src/mage/sets/limitedbeta/DarkRitual.java
index 7b3fdf0a2c..488a5cb463 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DeathWard.java b/Mage.Sets/src/mage/sets/limitedbeta/DeathWard.java
index 7fa02c1146..004e37f6a6 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DeathWard.java
@@ -38,7 +38,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DemonicHordes.java b/Mage.Sets/src/mage/sets/limitedbeta/DemonicHordes.java
index e69d5811b6..38eaeba135 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DemonicHordes.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DemonicHordes.java
@@ -37,7 +37,7 @@ public class DemonicHordes extends mage.sets.limitedalpha.DemonicHordes {
 
     public DemonicHordes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DemonicTutor.java b/Mage.Sets/src/mage/sets/limitedbeta/DemonicTutor.java
index 0cb097d6db..fdcfb846a0 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DemonicTutor.java
@@ -38,7 +38,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DingusEgg.java b/Mage.Sets/src/mage/sets/limitedbeta/DingusEgg.java
index ce860f4412..583a657814 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Disenchant.java b/Mage.Sets/src/mage/sets/limitedbeta/Disenchant.java
index 02a68c7fc5..adbc94e773 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Disintegrate.java b/Mage.Sets/src/mage/sets/limitedbeta/Disintegrate.java
index 3c2b7f6b5a..dfda9cfcc1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Disintegrate.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Disintegrate.java
@@ -37,7 +37,7 @@ public class Disintegrate extends mage.sets.limitedalpha.Disintegrate {
 
     public Disintegrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DisruptingScepter.java b/Mage.Sets/src/mage/sets/limitedbeta/DisruptingScepter.java
index 49ba031886..751f670f04 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DragonWhelp.java b/Mage.Sets/src/mage/sets/limitedbeta/DragonWhelp.java
index c9b9fa797e..4e98118684 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DrainLife.java b/Mage.Sets/src/mage/sets/limitedbeta/DrainLife.java
index 241e6e4afa..220c0675a8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/limitedbeta/DrudgeSkeletons.java
index 6231f2fe7d..dcb0e4d56f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/sets/limitedbeta/DwarvenDemolitionTeam.java
index 0e1a01290f..d3e2f458fe 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DwarvenDemolitionTeam.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DwarvenDemolitionTeam.java
@@ -37,7 +37,7 @@ public class DwarvenDemolitionTeam extends mage.sets.eighthedition.DwarvenDemoli
 
     public DwarvenDemolitionTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/DwarvenWarriors.java b/Mage.Sets/src/mage/sets/limitedbeta/DwarvenWarriors.java
index a1918d8f66..bad9c07b26 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/DwarvenWarriors.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/DwarvenWarriors.java
@@ -37,7 +37,7 @@ public class DwarvenWarriors extends mage.sets.revisededition.DwarvenWarriors {
 
     public DwarvenWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/EarthElemental.java b/Mage.Sets/src/mage/sets/limitedbeta/EarthElemental.java
index 7e735e8238..d4ca28d517 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/EarthElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/EarthElemental.java
@@ -37,7 +37,7 @@ public class EarthElemental extends mage.sets.tenthedition.EarthElemental {
 
     public EarthElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Earthquake.java b/Mage.Sets/src/mage/sets/limitedbeta/Earthquake.java
index 123c3d388e..9c3fda96d3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ElvishArchers.java b/Mage.Sets/src/mage/sets/limitedbeta/ElvishArchers.java
index dd91b39604..91c228df92 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java b/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java
index 44af53d7fb..931c1a1f1d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java
@@ -38,7 +38,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Farmstead.java b/Mage.Sets/src/mage/sets/limitedbeta/Farmstead.java
index a947b6b8de..1f45a5288c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Farmstead.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Farmstead.java
@@ -37,7 +37,7 @@ public class Farmstead extends mage.sets.unlimitededition.Farmstead {
 
     public Farmstead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Fastbond.java b/Mage.Sets/src/mage/sets/limitedbeta/Fastbond.java
index 026a65241e..e2d538c897 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Fastbond.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Fastbond.java
@@ -37,7 +37,7 @@ public class Fastbond extends mage.sets.limitedalpha.Fastbond {
 
     public Fastbond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Fear.java b/Mage.Sets/src/mage/sets/limitedbeta/Fear.java
index 5bc20e0783..c6d2df80e4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Fear.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Feedback.java b/Mage.Sets/src/mage/sets/limitedbeta/Feedback.java
index fb78541307..6ce2d64196 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Feedback.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Feedback.java
@@ -37,7 +37,7 @@ public class Feedback extends mage.sets.limitedalpha.Feedback {
 
     public Feedback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java b/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java
index 736bf4983b..b5ef8ad3d1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java b/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java
index e84228316e..9ecd8a45f2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Firebreathing.java b/Mage.Sets/src/mage/sets/limitedbeta/Firebreathing.java
index c1dbb5343b..4f99a579d1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Flashfires.java b/Mage.Sets/src/mage/sets/limitedbeta/Flashfires.java
index 484c20109c..3cbc5578d6 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Flight.java b/Mage.Sets/src/mage/sets/limitedbeta/Flight.java
index cf4ec56538..e4c52af17f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Flight.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Fog.java b/Mage.Sets/src/mage/sets/limitedbeta/Fog.java
index 629a9577d1..82ced68537 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Fog.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ForceOfNature.java b/Mage.Sets/src/mage/sets/limitedbeta/ForceOfNature.java
index 4c18dc059c..c3938c3813 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Forcefield.java b/Mage.Sets/src/mage/sets/limitedbeta/Forcefield.java
index 5ed2b34752..df447671e0 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Forcefield.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Forcefield.java
@@ -37,7 +37,7 @@ public class Forcefield extends mage.sets.mastersedition.Forcefield {
 
     public Forcefield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/FrozenShade.java b/Mage.Sets/src/mage/sets/limitedbeta/FrozenShade.java
index 7d3a58abce..cd5f2e7600 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/FrozenShade.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/FrozenShade.java
@@ -38,7 +38,7 @@ public class FrozenShade extends mage.sets.limitedalpha.FrozenShade {
 
     public FrozenShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Fungusaur.java b/Mage.Sets/src/mage/sets/limitedbeta/Fungusaur.java
index 3845bda4bf..122231a8b1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Fungusaur.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Fungusaur.java
@@ -37,7 +37,7 @@ public class Fungusaur extends mage.sets.limitedalpha.Fungusaur {
 
     public Fungusaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GauntletOfMight.java b/Mage.Sets/src/mage/sets/limitedbeta/GauntletOfMight.java
index 4c9f579fff..c802aad3a8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GauntletOfMight.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GauntletOfMight.java
@@ -37,7 +37,7 @@ public class GauntletOfMight extends mage.sets.limitedalpha.GauntletOfMight {
 
     public GauntletOfMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GiantGrowth.java b/Mage.Sets/src/mage/sets/limitedbeta/GiantGrowth.java
index c00e24e83a..e23696331d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GiantSpider.java b/Mage.Sets/src/mage/sets/limitedbeta/GiantSpider.java
index 7ff029d835..76bb460025 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/limitedbeta/GlassesOfUrza.java
index d07475c694..72dd65e9d8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GlassesOfUrza.java
@@ -37,7 +37,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Gloom.java b/Mage.Sets/src/mage/sets/limitedbeta/Gloom.java
index 688f1f9cf9..97dd30db2c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Gloom.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Gloom.java
@@ -37,7 +37,7 @@ public class Gloom extends mage.sets.limitedalpha.Gloom {
 
     public Gloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java
index 0d578958e3..e11ab5ee0e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java
@@ -38,7 +38,7 @@ public class GoblinBalloonBrigade extends mage.sets.magic2011.GoblinBalloonBriga
 
     public GoblinBalloonBrigade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GoblinKing.java b/Mage.Sets/src/mage/sets/limitedbeta/GoblinKing.java
index 59307bd5a4..19fa9dc2ce 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GraniteGargoyle.java b/Mage.Sets/src/mage/sets/limitedbeta/GraniteGargoyle.java
index c1c5da01db..1e48d7d35f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GraniteGargoyle.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GraniteGargoyle.java
@@ -37,7 +37,7 @@ public class GraniteGargoyle extends mage.sets.revisededition.GraniteGargoyle {
 
     public GraniteGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GrayOgre.java b/Mage.Sets/src/mage/sets/limitedbeta/GrayOgre.java
index 25d0fdbded..9416e5cb76 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GrayOgre.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GrayOgre.java
@@ -37,7 +37,7 @@ public class GrayOgre extends mage.sets.fourthedition.GrayOgre {
 
     public GrayOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GreenWard.java b/Mage.Sets/src/mage/sets/limitedbeta/GreenWard.java
index 76d7d99587..195ea2dda2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GreenWard.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GreenWard.java
@@ -37,7 +37,7 @@ public class GreenWard extends mage.sets.unlimitededition.GreenWard {
 
     public GreenWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GrizzlyBears.java b/Mage.Sets/src/mage/sets/limitedbeta/GrizzlyBears.java
index 6364f5c5a0..6bca0fe009 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HealingSalve.java b/Mage.Sets/src/mage/sets/limitedbeta/HealingSalve.java
index e5fc0295d0..ae974db466 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HillGiant.java b/Mage.Sets/src/mage/sets/limitedbeta/HillGiant.java
index c037a72f80..fb894c344f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HolyArmor.java b/Mage.Sets/src/mage/sets/limitedbeta/HolyArmor.java
index 7706b0e6bf..2e5f60c629 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HolyArmor.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HolyArmor.java
@@ -37,7 +37,7 @@ public class HolyArmor extends mage.sets.fourthedition.HolyArmor {
 
     public HolyArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HolyStrength.java b/Mage.Sets/src/mage/sets/limitedbeta/HolyStrength.java
index 0b71cf8c62..d0d2242407 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/limitedbeta/HowlFromBeyond.java
index 1c0e100766..73b5a35ad7 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HowlingMine.java b/Mage.Sets/src/mage/sets/limitedbeta/HowlingMine.java
index b705e0b020..21a7245839 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/limitedbeta/HurloonMinotaur.java
index 5db1fdc21a..c64d895dda 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HurloonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HurloonMinotaur.java
@@ -37,7 +37,7 @@ public class HurloonMinotaur extends mage.sets.fifthedition.HurloonMinotaur {
 
     public HurloonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Hurricane.java b/Mage.Sets/src/mage/sets/limitedbeta/Hurricane.java
index 86db25d8fb..38f52025c7 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Hurricane.java
@@ -37,7 +37,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java
index 4488bef8a8..75f8e0e7b5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java
@@ -38,7 +38,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IceStorm.java b/Mage.Sets/src/mage/sets/limitedbeta/IceStorm.java
index 45a9ac3a09..1ee58fcc2d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IceStorm.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IceStorm.java
@@ -37,7 +37,7 @@ public class IceStorm extends mage.sets.limitedalpha.IceStorm {
 
     public IceStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IcyManipulator.java b/Mage.Sets/src/mage/sets/limitedbeta/IcyManipulator.java
index 6b182069a2..f523209fca 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/InstillEnergy.java b/Mage.Sets/src/mage/sets/limitedbeta/InstillEnergy.java
index f5f3e6d886..60528414eb 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/InstillEnergy.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/InstillEnergy.java
@@ -37,7 +37,7 @@ public class InstillEnergy extends mage.sets.fifthedition.InstillEnergy {
 
     public InstillEnergy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Invisibility.java b/Mage.Sets/src/mage/sets/limitedbeta/Invisibility.java
index 7f933258f7..3363052ad3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Invisibility.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Invisibility.java
@@ -37,7 +37,7 @@ public class Invisibility extends mage.sets.limitedalpha.Invisibility {
 
     public Invisibility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IronStar.java b/Mage.Sets/src/mage/sets/limitedbeta/IronStar.java
index 692085b1a6..075b38b219 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IronStar.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IronclawOrcs.java b/Mage.Sets/src/mage/sets/limitedbeta/IronclawOrcs.java
index 417467da45..f5c955aeb2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IronclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IronclawOrcs.java
@@ -37,7 +37,7 @@ public class IronclawOrcs extends mage.sets.limitedalpha.IronclawOrcs {
 
     public IronclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/limitedbeta/IronrootTreefolk.java
index cd40915ff9..be8f745e46 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IronrootTreefolk.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IronrootTreefolk.java
@@ -37,7 +37,7 @@ public class IronrootTreefolk extends mage.sets.fifthedition.IronrootTreefolk {
 
     public IronrootTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IslandSanctuary.java b/Mage.Sets/src/mage/sets/limitedbeta/IslandSanctuary.java
index 878916799b..3192bb26e2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IslandSanctuary.java
@@ -37,7 +37,7 @@ public class IslandSanctuary extends mage.sets.limitedalpha.IslandSanctuary {
 
     public IslandSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/IvoryCup.java b/Mage.Sets/src/mage/sets/limitedbeta/IvoryCup.java
index a99b68cdd0..f1cce5a9e2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/JadeMonolith.java b/Mage.Sets/src/mage/sets/limitedbeta/JadeMonolith.java
index 8047ef2be6..f4767d00ae 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/JayemdaeTome.java b/Mage.Sets/src/mage/sets/limitedbeta/JayemdaeTome.java
index a20c06a04c..f683399575 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Juggernaut.java b/Mage.Sets/src/mage/sets/limitedbeta/Juggernaut.java
index b12c531692..51f8127dc1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Jump.java b/Mage.Sets/src/mage/sets/limitedbeta/Jump.java
index 7d063ff62a..4b53cf27fa 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Jump.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Jump.java
@@ -37,7 +37,7 @@ public class Jump extends mage.sets.magic2010.Jump {
 
     public Jump(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Karma.java b/Mage.Sets/src/mage/sets/limitedbeta/Karma.java
index c0ed544a7c..f35b347b68 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Karma.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Karma.java
@@ -37,7 +37,7 @@ public class Karma extends mage.sets.fifthedition.Karma {
 
     public Karma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/KeldonWarlord.java b/Mage.Sets/src/mage/sets/limitedbeta/KeldonWarlord.java
index 212e785357..2500d2ffe1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/KeldonWarlord.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/KeldonWarlord.java
@@ -37,7 +37,7 @@ public class KeldonWarlord extends mage.sets.unlimitededition.KeldonWarlord {
 
     public KeldonWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/KormusBell.java b/Mage.Sets/src/mage/sets/limitedbeta/KormusBell.java
index 083b3abacf..489ed5894a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/KormusBell.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/KormusBell.java
@@ -38,7 +38,7 @@ public class KormusBell extends mage.sets.limitedalpha.KormusBell {
 
     public KormusBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Lance.java b/Mage.Sets/src/mage/sets/limitedbeta/Lance.java
index d2a1faeea9..061e189084 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Lance.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Lance.java
@@ -37,7 +37,7 @@ public class Lance extends mage.sets.limitedalpha.Lance {
 
     public Lance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LeyDruid.java b/Mage.Sets/src/mage/sets/limitedbeta/LeyDruid.java
index 0e21babb6b..625cedaeba 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LeyDruid.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LeyDruid.java
@@ -38,7 +38,7 @@ public class LeyDruid extends mage.sets.limitedalpha.LeyDruid {
 
     public LeyDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Lich.java b/Mage.Sets/src/mage/sets/limitedbeta/Lich.java
index ed56ee64c1..542f2a0722 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Lich.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Lich.java
@@ -37,7 +37,7 @@ public class Lich extends mage.sets.masterseditioniv.Lich {
 
     public Lich(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Lifeforce.java b/Mage.Sets/src/mage/sets/limitedbeta/Lifeforce.java
index ab8e8c478d..0c7be4d381 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Lifeforce.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Lifeforce.java
@@ -38,7 +38,7 @@ public class Lifeforce extends mage.sets.masterseditioniv.Lifeforce {
 
     public Lifeforce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Lifelace.java b/Mage.Sets/src/mage/sets/limitedbeta/Lifelace.java
index e19cd0970d..0efc5dac6f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Lifelace.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Lifelace.java
@@ -37,7 +37,7 @@ public class Lifelace extends mage.sets.limitedalpha.Lifelace {
 
     public Lifelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Lifetap.java b/Mage.Sets/src/mage/sets/limitedbeta/Lifetap.java
index f4f44c452b..127d564357 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Lifetap.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Lifetap.java
@@ -37,7 +37,7 @@ public class Lifetap extends mage.sets.fifthedition.Lifetap {
 
     public Lifetap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LightningBolt.java b/Mage.Sets/src/mage/sets/limitedbeta/LightningBolt.java
index 2bcf320c63..22795e4e5a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LivingArtifact.java b/Mage.Sets/src/mage/sets/limitedbeta/LivingArtifact.java
index 0852067f92..32602bfcdd 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LivingArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LivingArtifact.java
@@ -37,7 +37,7 @@ public class LivingArtifact extends mage.sets.fifthedition.LivingArtifact {
 
     public LivingArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LivingLands.java b/Mage.Sets/src/mage/sets/limitedbeta/LivingLands.java
index 535ec618d4..5fc00fda12 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LivingWall.java b/Mage.Sets/src/mage/sets/limitedbeta/LivingWall.java
index 46fc05923c..889d8ef93e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LivingWall.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LivingWall.java
@@ -37,7 +37,7 @@ public class LivingWall extends mage.sets.unlimitededition.LivingWall {
 
     public LivingWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LlanowarElves.java b/Mage.Sets/src/mage/sets/limitedbeta/LlanowarElves.java
index 54d038c1a4..8c6af6a79b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/limitedbeta/LordOfAtlantis.java
index 972add05e8..899e88dd5e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/LordOfThePit.java b/Mage.Sets/src/mage/sets/limitedbeta/LordOfThePit.java
index fbd8af9d98..ccdbc90d9a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Lure.java b/Mage.Sets/src/mage/sets/limitedbeta/Lure.java
index 86a72d9b0e..d4e66f3f44 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Lure.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/limitedbeta/MahamotiDjinn.java
index 4ebbb3daa8..e165db5d3e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ManaFlare.java b/Mage.Sets/src/mage/sets/limitedbeta/ManaFlare.java
index 6e19107903..14bef9c841 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ManaFlare.java
@@ -37,7 +37,7 @@ public class ManaFlare extends mage.sets.fourthedition.ManaFlare {
 
     public ManaFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ManaShort.java b/Mage.Sets/src/mage/sets/limitedbeta/ManaShort.java
index a9fdf2ff2e..b9e114e85d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ManaShort.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ManaShort.java
@@ -37,7 +37,7 @@ public class ManaShort extends mage.sets.limitedalpha.ManaShort {
 
     public ManaShort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ManaVault.java b/Mage.Sets/src/mage/sets/limitedbeta/ManaVault.java
index 925655f1d5..fcbc9b6b6a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Manabarbs.java b/Mage.Sets/src/mage/sets/limitedbeta/Manabarbs.java
index b5646688a5..306187d315 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Meekstone.java b/Mage.Sets/src/mage/sets/limitedbeta/Meekstone.java
index 12c3d49ba9..e57e54a813 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/limitedbeta/MerfolkOfThePearlTrident.java
index 86a5ec8b90..b430ae4d89 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MindTwist.java b/Mage.Sets/src/mage/sets/limitedbeta/MindTwist.java
index 4c7f03006d..fdfcef6e83 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MindTwist.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MindTwist.java
@@ -37,7 +37,7 @@ public class MindTwist extends mage.sets.limitedalpha.MindTwist {
 
     public MindTwist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/limitedbeta/MonssGoblinRaiders.java
index 39d21dc3d9..5e41478acd 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MonssGoblinRaiders.java
@@ -37,7 +37,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MoxEmerald.java b/Mage.Sets/src/mage/sets/limitedbeta/MoxEmerald.java
index bc1e85de6b..e6bc148ef2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MoxEmerald.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MoxEmerald.java
@@ -37,7 +37,7 @@ public class MoxEmerald extends mage.sets.limitedalpha.MoxEmerald {
 
     public MoxEmerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MoxJet.java b/Mage.Sets/src/mage/sets/limitedbeta/MoxJet.java
index f0fcafe4f0..37f812cab7 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MoxJet.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MoxJet.java
@@ -37,7 +37,7 @@ public class MoxJet extends mage.sets.limitedalpha.MoxJet {
 
     public MoxJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MoxPearl.java b/Mage.Sets/src/mage/sets/limitedbeta/MoxPearl.java
index 5799d05f3d..0be3661e88 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MoxPearl.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MoxPearl.java
@@ -37,7 +37,7 @@ public class MoxPearl extends mage.sets.limitedalpha.MoxPearl {
 
     public MoxPearl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MoxRuby.java b/Mage.Sets/src/mage/sets/limitedbeta/MoxRuby.java
index 1a3fcbcc54..a2c7e8089c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MoxRuby.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MoxRuby.java
@@ -37,7 +37,7 @@ public class MoxRuby extends mage.sets.limitedalpha.MoxRuby {
 
     public MoxRuby(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/MoxSapphire.java b/Mage.Sets/src/mage/sets/limitedbeta/MoxSapphire.java
index 794882f2c9..14d32d91d6 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/MoxSapphire.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/MoxSapphire.java
@@ -37,7 +37,7 @@ public class MoxSapphire extends mage.sets.limitedalpha.MoxSapphire {
 
     public MoxSapphire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java b/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java
index 16ca2cca4f..c8683569c5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java
@@ -38,7 +38,7 @@ public class NaturalSelection extends mage.sets.limitedalpha.NaturalSelection {
 
     public NaturalSelection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/NetherShadow.java b/Mage.Sets/src/mage/sets/limitedbeta/NetherShadow.java
index 1df8428a05..9a11ebb00e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/NetherShadow.java
@@ -37,7 +37,7 @@ public class NetherShadow extends mage.sets.limitedalpha.NetherShadow {
 
     public NetherShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/limitedbeta/NevinyrralsDisk.java
index 31092c4572..c8a6350502 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Nightmare.java b/Mage.Sets/src/mage/sets/limitedbeta/Nightmare.java
index d3e70b654d..8da24486f5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/NorthernPaladin.java b/Mage.Sets/src/mage/sets/limitedbeta/NorthernPaladin.java
index a46acaaabe..3fd9b3e04a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/NorthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/NorthernPaladin.java
@@ -37,7 +37,7 @@ public class NorthernPaladin extends mage.sets.limitedalpha.NorthernPaladin {
 
     public NorthernPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java b/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java
index 8b244a17df..8adeffae0d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java
@@ -37,7 +37,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/OrcishArtillery.java b/Mage.Sets/src/mage/sets/limitedbeta/OrcishArtillery.java
index d44c892186..de50292d7f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/limitedbeta/OrcishOriflamme.java
index 8fefdf3cb8..275c6f8d43 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Paralyze.java b/Mage.Sets/src/mage/sets/limitedbeta/Paralyze.java
index ba83b09b16..b508e77d83 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PearledUnicorn.java b/Mage.Sets/src/mage/sets/limitedbeta/PearledUnicorn.java
index dd0dc18caa..51a3ff0e2a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PearledUnicorn.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PearledUnicorn.java
@@ -37,7 +37,7 @@ public class PearledUnicorn extends mage.sets.fifthedition.PearledUnicorn {
 
     public PearledUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Pestilence.java b/Mage.Sets/src/mage/sets/limitedbeta/Pestilence.java
index f82042e827..8bc231658f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java
index a70fbdb3a8..007e821653 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java
@@ -37,7 +37,7 @@ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
 
     public PhantasmalForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalTerrain.java
index f742419f6a..277730770b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PhantomMonster.java b/Mage.Sets/src/mage/sets/limitedbeta/PhantomMonster.java
index 0cbc5f1d4b..195085c289 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PhantomMonster.java
@@ -37,7 +37,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PirateShip.java b/Mage.Sets/src/mage/sets/limitedbeta/PirateShip.java
index da024ed8dc..508faea9f4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PirateShip.java
@@ -38,7 +38,7 @@ public class PirateShip extends mage.sets.limitedalpha.PirateShip {
 
     public PirateShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java b/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java
index 43aa7e8e22..8df1b3a5c4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java
@@ -37,7 +37,7 @@ public class PlagueRats extends mage.sets.unlimitededition.PlagueRats {
 
     public PlagueRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Plateau.java b/Mage.Sets/src/mage/sets/limitedbeta/Plateau.java
index ba47296c04..47942045d7 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Plateau.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Plateau.java
@@ -37,7 +37,7 @@ public class Plateau extends mage.sets.limitedalpha.Plateau {
 
     public Plateau(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PowerSink.java b/Mage.Sets/src/mage/sets/limitedbeta/PowerSink.java
index 8cb56edad8..c7e0cb27d0 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java
index d6403a3b85..bcbdf2bd94 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java b/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java
index 8efb9efdbc..1dae68b4af 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java
@@ -38,7 +38,7 @@ public class PsionicBlast extends mage.sets.timeshifted.PsionicBlast {
 
     public PsionicBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PsychicVenom.java b/Mage.Sets/src/mage/sets/limitedbeta/PsychicVenom.java
index a359e8fb65..30a1193e86 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PsychicVenom.java
@@ -38,7 +38,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Purelace.java b/Mage.Sets/src/mage/sets/limitedbeta/Purelace.java
index bc81190443..f7687530c4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Purelace.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Purelace.java
@@ -37,7 +37,7 @@ public class Purelace extends mage.sets.unlimitededition.Purelace {
 
     public Purelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/RaiseDead.java b/Mage.Sets/src/mage/sets/limitedbeta/RaiseDead.java
index 4593270ee9..c86c8a49e3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/RedElementalBlast.java b/Mage.Sets/src/mage/sets/limitedbeta/RedElementalBlast.java
index 757034cc14..86e048505d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/RedElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/RedElementalBlast.java
@@ -37,7 +37,7 @@ public class RedElementalBlast extends mage.sets.limitedalpha.RedElementalBlast
 
     public RedElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/RedWard.java b/Mage.Sets/src/mage/sets/limitedbeta/RedWard.java
index c252c01d6d..5cd85020d2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/RedWard.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/RedWard.java
@@ -37,7 +37,7 @@ public class RedWard extends mage.sets.revisededition.RedWard {
 
     public RedWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Regeneration.java b/Mage.Sets/src/mage/sets/limitedbeta/Regeneration.java
index 34f38f132e..8cbd656533 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java b/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java
index fad8f56726..46ed1b6ec8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java
@@ -38,7 +38,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Resurrection.java b/Mage.Sets/src/mage/sets/limitedbeta/Resurrection.java
index f4813891fe..e308da5765 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Resurrection.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Resurrection.java
@@ -38,7 +38,7 @@ public class Resurrection extends mage.sets.limitedalpha.Resurrection {
 
     public Resurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ReverseDamage.java b/Mage.Sets/src/mage/sets/limitedbeta/ReverseDamage.java
index 933c1bf027..3a6d4bd8b2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Righteousness.java b/Mage.Sets/src/mage/sets/limitedbeta/Righteousness.java
index 5eca0f0414..818f4ee78d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/RocOfKherRidges.java b/Mage.Sets/src/mage/sets/limitedbeta/RocOfKherRidges.java
index 62252d23be..e794ec9c11 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/RocOfKherRidges.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/RocOfKherRidges.java
@@ -37,7 +37,7 @@ public class RocOfKherRidges extends mage.sets.limitedalpha.RocOfKherRidges {
 
     public RocOfKherRidges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/RodOfRuin.java b/Mage.Sets/src/mage/sets/limitedbeta/RodOfRuin.java
index 1895d97a97..750e133987 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/RoyalAssassin.java b/Mage.Sets/src/mage/sets/limitedbeta/RoyalAssassin.java
index bc4b3ff8a8..ef7538497c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Sacrifice.java b/Mage.Sets/src/mage/sets/limitedbeta/Sacrifice.java
index c3f274aa03..c93d80c1f4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Sacrifice.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Sacrifice.java
@@ -37,7 +37,7 @@ public class Sacrifice extends mage.sets.unlimitededition.Sacrifice {
 
     public Sacrifice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SamiteHealer.java b/Mage.Sets/src/mage/sets/limitedbeta/SamiteHealer.java
index 157efab427..c532ecc700 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Savannah.java b/Mage.Sets/src/mage/sets/limitedbeta/Savannah.java
index a9108d470f..a5c2e4f0de 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Savannah.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Savannah.java
@@ -37,7 +37,7 @@ public class Savannah extends mage.sets.limitedalpha.Savannah {
 
     public Savannah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SavannahLions.java b/Mage.Sets/src/mage/sets/limitedbeta/SavannahLions.java
index d51c574915..e540cbbb5b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SavannahLions.java
@@ -37,7 +37,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ScatheZombies.java b/Mage.Sets/src/mage/sets/limitedbeta/ScatheZombies.java
index 3d075d49fe..423d518b1f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ScavengingGhoul.java b/Mage.Sets/src/mage/sets/limitedbeta/ScavengingGhoul.java
index 318f8693c4..e4dd1047c3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ScavengingGhoul.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ScavengingGhoul.java
@@ -37,7 +37,7 @@ public class ScavengingGhoul extends mage.sets.limitedalpha.ScavengingGhoul {
 
     public ScavengingGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Scrubland.java b/Mage.Sets/src/mage/sets/limitedbeta/Scrubland.java
index 798407e87e..bac4b251fb 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Scrubland.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Scrubland.java
@@ -37,7 +37,7 @@ public class Scrubland extends mage.sets.limitedalpha.Scrubland {
 
     public Scrubland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ScrybSprites.java b/Mage.Sets/src/mage/sets/limitedbeta/ScrybSprites.java
index 0f8f85598b..ae26cc1674 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SeaSerpent.java b/Mage.Sets/src/mage/sets/limitedbeta/SeaSerpent.java
index f7268a7860..31668f73de 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SeaSerpent.java
@@ -38,7 +38,7 @@ public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
 
     public SeaSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java b/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java
index 52f81ffef8..4c3d2b30a2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java
@@ -37,7 +37,7 @@ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
 
     public SedgeTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java b/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java
index e2c5bb5a72..a5650c5c1e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java b/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java
index 9e58ddfa57..2cad88887f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ShanodinDryads.java b/Mage.Sets/src/mage/sets/limitedbeta/ShanodinDryads.java
index beed0fb713..d5410660e1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Shatter.java b/Mage.Sets/src/mage/sets/limitedbeta/Shatter.java
index 8b170171aa..4a7f488fdd 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Shatter.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ShivanDragon.java b/Mage.Sets/src/mage/sets/limitedbeta/ShivanDragon.java
index 77b5d5d166..d5a7c6aa4d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Sinkhole.java b/Mage.Sets/src/mage/sets/limitedbeta/Sinkhole.java
index 044b4e2cd1..1d3f5162ee 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Sinkhole.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Sinkhole.java
@@ -37,7 +37,7 @@ public class Sinkhole extends mage.sets.limitedalpha.Sinkhole {
 
     public Sinkhole(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SirensCall.java b/Mage.Sets/src/mage/sets/limitedbeta/SirensCall.java
index 64167a30c5..f1d2a4a696 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SirensCall.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SirensCall.java
@@ -37,7 +37,7 @@ public class SirensCall extends mage.sets.fourthedition.SirensCall {
 
     public SirensCall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java b/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java
index a330c53c6f..30dfe9d832 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java
@@ -38,7 +38,7 @@ public class Smoke extends mage.sets.limitedalpha.Smoke {
 
     public Smoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SolRing.java b/Mage.Sets/src/mage/sets/limitedbeta/SolRing.java
index c1594ce425..3cb3454c56 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SolRing.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SoulNet.java b/Mage.Sets/src/mage/sets/limitedbeta/SoulNet.java
index 519ddea8fe..d7ad38773d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SpellBlast.java b/Mage.Sets/src/mage/sets/limitedbeta/SpellBlast.java
index f4a3c4af1e..484576ca9d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Stasis.java b/Mage.Sets/src/mage/sets/limitedbeta/Stasis.java
index 317ac231d0..d4a0515de3 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Stasis.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Stasis.java
@@ -37,7 +37,7 @@ public class Stasis extends mage.sets.fifthedition.Stasis {
 
     public Stasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/StealArtifact.java b/Mage.Sets/src/mage/sets/limitedbeta/StealArtifact.java
index e0dc879b43..e4225a5abb 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/StoneGiant.java b/Mage.Sets/src/mage/sets/limitedbeta/StoneGiant.java
index 3da066f32d..fe77e73c4b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/StoneRain.java b/Mage.Sets/src/mage/sets/limitedbeta/StoneRain.java
index 08dc4a8693..523edca19f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/StreamOfLife.java b/Mage.Sets/src/mage/sets/limitedbeta/StreamOfLife.java
index e59c98a0a0..9292fd150c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SunglassesOfUrza.java b/Mage.Sets/src/mage/sets/limitedbeta/SunglassesOfUrza.java
index 0513d0b5b3..bf59023a74 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SunglassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SunglassesOfUrza.java
@@ -37,7 +37,7 @@ public class SunglassesOfUrza extends mage.sets.limitedalpha.SunglassesOfUrza {
 
     public SunglassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/limitedbeta/SwordsToPlowshares.java
index 63bbf2f0b5..c84240e23a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Taiga.java b/Mage.Sets/src/mage/sets/limitedbeta/Taiga.java
index 014f1e3c1a..df03a7aca5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Taiga.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Taiga.java
@@ -37,7 +37,7 @@ public class Taiga extends mage.sets.limitedalpha.Taiga {
 
     public Taiga(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Terror.java b/Mage.Sets/src/mage/sets/limitedbeta/Terror.java
index 72773b0d06..3b77ca4552 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Terror.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/TheHive.java b/Mage.Sets/src/mage/sets/limitedbeta/TheHive.java
index 63a845c3a5..868fbc1d51 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/TheHive.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/limitedbeta/ThicketBasilisk.java
index 65fc72db33..ffe7428000 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ThroneOfBone.java b/Mage.Sets/src/mage/sets/limitedbeta/ThroneOfBone.java
index 14e284f6f2..ab9776b36c 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/TimeVault.java b/Mage.Sets/src/mage/sets/limitedbeta/TimeVault.java
index 820eb507bb..fdecd6065d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/TimeVault.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/TimeVault.java
@@ -37,7 +37,7 @@ public class TimeVault extends mage.sets.unlimitededition.TimeVault {
 
     public TimeVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/TimeWalk.java b/Mage.Sets/src/mage/sets/limitedbeta/TimeWalk.java
index e09ac4626e..3c32f9c212 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/TimeWalk.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/TimeWalk.java
@@ -37,7 +37,7 @@ public class TimeWalk extends mage.sets.limitedalpha.TimeWalk {
 
     public TimeWalk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Timetwister.java b/Mage.Sets/src/mage/sets/limitedbeta/Timetwister.java
index 9fd3119e2f..86b87a0478 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Timetwister.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Timetwister.java
@@ -37,7 +37,7 @@ public class Timetwister extends mage.sets.limitedalpha.Timetwister {
 
     public Timetwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Tranquility.java b/Mage.Sets/src/mage/sets/limitedbeta/Tranquility.java
index 12ecb12191..4305fdd80a 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/TropicalIsland.java b/Mage.Sets/src/mage/sets/limitedbeta/TropicalIsland.java
index 07770e2715..5ef35fd6fd 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/TropicalIsland.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/TropicalIsland.java
@@ -37,7 +37,7 @@ public class TropicalIsland extends mage.sets.limitedalpha.TropicalIsland {
 
     public TropicalIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Tsunami.java b/Mage.Sets/src/mage/sets/limitedbeta/Tsunami.java
index 097c642afb..feb03dc0f8 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Tsunami.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Tsunami.java
@@ -37,7 +37,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
 
     public Tsunami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Tundra.java b/Mage.Sets/src/mage/sets/limitedbeta/Tundra.java
index 1b844e60fd..df952e6f03 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Tundra.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Tundra.java
@@ -37,7 +37,7 @@ public class Tundra extends mage.sets.limitedalpha.Tundra {
 
     public Tundra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Tunnel.java b/Mage.Sets/src/mage/sets/limitedbeta/Tunnel.java
index 3e5f3b7f39..da5319d7c7 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Tunnel.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Tunnel.java
@@ -37,7 +37,7 @@ public class Tunnel extends mage.sets.revisededition.Tunnel {
 
     public Tunnel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Twiddle.java b/Mage.Sets/src/mage/sets/limitedbeta/Twiddle.java
index afeffdf147..d6dffc825d 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Twiddle.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Twiddle.java
@@ -37,7 +37,7 @@ public class Twiddle extends mage.sets.unlimitededition.Twiddle {
 
     public Twiddle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/TwoHeadedGiantOfForiys.java b/Mage.Sets/src/mage/sets/limitedbeta/TwoHeadedGiantOfForiys.java
index 44dc4831a9..8c0582f4e1 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/TwoHeadedGiantOfForiys.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/TwoHeadedGiantOfForiys.java
@@ -38,7 +38,7 @@ public class TwoHeadedGiantOfForiys extends mage.sets.masterseditioniv.TwoHeaded
 
     public TwoHeadedGiantOfForiys(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "LEB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/UndergroundSea.java b/Mage.Sets/src/mage/sets/limitedbeta/UndergroundSea.java
index d5079b70b7..059e6eed4b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/UndergroundSea.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/UndergroundSea.java
@@ -37,7 +37,7 @@ public class UndergroundSea extends mage.sets.limitedalpha.UndergroundSea {
 
     public UndergroundSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/UnholyStrength.java b/Mage.Sets/src/mage/sets/limitedbeta/UnholyStrength.java
index 9940324a4c..f1f8eea20e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Unsummon.java b/Mage.Sets/src/mage/sets/limitedbeta/Unsummon.java
index 14af29a432..37f645ea05 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/UthdenTroll.java b/Mage.Sets/src/mage/sets/limitedbeta/UthdenTroll.java
index 57624dec45..b7050ae931 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/UthdenTroll.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/UthdenTroll.java
@@ -37,7 +37,7 @@ public class UthdenTroll extends mage.sets.limitedalpha.UthdenTroll {
 
     public UthdenTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/limitedbeta/VerduranEnchantress.java
index 61b49bdff3..aeca754cea 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/VesuvanDoppelganger.java b/Mage.Sets/src/mage/sets/limitedbeta/VesuvanDoppelganger.java
index aa77af7c49..b46e259a68 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/VesuvanDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/VesuvanDoppelganger.java
@@ -37,7 +37,7 @@ public class VesuvanDoppelganger extends mage.sets.unlimitededition.VesuvanDoppe
 
     public VesuvanDoppelganger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/VolcanicEruption.java b/Mage.Sets/src/mage/sets/limitedbeta/VolcanicEruption.java
index beff90bd67..72e34501ed 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/VolcanicEruption.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/VolcanicEruption.java
@@ -37,7 +37,7 @@ public class VolcanicEruption extends mage.sets.unlimitededition.VolcanicEruptio
 
     public VolcanicEruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/VolcanicIsland.java b/Mage.Sets/src/mage/sets/limitedbeta/VolcanicIsland.java
index ae1edd6b1f..d6a010a40f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/VolcanicIsland.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/VolcanicIsland.java
@@ -37,7 +37,7 @@ public class VolcanicIsland extends mage.sets.unlimitededition.VolcanicIsland {
 
     public VolcanicIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfAir.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfAir.java
index 9cdf66e699..30a16aa3f2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfBone.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfBone.java
index 9be0353e22..0d3a72dee5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfBrambles.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfBrambles.java
index 2a2a9d892c..be3864c693 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfBrambles.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfBrambles.java
@@ -37,7 +37,7 @@ public class WallOfBrambles extends mage.sets.limitedalpha.WallOfBrambles {
 
     public WallOfBrambles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfFire.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfFire.java
index 83c6e81c80..7c600f8a0b 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfIce.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfIce.java
index 73af9d5b83..8d593fbe67 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfIce.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfIce.java
@@ -37,7 +37,7 @@ public class WallOfIce extends mage.sets.fourthedition.WallOfIce {
 
     public WallOfIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfStone.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfStone.java
index 3261319f08..d1e9defa40 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfStone.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfStone.java
@@ -37,7 +37,7 @@ public class WallOfStone extends mage.sets.fifthedition.WallOfStone {
 
     public WallOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfSwords.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfSwords.java
index 068b5680ad..1c14255e97 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java
index 0b548e4ae8..91b74a2c21 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java
@@ -38,7 +38,7 @@ public class WallOfWater extends mage.sets.limitedalpha.WallOfWater {
 
     public WallOfWater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfWood.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfWood.java
index 8051a56886..f4d5851630 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WallOfWood.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfWood.java
@@ -37,7 +37,7 @@ public class WallOfWood extends mage.sets.tenthedition.WallOfWood {
 
     public WallOfWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Wanderlust.java b/Mage.Sets/src/mage/sets/limitedbeta/Wanderlust.java
index 38441b18bd..b24521cbf5 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Wanderlust.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Wanderlust.java
@@ -37,7 +37,7 @@ public class Wanderlust extends mage.sets.unlimitededition.Wanderlust {
 
     public Wanderlust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WarMammoth.java b/Mage.Sets/src/mage/sets/limitedbeta/WarMammoth.java
index a2a499b2d6..325179dc48 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WarMammoth.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WarMammoth.java
@@ -37,7 +37,7 @@ public class WarMammoth extends mage.sets.fifthedition.WarMammoth {
 
     public WarMammoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WarpArtifact.java b/Mage.Sets/src/mage/sets/limitedbeta/WarpArtifact.java
index aeb1666508..fa37189077 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WarpArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WarpArtifact.java
@@ -37,7 +37,7 @@ public class WarpArtifact extends mage.sets.fifthedition.WarpArtifact {
 
     public WarpArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WaterElemental.java b/Mage.Sets/src/mage/sets/limitedbeta/WaterElemental.java
index 95584a6c84..c7aef5b6c4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WaterElemental.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WaterElemental.java
@@ -37,7 +37,7 @@ public class WaterElemental extends mage.sets.fourthedition.WaterElemental {
 
     public WaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Weakness.java b/Mage.Sets/src/mage/sets/limitedbeta/Weakness.java
index 36a895a25b..459b7c040e 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Weakness.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Web.java b/Mage.Sets/src/mage/sets/limitedbeta/Web.java
index 884b0ec194..32f4935777 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/Web.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/Web.java
@@ -38,7 +38,7 @@ public class Web extends mage.sets.limitedalpha.Web {
 
     public Web(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WheelOfFortune.java b/Mage.Sets/src/mage/sets/limitedbeta/WheelOfFortune.java
index 62dd279555..036ff11879 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WheelOfFortune.java
@@ -36,7 +36,7 @@ public class WheelOfFortune extends mage.sets.limitedalpha.WheelOfFortune {
 
     public WheelOfFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WhiteKnight.java b/Mage.Sets/src/mage/sets/limitedbeta/WhiteKnight.java
index ea961552a3..7239e6653f 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WildGrowth.java b/Mage.Sets/src/mage/sets/limitedbeta/WildGrowth.java
index 289d5de1a8..a110953621 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WillOTheWisp.java b/Mage.Sets/src/mage/sets/limitedbeta/WillOTheWisp.java
index 2a8afbff27..256099e5d2 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WillOTheWisp.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WillOTheWisp.java
@@ -37,7 +37,7 @@ public class WillOTheWisp extends mage.sets.limitedalpha.WillOTheWisp {
 
     public WillOTheWisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WinterOrb.java b/Mage.Sets/src/mage/sets/limitedbeta/WinterOrb.java
index ef0db4206c..8ee5c9a9bb 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WinterOrb.java
@@ -37,7 +37,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WoodenSphere.java b/Mage.Sets/src/mage/sets/limitedbeta/WoodenSphere.java
index b09d43b24e..2f9a276bd4 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WrathOfGod.java b/Mage.Sets/src/mage/sets/limitedbeta/WrathOfGod.java
index 275a36fe53..2cb4e8ab47 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ZombieMaster.java b/Mage.Sets/src/mage/sets/limitedbeta/ZombieMaster.java
index 014ce5412e..36b934f2cc 100644
--- a/Mage.Sets/src/mage/sets/limitedbeta/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/limitedbeta/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "LEB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java b/Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java
index ae03ae5708..2d924b65a1 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java
@@ -37,7 +37,7 @@ public class AEthersnipe extends mage.sets.commander.AEthersnipe {
 
     public AEthersnipe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java
index 2aa8f7c7e3..6188a29249 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java
@@ -39,7 +39,7 @@ public class AjaniGoldmane extends mage.sets.magic2010.AjaniGoldmane {
 
     public AjaniGoldmane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AustereCommand.java b/Mage.Sets/src/mage/sets/lorwyn/AustereCommand.java
index fce45bdad1..da28844ddd 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/AustereCommand.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/AustereCommand.java
@@ -37,7 +37,7 @@ public class AustereCommand extends mage.sets.commander.AustereCommand {
 
     public AustereCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlindSpotGiant.java b/Mage.Sets/src/mage/sets/lorwyn/BlindSpotGiant.java
index dfc0c508c8..baae07b381 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BlindSpotGiant.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BlindSpotGiant.java
@@ -37,7 +37,7 @@ public class BlindSpotGiant extends mage.sets.modernmasters.BlindSpotGiant {
 
     public BlindSpotGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartShenanigans.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartShenanigans.java
index 963d6c2f32..fd1abe1788 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BoggartShenanigans.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartShenanigans.java
@@ -37,7 +37,7 @@ public class BoggartShenanigans extends mage.sets.elvesvsgoblins.BoggartShenanig
 
     public BoggartShenanigans(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Briarhorn.java b/Mage.Sets/src/mage/sets/lorwyn/Briarhorn.java
index 3cab78771c..572bcf8971 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Briarhorn.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Briarhorn.java
@@ -37,7 +37,7 @@ public class Briarhorn extends mage.sets.planechase.Briarhorn {
 
     public Briarhorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BrionStoutarm.java b/Mage.Sets/src/mage/sets/lorwyn/BrionStoutarm.java
index 300861c938..fbd2dfa283 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BrionStoutarm.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BrionStoutarm.java
@@ -37,7 +37,7 @@ public class BrionStoutarm extends mage.sets.commander.BrionStoutarm {
 
     public BrionStoutarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java b/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java
index 480e80e8a3..8c8ec21a4f 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java
@@ -39,7 +39,7 @@ public class ChandraNalaar extends mage.sets.magic2010.ChandraNalaar {
 
     public ChandraNalaar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/CrushUnderfoot.java b/Mage.Sets/src/mage/sets/lorwyn/CrushUnderfoot.java
index d523e855e7..ed6bdc1538 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/CrushUnderfoot.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/CrushUnderfoot.java
@@ -38,7 +38,7 @@ public class CrushUnderfoot extends mage.sets.modernmasters.CrushUnderfoot {
 
     public CrushUnderfoot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/DreamspoilerWitches.java b/Mage.Sets/src/mage/sets/lorwyn/DreamspoilerWitches.java
index 13054e1feb..d1e9149349 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/DreamspoilerWitches.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/DreamspoilerWitches.java
@@ -37,7 +37,7 @@ public class DreamspoilerWitches extends mage.sets.modernmasters.DreamspoilerWit
 
     public DreamspoilerWitches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Faultgrinder.java b/Mage.Sets/src/mage/sets/lorwyn/Faultgrinder.java
index 533a5d8d9f..80a464a29f 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Faultgrinder.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Faultgrinder.java
@@ -37,7 +37,7 @@ public class Faultgrinder extends mage.sets.commander.Faultgrinder {
 
     public Faultgrinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FertileGround.java b/Mage.Sets/src/mage/sets/lorwyn/FertileGround.java
index 4986de2b2f..304fa21667 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FertileGround.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FertileGround.java
@@ -37,7 +37,7 @@ public class FertileGround extends mage.sets.urzassaga.FertileGround {
 
     public FertileGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FireBellyChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/FireBellyChangeling.java
index 9100a377e5..27b5ac08cd 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FireBellyChangeling.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FireBellyChangeling.java
@@ -37,7 +37,7 @@ public class FireBellyChangeling extends mage.sets.knightsvsdragons.FireBellyCha
 
     public FireBellyChangeling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinHarbinger.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinHarbinger.java
index 9c02b398ba..a78d34a719 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinHarbinger.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinHarbinger.java
@@ -37,7 +37,7 @@ public class FlamekinHarbinger extends mage.sets.planechase.FlamekinHarbinger {
 
     public FlamekinHarbinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FootbottomFeast.java b/Mage.Sets/src/mage/sets/lorwyn/FootbottomFeast.java
index f411ff2a2f..acadbb559d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FootbottomFeast.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FootbottomFeast.java
@@ -37,7 +37,7 @@ public class FootbottomFeast extends mage.sets.commander.FootbottomFeast {
 
     public FootbottomFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GalepowderMage.java b/Mage.Sets/src/mage/sets/lorwyn/GalepowderMage.java
index e5be66c376..fcead4ff2d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GalepowderMage.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GalepowderMage.java
@@ -37,7 +37,7 @@ public class GalepowderMage extends mage.sets.venservskoth.GalepowderMage {
 
     public GalepowderMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java
index 3e5f910279..8dd3eca123 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java
@@ -39,7 +39,7 @@ public class GarrukWildspeaker extends mage.sets.magic2010.GarrukWildspeaker {
 
     public GarrukWildspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowHarrier.java b/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowHarrier.java
index f19af1b3af..d7ebf67bfc 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowHarrier.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowHarrier.java
@@ -37,7 +37,7 @@ public class GoldmeadowHarrier extends mage.sets.elspethvstezzeret.GoldmeadowHar
 
     public GoldmeadowHarrier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/lorwyn/HamletbackGoliath.java
index 35621f55ba..5ae633ba00 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HamletbackGoliath.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HamletbackGoliath.java
@@ -37,7 +37,7 @@ public class HamletbackGoliath extends mage.sets.magic2013.HamletbackGoliath {
 
     public HamletbackGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Hostility.java b/Mage.Sets/src/mage/sets/lorwyn/Hostility.java
index eb0be5a523..3f18c33d28 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Hostility.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Hostility.java
@@ -37,7 +37,7 @@ public class Hostility extends mage.sets.jacevschandra.Hostility {
 
     public Hostility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/IncendiaryCommand.java b/Mage.Sets/src/mage/sets/lorwyn/IncendiaryCommand.java
index 4f71959a36..846974cd3a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/IncendiaryCommand.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/IncendiaryCommand.java
@@ -37,7 +37,7 @@ public class IncendiaryCommand extends mage.sets.commander2013.IncendiaryCommand
 
     public IncendiaryCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/IncrementalGrowth.java b/Mage.Sets/src/mage/sets/lorwyn/IncrementalGrowth.java
index 88a5648ed0..30375f2b6f 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/IncrementalGrowth.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/IncrementalGrowth.java
@@ -37,7 +37,7 @@ public class IncrementalGrowth extends mage.sets.modernmasters.IncrementalGrowth
 
     public IncrementalGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java b/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java
index fbec870f2f..24bdc63ea4 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java
@@ -39,7 +39,7 @@ public class JaceBeleren extends mage.sets.magic2010.JaceBeleren {
 
     public JaceBeleren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinGreatheart.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinGreatheart.java
index a922a0aba4..ae645c5061 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/KithkinGreatheart.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinGreatheart.java
@@ -37,7 +37,7 @@ public class KithkinGreatheart extends mage.sets.modernmasters.KithkinGreatheart
 
     public KithkinGreatheart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/LashOut.java b/Mage.Sets/src/mage/sets/lorwyn/LashOut.java
index 5b1c7309d2..15c7ecbb6a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/LashOut.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/LashOut.java
@@ -37,7 +37,7 @@ public class LashOut extends mage.sets.commander.LashOut {
 
     public LashOut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java b/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java
index 9ce1c99312..8b448d6352 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java
@@ -39,7 +39,7 @@ public class LilianaVess extends mage.sets.magic2010.LilianaVess {
 
     public LilianaVess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MakeshiftMannequin.java b/Mage.Sets/src/mage/sets/lorwyn/MakeshiftMannequin.java
index f223e221a1..34f8de936f 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MakeshiftMannequin.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MakeshiftMannequin.java
@@ -37,7 +37,7 @@ public class MakeshiftMannequin extends mage.sets.archenemy.MakeshiftMannequin {
 
     public MakeshiftMannequin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MarshFlitter.java b/Mage.Sets/src/mage/sets/lorwyn/MarshFlitter.java
index c4e6ef8020..6ada8c94af 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MarshFlitter.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MarshFlitter.java
@@ -37,7 +37,7 @@ public class MarshFlitter extends mage.sets.modernmasters.MarshFlitter {
 
     public MarshFlitter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MaskedAdmirers.java b/Mage.Sets/src/mage/sets/lorwyn/MaskedAdmirers.java
index 59cd6863c3..182f08ee0d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MaskedAdmirers.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MaskedAdmirers.java
@@ -38,7 +38,7 @@ public class MaskedAdmirers extends mage.sets.modernmasters.MaskedAdmirers {
 
     public MaskedAdmirers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "LRW";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MoongloveExtract.java b/Mage.Sets/src/mage/sets/lorwyn/MoongloveExtract.java
index 7861ccd45c..0f57107fe7 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MoongloveExtract.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MoongloveExtract.java
@@ -37,7 +37,7 @@ public class MoongloveExtract extends mage.sets.elspethvstezzeret.MoongloveExtra
 
     public MoongloveExtract(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MosswortBridge.java b/Mage.Sets/src/mage/sets/lorwyn/MosswortBridge.java
index a1bb46e223..8bd59d7248 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MosswortBridge.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MosswortBridge.java
@@ -37,7 +37,7 @@ public class MosswortBridge extends mage.sets.commander2013.MosswortBridge {
 
     public MosswortBridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Mulldrifter.java b/Mage.Sets/src/mage/sets/lorwyn/Mulldrifter.java
index 9f6d4fa1c9..d48d1c4a66 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Mulldrifter.java
@@ -37,7 +37,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/OblivionRing.java b/Mage.Sets/src/mage/sets/lorwyn/OblivionRing.java
index ead3201678..fc275ccc65 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/OblivionRing.java
@@ -37,7 +37,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Peppersmoke.java b/Mage.Sets/src/mage/sets/lorwyn/Peppersmoke.java
index 7dcaea3cdd..0361cba26d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Peppersmoke.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Peppersmoke.java
@@ -37,7 +37,7 @@ public class Peppersmoke extends mage.sets.modernmasters.Peppersmoke {
 
     public Peppersmoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/PollenLullaby.java b/Mage.Sets/src/mage/sets/lorwyn/PollenLullaby.java
index 8f1c29c634..1af622cc24 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/PollenLullaby.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/PollenLullaby.java
@@ -37,7 +37,7 @@ public class PollenLullaby extends mage.sets.commander.PollenLullaby {
 
     public PollenLullaby(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Ponder.java b/Mage.Sets/src/mage/sets/lorwyn/Ponder.java
index b222359c01..a7a52be73c 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Ponder.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Ponder.java
@@ -37,7 +37,7 @@ public class Ponder extends mage.sets.magic2010.Ponder {
 
     public Ponder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ProfaneCommand.java b/Mage.Sets/src/mage/sets/lorwyn/ProfaneCommand.java
index 91829e81cd..489d546699 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ProfaneCommand.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ProfaneCommand.java
@@ -37,7 +37,7 @@ public class ProfaneCommand extends mage.sets.commander2014.ProfaneCommand {
 
     public ProfaneCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/RunedStalactite.java b/Mage.Sets/src/mage/sets/lorwyn/RunedStalactite.java
index d48699f442..3911b10b5d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/RunedStalactite.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/RunedStalactite.java
@@ -37,7 +37,7 @@ public class RunedStalactite extends mage.sets.modernmasters.RunedStalactite {
 
     public RunedStalactite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScatteringStroke.java b/Mage.Sets/src/mage/sets/lorwyn/ScatteringStroke.java
index b3621b9d02..bfe9c7a344 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ScatteringStroke.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ScatteringStroke.java
@@ -37,7 +37,7 @@ public class ScatteringStroke extends mage.sets.commander.ScatteringStroke {
 
     public ScatteringStroke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Shriekmaw.java b/Mage.Sets/src/mage/sets/lorwyn/Shriekmaw.java
index 7c264adaa7..3dcf3a5e55 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Shriekmaw.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Shriekmaw.java
@@ -37,7 +37,7 @@ public class Shriekmaw extends mage.sets.commander.Shriekmaw {
 
     public Shriekmaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Smokebraider.java b/Mage.Sets/src/mage/sets/lorwyn/Smokebraider.java
index fc68357361..e481361c1b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Smokebraider.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Smokebraider.java
@@ -37,7 +37,7 @@ public class Smokebraider extends mage.sets.planechase.Smokebraider {
 
     public Smokebraider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThievingSprite.java b/Mage.Sets/src/mage/sets/lorwyn/ThievingSprite.java
index 8f87f85cd2..51cfcf50a6 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ThievingSprite.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ThievingSprite.java
@@ -37,7 +37,7 @@ public class ThievingSprite extends mage.sets.modernmasters.ThievingSprite {
 
     public ThievingSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThousandYearElixir.java b/Mage.Sets/src/mage/sets/lorwyn/ThousandYearElixir.java
index f7edc0c4c5..8e51a7c0d2 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ThousandYearElixir.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ThousandYearElixir.java
@@ -37,7 +37,7 @@ public class ThousandYearElixir extends mage.sets.commander2013.ThousandYearElix
 
     public ThousandYearElixir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThundercloudShaman.java b/Mage.Sets/src/mage/sets/lorwyn/ThundercloudShaman.java
index f9dc4e61ed..2235d91c61 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ThundercloudShaman.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ThundercloudShaman.java
@@ -37,7 +37,7 @@ public class ThundercloudShaman extends mage.sets.modernmasters.ThundercloudSham
 
     public ThundercloudShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WarrenPilferers.java b/Mage.Sets/src/mage/sets/lorwyn/WarrenPilferers.java
index 586c17f820..ca2fe3dee9 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WarrenPilferers.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WarrenPilferers.java
@@ -37,7 +37,7 @@ public class WarrenPilferers extends mage.sets.modernmasters.WarrenPilferers {
 
     public WarrenPilferers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WhirlpoolWhelm.java b/Mage.Sets/src/mage/sets/lorwyn/WhirlpoolWhelm.java
index c6affc9758..372a203f76 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WhirlpoolWhelm.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WhirlpoolWhelm.java
@@ -37,7 +37,7 @@ public class WhirlpoolWhelm extends mage.sets.commander.WhirlpoolWhelm {
 
     public WhirlpoolWhelm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WildRicochet.java b/Mage.Sets/src/mage/sets/lorwyn/WildRicochet.java
index f933ba216c..2831ad8a7d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WildRicochet.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WildRicochet.java
@@ -37,7 +37,7 @@ public class WildRicochet extends mage.sets.commander.WildRicochet {
 
     public WildRicochet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "LRW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java b/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java
index b7d65e54f5..38ef6c626d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java
@@ -38,7 +38,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Assassinate.java b/Mage.Sets/src/mage/sets/magic2010/Assassinate.java
index 99bb9981bd..b0d8451b7c 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Assassinate.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Assassinate.java
@@ -38,7 +38,7 @@ public class Assassinate extends mage.sets.tenthedition.Assassinate {
 
     public Assassinate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java
index 8f8c7ea604..93a50bbe01 100644
--- a/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java
@@ -38,7 +38,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/BountifulHarvest.java b/Mage.Sets/src/mage/sets/magic2010/BountifulHarvest.java
index 340786ccfd..3322274564 100644
--- a/Mage.Sets/src/mage/sets/magic2010/BountifulHarvest.java
+++ b/Mage.Sets/src/mage/sets/magic2010/BountifulHarvest.java
@@ -38,7 +38,7 @@ public class BountifulHarvest extends mage.sets.magic2012.BountifulHarvest {
 
     public BountifulHarvest (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Cancel.java b/Mage.Sets/src/mage/sets/magic2010/Cancel.java
index 1a18acf7f1..798905e6ad 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Cancel.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Cancel.java
@@ -38,7 +38,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java
index 302c769a92..10d118f71d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java
@@ -38,7 +38,7 @@ public class CanyonMinotaur extends mage.sets.conflux.CanyonMinotaur {
 
     public CanyonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java b/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java
index 4d1c8bfef3..fd1ebe13e2 100644
--- a/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java
+++ b/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java
@@ -38,7 +38,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge {
 
     public CelestialPurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/CemeteryReaper.java b/Mage.Sets/src/mage/sets/magic2010/CemeteryReaper.java
index f17346d30d..5d338e55a5 100644
--- a/Mage.Sets/src/mage/sets/magic2010/CemeteryReaper.java
+++ b/Mage.Sets/src/mage/sets/magic2010/CemeteryReaper.java
@@ -36,7 +36,7 @@ public class CemeteryReaper extends mage.sets.magic2012.CemeteryReaper {
 
     public CemeteryReaper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Clone.java b/Mage.Sets/src/mage/sets/magic2010/Clone.java
index ff4ff2442c..cabcb19047 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Clone.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Clone.java
@@ -38,7 +38,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/CrawWurm.java b/Mage.Sets/src/mage/sets/magic2010/CrawWurm.java
index b5f1468659..dfc9e22857 100644
--- a/Mage.Sets/src/mage/sets/magic2010/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/magic2010/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java b/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java
index 9b8fd393a2..7364544c83 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java
@@ -39,7 +39,7 @@ public class DarksteelColossus extends mage.sets.darksteel.DarksteelColossus {
 
     public DarksteelColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "M10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2010/Deathmark.java b/Mage.Sets/src/mage/sets/magic2010/Deathmark.java
index c052c8f26b..ab0a7050ac 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Deathmark.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Deathmark.java
@@ -38,7 +38,7 @@ public class Deathmark extends mage.sets.tenthedition.Deathmark {
 
     public Deathmark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java b/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java
index 6d3abe41f0..5008ddffe3 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java
@@ -38,7 +38,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java b/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java
index 4215465c09..e0e691ed88 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java
@@ -38,7 +38,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Divination.java b/Mage.Sets/src/mage/sets/magic2010/Divination.java
index 17f64bd12f..b08d0bc2f4 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Divination.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Divination.java
@@ -38,7 +38,7 @@ public class Divination extends mage.sets.magic2012.Divination {
 
     public Divination (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java b/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java
index 30d2438bcb..beffcc1189 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java
@@ -38,7 +38,7 @@ public class DragonsClaw extends mage.sets.tenthedition.DragonsClaw {
 
     public DragonsClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishVisionary.java b/Mage.Sets/src/mage/sets/magic2010/ElvishVisionary.java
index 056e73ba99..50235c4535 100644
--- a/Mage.Sets/src/mage/sets/magic2010/ElvishVisionary.java
+++ b/Mage.Sets/src/mage/sets/magic2010/ElvishVisionary.java
@@ -38,7 +38,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
 
     public ElvishVisionary (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java b/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java
index c7bdd3bfe1..754318738a 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java
@@ -38,7 +38,7 @@ public class Excommunicate extends mage.sets.shardsofalara.Excommunicate {
 
     public Excommunicate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Firebreathing.java b/Mage.Sets/src/mage/sets/magic2010/Firebreathing.java
index f1623c727a..30829536ba 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Firebreathing.java
@@ -38,7 +38,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java b/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java
index a6edac753e..15b3f5cc08 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java
@@ -38,7 +38,7 @@ public class Flashfreeze extends mage.sets.tenthedition.Flashfreeze {
 
     public Flashfreeze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java b/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java
index dbf4a2f65c..5c59609d64 100644
--- a/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java
@@ -38,7 +38,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java b/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java
index 4d3a019034..9a1b724a2d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java
@@ -38,7 +38,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java b/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java
index fae686cd36..20b41a63e3 100644
--- a/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java
+++ b/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java
@@ -38,7 +38,7 @@ public class GoblinPiker extends mage.sets.tenthedition.GoblinPiker {
 
     public GoblinPiker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java b/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java
index 130e18bd21..e035f94a9e 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java b/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java
index 9baf2c2cc7..d4bdf39523 100644
--- a/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java
@@ -38,7 +38,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java b/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java
index ff887d5496..6ef45a821e 100644
--- a/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java
+++ b/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java
@@ -38,7 +38,7 @@ public class KrakensEye extends mage.sets.tenthedition.KrakensEye {
 
     public KrakensEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java
index 9d1d0db0ee..97ded3e2ce 100644
--- a/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java
@@ -38,7 +38,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Levitation.java b/Mage.Sets/src/mage/sets/magic2010/Levitation.java
index 54777ba7e1..03b1e6c7b1 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Levitation.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Levitation.java
@@ -38,7 +38,7 @@ public class Levitation extends mage.sets.magic2012.Levitation {
 
     public Levitation (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Lifelink.java b/Mage.Sets/src/mage/sets/magic2010/Lifelink.java
index 35e919dba6..cc953c4e44 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Lifelink.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Lifelink.java
@@ -38,7 +38,7 @@ public class Lifelink extends mage.sets.magic2012.Lifelink {
 
     public Lifelink (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/LightningElemental.java b/Mage.Sets/src/mage/sets/magic2010/LightningElemental.java
index 3197b1d4e6..2654e285ba 100644
--- a/Mage.Sets/src/mage/sets/magic2010/LightningElemental.java
+++ b/Mage.Sets/src/mage/sets/magic2010/LightningElemental.java
@@ -38,7 +38,7 @@ public class LightningElemental extends mage.sets.tenthedition.LightningElementa
 
     public LightningElemental (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java b/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java
index 68af1e28ac..afdb4fc80a 100644
--- a/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java
@@ -38,7 +38,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Manabarbs.java b/Mage.Sets/src/mage/sets/magic2010/Manabarbs.java
index 6c7ea26a97..f7f0014e6d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Megrim.java b/Mage.Sets/src/mage/sets/magic2010/Megrim.java
index cad896795b..07c79ede02 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Megrim.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Megrim.java
@@ -38,7 +38,7 @@ public class Megrim extends mage.sets.tenthedition.Megrim {
 
     public Megrim (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/MerfolkLooter.java b/Mage.Sets/src/mage/sets/magic2010/MerfolkLooter.java
index bd0112f548..905060272f 100644
--- a/Mage.Sets/src/mage/sets/magic2010/MerfolkLooter.java
+++ b/Mage.Sets/src/mage/sets/magic2010/MerfolkLooter.java
@@ -38,7 +38,7 @@ public class MerfolkLooter extends mage.sets.magic2012.MerfolkLooter {
 
     public MerfolkLooter (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/MindRot.java b/Mage.Sets/src/mage/sets/magic2010/MindRot.java
index 892736976c..881b80bc90 100644
--- a/Mage.Sets/src/mage/sets/magic2010/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magic2010/MindRot.java
@@ -38,7 +38,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Naturalize.java b/Mage.Sets/src/mage/sets/magic2010/Naturalize.java
index 567baf9991..80e33cec65 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Naturalize.java
@@ -38,7 +38,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Nightmare.java b/Mage.Sets/src/mage/sets/magic2010/Nightmare.java
index c526524162..f3a5af600d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java
index d8e4ae5853..1f45e4250b 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java
@@ -38,7 +38,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Pacifism.java b/Mage.Sets/src/mage/sets/magic2010/Pacifism.java
index 71977d3a31..0a13b5eec4 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Pacifism.java
@@ -38,7 +38,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/PithingNeedle.java b/Mage.Sets/src/mage/sets/magic2010/PithingNeedle.java
index 33b647993f..bf17ed4024 100644
--- a/Mage.Sets/src/mage/sets/magic2010/PithingNeedle.java
+++ b/Mage.Sets/src/mage/sets/magic2010/PithingNeedle.java
@@ -37,7 +37,7 @@ public class PithingNeedle extends mage.sets.saviorsofkamigawa.PithingNeedle {
 
     public PithingNeedle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java b/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java
index 8296dcb324..b995dfdf95 100644
--- a/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java
@@ -39,7 +39,7 @@ public class PlatinumAngel extends mage.sets.tenthedition.PlatinumAngel {
 
     public PlatinumAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "M10";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java
index 76eca60d0c..672a8b883c 100644
--- a/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java
+++ b/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java
@@ -39,7 +39,7 @@ public class ProdigalPyromancer extends mage.sets.tenthedition.ProdigalPyromance
 
     public ProdigalPyromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "M10";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java b/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java
index ec934075a5..9738cff957 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java
@@ -38,7 +38,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/RagingGoblin.java b/Mage.Sets/src/mage/sets/magic2010/RagingGoblin.java
index 1c54c95cdb..3eb1597499 100644
--- a/Mage.Sets/src/mage/sets/magic2010/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/magic2010/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java b/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java
index d67d4636fd..df1def5669 100644
--- a/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java
+++ b/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java
@@ -38,7 +38,7 @@ public class RelentlessRats extends mage.sets.tenthedition.RelentlessRats {
 
     public RelentlessRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Righteousness.java b/Mage.Sets/src/mage/sets/magic2010/Righteousness.java
index 92992a3502..218b210831 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Righteousness.java
@@ -38,7 +38,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "M10";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2010/RodOfRuin.java b/Mage.Sets/src/mage/sets/magic2010/RodOfRuin.java
index 497f049eb0..7a4c956fc0 100644
--- a/Mage.Sets/src/mage/sets/magic2010/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/magic2010/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java b/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java
index 10978ea9be..da8678574b 100644
--- a/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java
@@ -38,7 +38,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java
index 0e3aea7f4c..7da46110fc 100644
--- a/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java
@@ -40,7 +40,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
     public SerraAngel(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Shatter.java b/Mage.Sets/src/mage/sets/magic2010/Shatter.java
index bcd4f728b4..dc26dfbd9c 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Shatter.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Shatter.java
@@ -38,7 +38,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/ShivanDragon.java b/Mage.Sets/src/mage/sets/magic2010/ShivanDragon.java
index 5a422fd31a..0b71c09258 100644
--- a/Mage.Sets/src/mage/sets/magic2010/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2010/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/StampedingRhino.java b/Mage.Sets/src/mage/sets/magic2010/StampedingRhino.java
index 274ef317dd..8825ffe596 100644
--- a/Mage.Sets/src/mage/sets/magic2010/StampedingRhino.java
+++ b/Mage.Sets/src/mage/sets/magic2010/StampedingRhino.java
@@ -38,7 +38,7 @@ public class StampedingRhino extends mage.sets.magic2012.StampedingRhino {
 
     public StampedingRhino (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Telepathy.java b/Mage.Sets/src/mage/sets/magic2010/Telepathy.java
index 5772ddad21..df1cc3eaba 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Telepathy.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Telepathy.java
@@ -36,7 +36,7 @@ public class Telepathy extends mage.sets.urzassaga.Telepathy {
 
     public Telepathy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java
index 2ba1b908ba..edb2ed19c6 100644
--- a/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java
@@ -38,7 +38,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Traumatize.java b/Mage.Sets/src/mage/sets/magic2010/Traumatize.java
index b1c2c1517e..45643dd2db 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Traumatize.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Traumatize.java
@@ -38,7 +38,7 @@ public class Traumatize extends mage.sets.tenthedition.Traumatize {
 
     public Traumatize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/UnholyStrength.java b/Mage.Sets/src/mage/sets/magic2010/UnholyStrength.java
index 467fdfceed..4532775c3d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/magic2010/UnholyStrength.java
@@ -38,7 +38,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/Unsummon.java b/Mage.Sets/src/mage/sets/magic2010/Unsummon.java
index d204a0722d..c7215e30ab 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Unsummon.java
@@ -38,7 +38,7 @@ public class Unsummon extends mage.sets.conflux.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFire.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFire.java
index 419c98b689..91113a3d89 100644
--- a/Mage.Sets/src/mage/sets/magic2010/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java
index b9562a8183..ac8175025a 100644
--- a/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java
+++ b/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java
@@ -38,7 +38,7 @@ public class WhispersilkCloak extends mage.sets.tenthedition.WhispersilkCloak {
 
     public WhispersilkCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/WurmsTooth.java b/Mage.Sets/src/mage/sets/magic2010/WurmsTooth.java
index 0d5bb17058..5c4d5c625a 100644
--- a/Mage.Sets/src/mage/sets/magic2010/WurmsTooth.java
+++ b/Mage.Sets/src/mage/sets/magic2010/WurmsTooth.java
@@ -38,7 +38,7 @@ public class WurmsTooth extends mage.sets.tenthedition.WurmsTooth {
 
     public WurmsTooth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/ZombieGoliath.java b/Mage.Sets/src/mage/sets/magic2010/ZombieGoliath.java
index 5df855830d..7f5825f1b2 100644
--- a/Mage.Sets/src/mage/sets/magic2010/ZombieGoliath.java
+++ b/Mage.Sets/src/mage/sets/magic2010/ZombieGoliath.java
@@ -38,7 +38,7 @@ public class ZombieGoliath extends mage.sets.magic2012.ZombieGoliath {
 
     public ZombieGoliath (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "M10";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java
index 96afdd7321..16d4e113fa 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java
@@ -38,7 +38,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java
index c41f2ab649..a1decf398c 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java
@@ -38,7 +38,7 @@ import mage.constants.Rarity;
 public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
-        super(ownerId);this.cardNumber = 121;
+        super(ownerId);this.cardNumber = "121";
         this.expansionSetCode = "M11";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java
index e079a5febf..1ff3d6e695 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java
@@ -38,7 +38,7 @@ public class AjaniGoldmane extends mage.sets.magic2010.AjaniGoldmane {
 
     public AjaniGoldmane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java
index e68e339a19..362ad6e059 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java
@@ -38,7 +38,7 @@ public class AlluringSiren extends mage.sets.magic2010.AlluringSiren {
 
     public AlluringSiren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java b/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java
index 6cebd58cb4..49da1840a1 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java
@@ -38,7 +38,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java
index 27e4074dc2..2cf5fea211 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java
@@ -38,7 +38,7 @@ public class ArmoredAscension extends mage.sets.magic2010.ArmoredAscension {
 
     public ArmoredAscension(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Assassinate.java b/Mage.Sets/src/mage/sets/magic2011/Assassinate.java
index 12cc41371f..a85267e8f4 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Assassinate.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Assassinate.java
@@ -38,7 +38,7 @@ public class Assassinate extends mage.sets.tenthedition.Assassinate {
 
     public Assassinate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java b/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java
index ea7f18d008..81f852340b 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java
@@ -38,7 +38,7 @@ public class AwakenerDruid extends mage.sets.magic2010.AwakenerDruid {
 
     public AwakenerDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java
index 1cce5c2537..9321458650 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java
@@ -38,7 +38,7 @@ public class BaneslayerAngel extends mage.sets.magic2010.BaneslayerAngel {
 
     public BaneslayerAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java
index c498499ee1..96d9009546 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java
@@ -38,7 +38,7 @@ public class BerserkersOfBloodRidge extends mage.sets.magic2010.BerserkersOfBloo
 
     public BerserkersOfBloodRidge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java
index 5b93fd1a69..8e43ac389a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java
@@ -38,7 +38,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java b/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java
index d8385d1ea7..eb5bb858b5 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java
@@ -38,7 +38,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java
index 708ba6fc41..822fe92d55 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java
@@ -38,7 +38,7 @@ public class BlindingMage extends mage.sets.magic2010.BlindingMage {
 
     public BlindingMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java
index 277a995730..7539b378c1 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java
@@ -38,7 +38,7 @@ public class BloodthroneVampire extends mage.sets.riseoftheeldrazi.BloodthroneVa
 
     public BloodthroneVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Cancel.java b/Mage.Sets/src/mage/sets/magic2011/Cancel.java
index c361d91476..dc004b67ae 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Cancel.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Cancel.java
@@ -38,7 +38,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java
index 067f9989ed..f43fd8f8af 100644
--- a/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java
@@ -38,7 +38,7 @@ public class CanyonMinotaur extends mage.sets.conflux.CanyonMinotaur {
 
     public CanyonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java b/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java
index 18b36b5db9..e8ee1acc49 100644
--- a/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java
+++ b/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java
@@ -38,7 +38,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge {
 
     public CelestialPurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java
index c2b7a23d3c..c0a54ac5a3 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java
@@ -38,7 +38,7 @@ public class ChandraNalaar extends mage.sets.magic2010.ChandraNalaar {
 
     public ChandraNalaar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java
index ca2e4cc419..97daeb4b99 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java
@@ -38,7 +38,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight {
 
     public ChildOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Clone.java b/Mage.Sets/src/mage/sets/magic2011/Clone.java
index 037f28c96c..8e7e966b8a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Clone.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Clone.java
@@ -38,7 +38,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java b/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java
index b01e9cbb15..2f4e78756d 100644
--- a/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java
+++ b/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java
@@ -38,7 +38,7 @@ public class CloudElemental extends mage.sets.tenthedition.CloudElemental {
 
     public CloudElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Condemn.java b/Mage.Sets/src/mage/sets/magic2011/Condemn.java
index 29ce77e286..37ee25e3e3 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Condemn.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Condemn.java
@@ -38,7 +38,7 @@ public class Condemn extends mage.sets.tenthedition.Condemn {
 
     public Condemn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java
index c57f3d2745..bb92a37fc3 100644
--- a/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java
+++ b/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java
@@ -38,7 +38,7 @@ public class CudgelTroll extends mage.sets.magic2010.CudgelTroll {
 
     public CudgelTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java b/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java
index f508b85638..13fa962973 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java
@@ -38,7 +38,7 @@ public class DayOfJudgment extends mage.sets.zendikar.DayOfJudgment {
 
     public DayOfJudgment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Deathmark.java b/Mage.Sets/src/mage/sets/magic2011/Deathmark.java
index 6b82bc7c4e..c159cdc9f7 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Deathmark.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Deathmark.java
@@ -38,7 +38,7 @@ public class Deathmark extends mage.sets.magic2010.Deathmark {
 
     public Deathmark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Demolish.java b/Mage.Sets/src/mage/sets/magic2011/Demolish.java
index cd2a05ff8a..57b898f933 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Demolish.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Demolish.java
@@ -38,7 +38,7 @@ public class Demolish extends mage.sets.zendikar.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java b/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java
index 29d5ee2622..6fb4b92112 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java
@@ -38,7 +38,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java b/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java
index e3a2a5acbd..76fc75961c 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java
@@ -38,7 +38,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Disentomb.java b/Mage.Sets/src/mage/sets/magic2011/Disentomb.java
index 65271ed9f7..3afabcbb5a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Disentomb.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Disentomb.java
@@ -38,7 +38,7 @@ public class Disentomb extends mage.sets.magic2010.Disentomb {
 
     public Disentomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java
index d3731c0940..60ff4e2b42 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java
@@ -38,7 +38,7 @@ public class DoomBlade extends mage.sets.magic2010.DoomBlade {
 
     public DoomBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java b/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java
index cd92617126..575369c16a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java
@@ -38,7 +38,7 @@ public class DragonsClaw extends mage.sets.tenthedition.DragonsClaw {
 
     public DragonsClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java
index 18ba747e27..337b20d4bd 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java
@@ -38,7 +38,7 @@ public class DragonskullSummit extends mage.sets.magic2010.DragonskullSummit {
 
     public DragonskullSummit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2011/DrownedCatacomb.java
index 71ecce6ff0..6989f8abb6 100644
--- a/Mage.Sets/src/mage/sets/magic2011/DrownedCatacomb.java
+++ b/Mage.Sets/src/mage/sets/magic2011/DrownedCatacomb.java
@@ -38,7 +38,7 @@ public class DrownedCatacomb extends mage.sets.magic2010.DrownedCatacomb {
 
     public DrownedCatacomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Duress.java b/Mage.Sets/src/mage/sets/magic2011/Duress.java
index 54780fe5f1..39eae9e4c7 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Duress.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Duress.java
@@ -38,7 +38,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java
index 801bd0de39..b189898677 100644
--- a/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java
+++ b/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java
@@ -38,7 +38,7 @@ public class EliteVanguard extends mage.sets.magic2010.EliteVanguard {
 
     public EliteVanguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java
index e1bdf8d8a8..28ddbff720 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java
@@ -38,7 +38,7 @@ public class ElvishArchdruid extends mage.sets.magic2010.ElvishArchdruid {
 
     public ElvishArchdruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java b/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java
index 77bb9039ea..eaacce3c99 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java
@@ -38,7 +38,7 @@ public class Excommunicate extends mage.sets.shardsofalara.Excommunicate {
 
     public Excommunicate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java
index 6bc9a0b99a..63f60fdfee 100644
--- a/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java
+++ b/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java
@@ -38,7 +38,7 @@ public class FieryHellhound extends mage.sets.magic2010.FieryHellhound {
 
     public FieryHellhound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Fireball.java b/Mage.Sets/src/mage/sets/magic2011/Fireball.java
index b2536d29bc..3cb1ae3f59 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Fireball.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java b/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java
index 474d7f04f4..42a54d3b94 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java
@@ -38,7 +38,7 @@ public class Flashfreeze extends mage.sets.tenthedition.Flashfreeze {
 
     public Flashfreeze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Fog.java b/Mage.Sets/src/mage/sets/magic2011/Fog.java
index 5686871e2f..4a396b3ddb 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Fog.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Fog.java
@@ -38,7 +38,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java
index bc3fe61f1b..83bb4be65f 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java
@@ -38,7 +38,7 @@ public class GarrukWildspeaker extends mage.sets.magic2010.GarrukWildspeaker {
 
     public GarrukWildspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java b/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java
index a07b5017ee..3f5c2860b0 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java
@@ -38,7 +38,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java b/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java
index c451a0b759..1d4be4e98a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java
@@ -38,7 +38,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java
index 4cf8a059cf..d988d86ca7 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java
@@ -38,7 +38,7 @@ public class GlacialFortress extends mage.sets.magic2010.GlacialFortress {
 
     public GlacialFortress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java
index 5dd0afae2a..0d55f9f7a0 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java
@@ -38,7 +38,7 @@ public class GoblinChieftain extends mage.sets.magic2010.GoblinChieftain {
 
     public GoblinChieftain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java b/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java
index 9684b946a4..81654f3430 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java
@@ -38,7 +38,7 @@ public class GoblinPiker extends mage.sets.tenthedition.GoblinPiker {
 
     public GoblinPiker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java b/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java
index 165fde60de..ff0b83206b 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java
@@ -38,7 +38,7 @@ public class GoblinTunneler extends mage.sets.riseoftheeldrazi.GoblinTunneler {
 
     public GoblinTunneler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java b/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java
index b841001738..bfc2dc5a79 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java
index 56b650297b..36bdbb21cb 100644
--- a/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java
+++ b/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java
@@ -38,7 +38,7 @@ public class HauntingEchoes extends mage.sets.magic2010.HauntingEchoes {
 
     public HauntingEchoes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java b/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java
index e23743d953..cc4cb456a7 100644
--- a/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java
@@ -38,7 +38,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java
index 4cb256f8ce..61c24490a9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java
+++ b/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java
@@ -38,7 +38,7 @@ public class HonorOfThePure extends mage.sets.magic2010.HonorOfThePure {
 
     public HonorOfThePure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java b/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java
index 506962ba4c..3fdafd4502 100644
--- a/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java
+++ b/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java
@@ -38,7 +38,7 @@ public class HowlingBanshee extends mage.sets.magic2010.HowlingBanshee {
 
     public HowlingBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/IceCage.java b/Mage.Sets/src/mage/sets/magic2011/IceCage.java
index 5c68c1f4eb..85bb9288c9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/IceCage.java
+++ b/Mage.Sets/src/mage/sets/magic2011/IceCage.java
@@ -38,7 +38,7 @@ public class IceCage extends mage.sets.magic2010.IceCage {
 
     public IceCage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java b/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java
index d433c52ce0..9810109b62 100644
--- a/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java
+++ b/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java
@@ -38,7 +38,7 @@ public class JaceBeleren extends mage.sets.magic2010.JaceBeleren {
 
     public JaceBeleren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java b/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java
index 0d28bab2e4..d637b7ad4a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java
@@ -38,7 +38,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java b/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java
index 7e66ecf475..6638965b26 100644
--- a/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java
+++ b/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java
@@ -38,7 +38,7 @@ public class KrakensEye extends mage.sets.tenthedition.KrakensEye {
 
     public KrakensEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java
index da45ec887b..cad1304a0e 100644
--- a/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java
@@ -38,7 +38,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java b/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java
index be64580caf..9b0ccba9a9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java
@@ -38,7 +38,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java
index 891adf901c..bca479ccd8 100644
--- a/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java
@@ -37,7 +37,7 @@ import java.util.UUID;
 public class LilianaVess extends mage.sets.magic2010.LilianaVess {
 
     public LilianaVess(UUID ownerId) {
-        super(ownerId);this.cardNumber = 102;
+        super(ownerId);this.cardNumber = "102";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java b/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java
index 497a567d5d..0a0cc94cda 100644
--- a/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java
@@ -38,7 +38,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java
index 3afd60db57..43639246b9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java
+++ b/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java
@@ -38,7 +38,7 @@ public class MagmaPhoenix extends mage.sets.magic2010.MagmaPhoenix {
 
     public MagmaPhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java
index e90746d512..eef28cc49e 100644
--- a/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java
+++ b/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java
@@ -38,7 +38,7 @@ public class MerfolkSovereign extends mage.sets.magic2010.MerfolkSovereign {
 
     public MerfolkSovereign(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/MindControl.java b/Mage.Sets/src/mage/sets/magic2011/MindControl.java
index 89e1a37121..055f05b0cf 100644
--- a/Mage.Sets/src/mage/sets/magic2011/MindControl.java
+++ b/Mage.Sets/src/mage/sets/magic2011/MindControl.java
@@ -38,7 +38,7 @@ public class MindControl extends mage.sets.magic2010.MindControl {
 
     public MindControl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/MindRot.java b/Mage.Sets/src/mage/sets/magic2011/MindRot.java
index 221f7c3d2f..c2c6a12056 100644
--- a/Mage.Sets/src/mage/sets/magic2011/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magic2011/MindRot.java
@@ -38,7 +38,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Naturalize.java b/Mage.Sets/src/mage/sets/magic2011/Naturalize.java
index 75ed061729..0dfec0ad99 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Naturalize.java
@@ -38,7 +38,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java b/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java
index d7fe09152a..2d64635858 100644
--- a/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java
+++ b/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java
@@ -38,7 +38,7 @@ public class NaturesSpiral extends mage.sets.magic2010.NaturesSpiral {
 
     public NaturesSpiral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Negate.java b/Mage.Sets/src/mage/sets/magic2011/Negate.java
index 8b97c15552..cfe491c2a0 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Negate.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Negate.java
@@ -38,7 +38,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java
index 42ceee617c..a0ef9f76b8 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java
@@ -38,7 +38,7 @@ public class Ornithopter extends mage.sets.magic2010.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Pacifism.java b/Mage.Sets/src/mage/sets/magic2011/Pacifism.java
index 1cd4374ae8..aff50fb4b2 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Pacifism.java
@@ -38,7 +38,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java
index 017541a54d..c7916d5538 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java
@@ -38,7 +38,7 @@ public class PalaceGuard extends mage.sets.magic2010.PalaceGuard {
 
     public PalaceGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java b/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java
index 4ababf238d..fd4522b43e 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java
@@ -39,7 +39,7 @@ public class PlatinumAngel extends mage.sets.magic2010.PlatinumAngel {
 
     public PlatinumAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "M11";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java
index 7688b2ca58..0c4b3e4421 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java
@@ -38,7 +38,7 @@ public class PrizedUnicorn extends mage.sets.magic2010.PrizedUnicorn {
 
     public PrizedUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java
index 1bb1869664..6a818269ff 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java
@@ -39,7 +39,7 @@ public class ProdigalPyromancer extends mage.sets.magic2010.ProdigalPyromancer {
 
     public ProdigalPyromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "M11";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java
index 1048015bdc..77e741fcdf 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java
@@ -39,7 +39,7 @@ public class ProteanHydra extends mage.sets.magic2010.ProteanHydra {
 
     public ProteanHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "M11";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java b/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java
index 223be822c5..1db98c2c9d 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java
@@ -38,7 +38,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java b/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java
index 1e2264ef77..c8cd0b2409 100644
--- a/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java
+++ b/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java
@@ -38,7 +38,7 @@ public class RelentlessRats extends mage.sets.tenthedition.RelentlessRats {
 
     public RelentlessRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/magic2011/RiseFromTheGrave.java
index 464483cc3e..37621edf97 100644
--- a/Mage.Sets/src/mage/sets/magic2011/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/magic2011/RiseFromTheGrave.java
@@ -38,7 +38,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2011/RootboundCrag.java
index 109acd3671..949ea771cb 100644
--- a/Mage.Sets/src/mage/sets/magic2011/RootboundCrag.java
+++ b/Mage.Sets/src/mage/sets/magic2011/RootboundCrag.java
@@ -38,7 +38,7 @@ public class RootboundCrag extends mage.sets.magic2010.RootboundCrag {
 
     public RootboundCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/RoyalAssassin.java b/Mage.Sets/src/mage/sets/magic2011/RoyalAssassin.java
index 922a242d10..41a6e3eee9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/magic2011/RoyalAssassin.java
@@ -38,7 +38,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/RuneclawBear.java b/Mage.Sets/src/mage/sets/magic2011/RuneclawBear.java
index 20acf986d5..ba33eacf93 100644
--- a/Mage.Sets/src/mage/sets/magic2011/RuneclawBear.java
+++ b/Mage.Sets/src/mage/sets/magic2011/RuneclawBear.java
@@ -38,7 +38,7 @@ public class RuneclawBear extends mage.sets.magic2010.RuneclawBear {
 
     public RuneclawBear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SafePassage.java b/Mage.Sets/src/mage/sets/magic2011/SafePassage.java
index a5a463d68f..a89c663a69 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SafePassage.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SafePassage.java
@@ -38,7 +38,7 @@ public class SafePassage extends mage.sets.magic2010.SafePassage {
 
     public SafePassage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java
index 9cdffdff10..2e3a636725 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java
@@ -41,7 +41,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
     public SerraAngel(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SiegeMastodon.java b/Mage.Sets/src/mage/sets/magic2011/SiegeMastodon.java
index 0980dd9d20..62f37b4e0d 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SiegeMastodon.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SiegeMastodon.java
@@ -38,7 +38,7 @@ public class SiegeMastodon extends mage.sets.magic2010.SiegeMastodon {
 
     public SiegeMastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2011/SignInBlood.java
index 79922befdf..b82e531956 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SignInBlood.java
@@ -38,7 +38,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Silence.java b/Mage.Sets/src/mage/sets/magic2011/Silence.java
index cad960b991..9ecfb7518a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Silence.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Silence.java
@@ -38,7 +38,7 @@ public class Silence extends mage.sets.magic2010.Silence {
 
     public Silence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SilvercoatLion.java b/Mage.Sets/src/mage/sets/magic2011/SilvercoatLion.java
index 22e86568d1..3cfe9621fa 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SilvercoatLion.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SilvercoatLion.java
@@ -38,7 +38,7 @@ public class SilvercoatLion extends mage.sets.magic2010.SilvercoatLion {
 
     public SilvercoatLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Sleep.java b/Mage.Sets/src/mage/sets/magic2011/Sleep.java
index 4f24f5e817..ab348c082d 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Sleep.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Sleep.java
@@ -38,7 +38,7 @@ public class Sleep extends mage.sets.magic2010.Sleep {
 
     public Sleep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2011/SolemnOffering.java
index e0c50e28b6..be38ef157e 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SolemnOffering.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SolemnOffering.java
@@ -38,7 +38,7 @@ public class SolemnOffering extends mage.sets.magic2010.SolemnOffering {
 
     public SolemnOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SpinedWurm.java b/Mage.Sets/src/mage/sets/magic2011/SpinedWurm.java
index 3ac7d9a1c5..aba81f4c7f 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SpinedWurm.java
@@ -38,7 +38,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/StormfrontPegasus.java b/Mage.Sets/src/mage/sets/magic2011/StormfrontPegasus.java
index e20bf2efde..9f5e8f7c19 100644
--- a/Mage.Sets/src/mage/sets/magic2011/StormfrontPegasus.java
+++ b/Mage.Sets/src/mage/sets/magic2011/StormfrontPegasus.java
@@ -38,7 +38,7 @@ public class StormfrontPegasus extends mage.sets.magic2010.StormfrontPegasus {
 
     public StormfrontPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2011/SunpetalGrove.java
index ebafa61723..815ae02487 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SunpetalGrove.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SunpetalGrove.java
@@ -38,7 +38,7 @@ public class SunpetalGrove extends mage.sets.magic2010.SunpetalGrove {
 
     public SunpetalGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/magic2011/TerramorphicExpanse.java
index 63b24bd83b..4274f22796 100644
--- a/Mage.Sets/src/mage/sets/magic2011/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/magic2011/TerramorphicExpanse.java
@@ -38,7 +38,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/TomeScour.java b/Mage.Sets/src/mage/sets/magic2011/TomeScour.java
index 337b178271..01b6583efa 100644
--- a/Mage.Sets/src/mage/sets/magic2011/TomeScour.java
+++ b/Mage.Sets/src/mage/sets/magic2011/TomeScour.java
@@ -38,7 +38,7 @@ public class TomeScour extends mage.sets.magic2010.TomeScour {
 
     public TomeScour(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Traumatize.java b/Mage.Sets/src/mage/sets/magic2011/Traumatize.java
index 5fd91c81b3..80e3374dc6 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Traumatize.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Traumatize.java
@@ -38,7 +38,7 @@ public class Traumatize extends mage.sets.tenthedition.Traumatize {
 
     public Traumatize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/UnholyStrength.java b/Mage.Sets/src/mage/sets/magic2011/UnholyStrength.java
index fde7169cf4..306fd4d094 100644
--- a/Mage.Sets/src/mage/sets/magic2011/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/magic2011/UnholyStrength.java
@@ -38,7 +38,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Unsummon.java b/Mage.Sets/src/mage/sets/magic2011/Unsummon.java
index 78600fc597..5fd8934754 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Unsummon.java
@@ -38,7 +38,7 @@ public class Unsummon extends mage.sets.conflux.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2011/WallOfFrost.java
index 897789eaa7..684f31315f 100644
--- a/Mage.Sets/src/mage/sets/magic2011/WallOfFrost.java
+++ b/Mage.Sets/src/mage/sets/magic2011/WallOfFrost.java
@@ -38,7 +38,7 @@ public class WallOfFrost extends mage.sets.magic2010.WallOfFrost {
 
     public WallOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/magic2011/WhispersilkCloak.java
index 1acaf89a06..1b559106df 100644
--- a/Mage.Sets/src/mage/sets/magic2011/WhispersilkCloak.java
+++ b/Mage.Sets/src/mage/sets/magic2011/WhispersilkCloak.java
@@ -38,7 +38,7 @@ public class WhispersilkCloak extends mage.sets.magic2010.WhispersilkCloak {
 
     public WhispersilkCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/WhiteKnight.java b/Mage.Sets/src/mage/sets/magic2011/WhiteKnight.java
index cde6595823..a5e2ab39c9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/magic2011/WhiteKnight.java
@@ -38,7 +38,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/WildGriffin.java b/Mage.Sets/src/mage/sets/magic2011/WildGriffin.java
index 4d4bd794a7..6475f9bc2c 100644
--- a/Mage.Sets/src/mage/sets/magic2011/WildGriffin.java
+++ b/Mage.Sets/src/mage/sets/magic2011/WildGriffin.java
@@ -38,7 +38,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin {
 
     public WildGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/WurmsTooth.java b/Mage.Sets/src/mage/sets/magic2011/WurmsTooth.java
index e22995b6f3..ea0465f2f9 100644
--- a/Mage.Sets/src/mage/sets/magic2011/WurmsTooth.java
+++ b/Mage.Sets/src/mage/sets/magic2011/WurmsTooth.java
@@ -38,7 +38,7 @@ public class WurmsTooth extends mage.sets.tenthedition.WurmsTooth {
 
     public WurmsTooth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "M11";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java b/Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java
index 30a676c499..af381e4aff 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java
@@ -39,7 +39,7 @@ public class AEtherAdept extends AetherAdept {
 
     public AEtherAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2012/AcidicSlime.java
index 8be97a6aca..43622e497c 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java
index 66b0b84574..30f7764d85 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java
@@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "M12";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2012/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2012/AlluringSiren.java
index 9cf204ef28..a675c526d2 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AlluringSiren.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AlluringSiren.java
@@ -37,7 +37,7 @@ public class AlluringSiren extends mage.sets.magic2010.AlluringSiren {
 
     public AlluringSiren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/AngelsFeather.java b/Mage.Sets/src/mage/sets/magic2012/AngelsFeather.java
index 07074c0c27..3b1a344dc9 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AngelsFeather.java
@@ -40,7 +40,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/AngelsMercy.java b/Mage.Sets/src/mage/sets/magic2012/AngelsMercy.java
index 6917d01e6e..93dd6cace3 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AngelsMercy.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AngelsMercy.java
@@ -37,7 +37,7 @@ public class AngelsMercy extends mage.sets.magic2010.AngelsMercy {
 
     public AngelsMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ArchonOfJustice.java b/Mage.Sets/src/mage/sets/magic2012/ArchonOfJustice.java
index bc2dce9579..03fa35c06d 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ArchonOfJustice.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ArchonOfJustice.java
@@ -37,7 +37,7 @@ public class ArchonOfJustice extends mage.sets.eventide.ArchonOfJustice {
 
     public ArchonOfJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/AssaultGriffin.java b/Mage.Sets/src/mage/sets/magic2012/AssaultGriffin.java
index c05641094f..aa8e3a7341 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AssaultGriffin.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AssaultGriffin.java
@@ -37,7 +37,7 @@ public class AssaultGriffin extends mage.sets.magic2011.AssaultGriffin {
 
     public AssaultGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/AutumnsVeil.java b/Mage.Sets/src/mage/sets/magic2012/AutumnsVeil.java
index ef7c5d45a6..6b8e36ccec 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AutumnsVeil.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AutumnsVeil.java
@@ -37,7 +37,7 @@ public class AutumnsVeil extends mage.sets.magic2011.AutumnsVeil {
 
     public AutumnsVeil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/BelltowerSphinx.java b/Mage.Sets/src/mage/sets/magic2012/BelltowerSphinx.java
index ccc0831190..55f446b6af 100644
--- a/Mage.Sets/src/mage/sets/magic2012/BelltowerSphinx.java
+++ b/Mage.Sets/src/mage/sets/magic2012/BelltowerSphinx.java
@@ -37,7 +37,7 @@ public class BelltowerSphinx extends mage.sets.ravnica.BelltowerSphinx {
 
     public BelltowerSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/magic2012/BirdsOfParadise.java
index d91df8f89d..4f8598da7f 100644
--- a/Mage.Sets/src/mage/sets/magic2012/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/magic2012/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodSeeker.java b/Mage.Sets/src/mage/sets/magic2012/BloodSeeker.java
index 3a6be0d414..5a45032e0a 100644
--- a/Mage.Sets/src/mage/sets/magic2012/BloodSeeker.java
+++ b/Mage.Sets/src/mage/sets/magic2012/BloodSeeker.java
@@ -37,7 +37,7 @@ public class BloodSeeker extends mage.sets.zendikar.BloodSeeker {
 
     public BloodSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/BrindleBoar.java b/Mage.Sets/src/mage/sets/magic2012/BrindleBoar.java
index 5dedfddf17..cb8486ce5a 100644
--- a/Mage.Sets/src/mage/sets/magic2012/BrindleBoar.java
+++ b/Mage.Sets/src/mage/sets/magic2012/BrindleBoar.java
@@ -37,7 +37,7 @@ public class BrindleBoar extends mage.sets.magic2011.BrindleBoar {
 
     public BrindleBoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/BrinkOfDisaster.java b/Mage.Sets/src/mage/sets/magic2012/BrinkOfDisaster.java
index 721d581eb3..204c162a4d 100644
--- a/Mage.Sets/src/mage/sets/magic2012/BrinkOfDisaster.java
+++ b/Mage.Sets/src/mage/sets/magic2012/BrinkOfDisaster.java
@@ -37,7 +37,7 @@ public class BrinkOfDisaster extends mage.sets.worldwake.BrinkOfDisaster {
 
     public BrinkOfDisaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Cancel.java b/Mage.Sets/src/mage/sets/magic2012/Cancel.java
index 56f321a1f1..0f3dd7ad05 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Cancel.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/CelestialPurge.java b/Mage.Sets/src/mage/sets/magic2012/CelestialPurge.java
index 49b65e9823..a708a51f06 100644
--- a/Mage.Sets/src/mage/sets/magic2012/CelestialPurge.java
+++ b/Mage.Sets/src/mage/sets/magic2012/CelestialPurge.java
@@ -37,7 +37,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge {
 
     public CelestialPurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2012/ChandrasOutrage.java
index c399a5a099..f76dad8720 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ChandrasOutrage.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ChandrasOutrage.java
@@ -37,7 +37,7 @@ public class ChandrasOutrage extends mage.sets.magic2011.ChandrasOutrage {
 
     public ChandrasOutrage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2012/ChildOfNight.java
index e3757ec49c..b09a29a134 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ChildOfNight.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ChildOfNight.java
@@ -37,7 +37,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight {
 
     public ChildOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Combust.java b/Mage.Sets/src/mage/sets/magic2012/Combust.java
index 907eb2a4c5..e8419c92b0 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Combust.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Combust.java
@@ -37,7 +37,7 @@ public class Combust extends mage.sets.magic2011.Combust {
 
     public Combust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/magic2012/ConsumeSpirit.java
index a6cbe677b9..b95656e317 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ConsumeSpirit.java
@@ -37,7 +37,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/CoralMerfolk.java b/Mage.Sets/src/mage/sets/magic2012/CoralMerfolk.java
index 67d55c6c96..f98f1aa42a 100644
--- a/Mage.Sets/src/mage/sets/magic2012/CoralMerfolk.java
+++ b/Mage.Sets/src/mage/sets/magic2012/CoralMerfolk.java
@@ -37,7 +37,7 @@ public class CoralMerfolk extends mage.sets.magic2010.CoralMerfolk {
 
     public CoralMerfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2012/CudgelTroll.java
index 6757280ec7..9627bfa0e3 100644
--- a/Mage.Sets/src/mage/sets/magic2012/CudgelTroll.java
+++ b/Mage.Sets/src/mage/sets/magic2012/CudgelTroll.java
@@ -37,7 +37,7 @@ public class CudgelTroll extends mage.sets.magic2010.CudgelTroll {
 
     public CudgelTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DayOfJudgment.java b/Mage.Sets/src/mage/sets/magic2012/DayOfJudgment.java
index c8859bc57d..40a0c7b5a7 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DayOfJudgment.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DayOfJudgment.java
@@ -37,7 +37,7 @@ public class DayOfJudgment extends mage.sets.zendikar.DayOfJudgment {
 
     public DayOfJudgment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Deathmark.java b/Mage.Sets/src/mage/sets/magic2012/Deathmark.java
index a2d75a6e01..4c21a83531 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Deathmark.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Deathmark.java
@@ -37,7 +37,7 @@ public class Deathmark extends mage.sets.tenthedition.Deathmark {
 
     public Deathmark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DemonsHorn.java b/Mage.Sets/src/mage/sets/magic2012/DemonsHorn.java
index e6decf7357..d1bef0934b 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DemonsHorn.java
@@ -38,7 +38,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Demystify.java b/Mage.Sets/src/mage/sets/magic2012/Demystify.java
index 1bfdd72a9c..d180ed1829 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Demystify.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Demystify.java
@@ -37,7 +37,7 @@ public class Demystify extends mage.sets.tenthedition.Demystify {
 
     public Demystify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DiabolicTutor.java b/Mage.Sets/src/mage/sets/magic2012/DiabolicTutor.java
index 0629d9e864..b336f9f1c7 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DiabolicTutor.java
@@ -37,7 +37,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Disentomb.java b/Mage.Sets/src/mage/sets/magic2012/Disentomb.java
index db81aa806d..49958bc236 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Disentomb.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Disentomb.java
@@ -37,7 +37,7 @@ public class Disentomb extends mage.sets.magic2010.Disentomb {
 
     public Disentomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Distress.java b/Mage.Sets/src/mage/sets/magic2012/Distress.java
index 56eadb5cf0..2eb3f4b366 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Distress.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Distress.java
@@ -37,7 +37,7 @@ public class Distress extends mage.sets.tenthedition.Distress {
 
     public Distress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DjinnOfWishes.java b/Mage.Sets/src/mage/sets/magic2012/DjinnOfWishes.java
index 1db931e57a..88c7ac788e 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DjinnOfWishes.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DjinnOfWishes.java
@@ -37,7 +37,7 @@ public class DjinnOfWishes extends mage.sets.magic2010.DjinnOfWishes {
 
     public DjinnOfWishes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2012/DoomBlade.java
index efc647a862..adfeea6b5a 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DoomBlade.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DoomBlade.java
@@ -37,7 +37,7 @@ public class DoomBlade extends mage.sets.magic2010.DoomBlade {
 
     public DoomBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DragonsClaw.java b/Mage.Sets/src/mage/sets/magic2012/DragonsClaw.java
index f9ca4f955e..527e00c60b 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DragonsClaw.java
@@ -38,7 +38,7 @@ public class DragonsClaw extends mage.sets.tenthedition.DragonsClaw {
 
     public DragonsClaw (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2012/DragonskullSummit.java
index f06b000d32..2c924c1012 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DragonskullSummit.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DragonskullSummit.java
@@ -37,7 +37,7 @@ public class DragonskullSummit extends mage.sets.magic2010.DragonskullSummit {
 
     public DragonskullSummit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2012/DrownedCatacomb.java
index 19ffa525ed..96d38a9113 100644
--- a/Mage.Sets/src/mage/sets/magic2012/DrownedCatacomb.java
+++ b/Mage.Sets/src/mage/sets/magic2012/DrownedCatacomb.java
@@ -37,7 +37,7 @@ public class DrownedCatacomb extends mage.sets.magic2010.DrownedCatacomb {
 
     public DrownedCatacomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2012/EliteVanguard.java
index 3be8bdbe1f..5847523e40 100644
--- a/Mage.Sets/src/mage/sets/magic2012/EliteVanguard.java
+++ b/Mage.Sets/src/mage/sets/magic2012/EliteVanguard.java
@@ -37,7 +37,7 @@ public class EliteVanguard extends mage.sets.magic2010.EliteVanguard {
 
     public EliteVanguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2012/ElixirOfImmortality.java
index 862d919ff7..f23f933215 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ElixirOfImmortality.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ElixirOfImmortality.java
@@ -37,7 +37,7 @@ public class ElixirOfImmortality extends mage.sets.magic2011.ElixirOfImmortality
 
     public ElixirOfImmortality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2012/ElvishArchdruid.java
index 6e063d06a4..7121f4a568 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ElvishArchdruid.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ElvishArchdruid.java
@@ -37,7 +37,7 @@ public class ElvishArchdruid extends mage.sets.magic2010.ElvishArchdruid {
 
     public ElvishArchdruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2012/FieryHellhound.java
index 0703857ecb..ca91c76eba 100644
--- a/Mage.Sets/src/mage/sets/magic2012/FieryHellhound.java
+++ b/Mage.Sets/src/mage/sets/magic2012/FieryHellhound.java
@@ -37,7 +37,7 @@ public class FieryHellhound extends mage.sets.magic2010.FieryHellhound {
 
     public FieryHellhound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Fireball.java b/Mage.Sets/src/mage/sets/magic2012/Fireball.java
index 80fc49ed44..c8861001bb 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Fireball.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/FlameblastDragon.java b/Mage.Sets/src/mage/sets/magic2012/FlameblastDragon.java
index b9a2c40c75..88743e46b5 100644
--- a/Mage.Sets/src/mage/sets/magic2012/FlameblastDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2012/FlameblastDragon.java
@@ -37,7 +37,7 @@ public class FlameblastDragon extends mage.sets.shardsofalara.FlameblastDragon {
 
     public FlameblastDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Flashfreeze.java b/Mage.Sets/src/mage/sets/magic2012/Flashfreeze.java
index 5fe5f1c956..073ad16885 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Flashfreeze.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Flashfreeze.java
@@ -37,7 +37,7 @@ public class Flashfreeze extends mage.sets.tenthedition.Flashfreeze {
 
     public Flashfreeze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Fling.java b/Mage.Sets/src/mage/sets/magic2012/Fling.java
index e042a0dbda..01693796db 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Fling.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Fling.java
@@ -37,7 +37,7 @@ public class Fling extends mage.sets.magic2011.Fling {
 
     public Fling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Fog.java b/Mage.Sets/src/mage/sets/magic2012/Fog.java
index 714a5a5f68..1df5a80cb4 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Fog.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2012/FrostTitan.java
index fa61356e16..95b0c06a78 100644
--- a/Mage.Sets/src/mage/sets/magic2012/FrostTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2012/FrostTitan.java
@@ -37,7 +37,7 @@ public class FrostTitan extends mage.sets.magic2011.FrostTitan {
 
     public FrostTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GarruksCompanion.java b/Mage.Sets/src/mage/sets/magic2012/GarruksCompanion.java
index 1435001375..c2daef32c5 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GarruksCompanion.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GarruksCompanion.java
@@ -37,7 +37,7 @@ public class GarruksCompanion extends mage.sets.magic2011.GarruksCompanion {
 
     public GarruksCompanion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GiantSpider.java b/Mage.Sets/src/mage/sets/magic2012/GiantSpider.java
index b9b1a76dc8..afc73553a9 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonJura.java b/Mage.Sets/src/mage/sets/magic2012/GideonJura.java
index 6e0133a536..8671196ff6 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GideonJura.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GideonJura.java
@@ -37,7 +37,7 @@ public class GideonJura extends mage.sets.riseoftheeldrazi.GideonJura {
 
     public GideonJura(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2012/GlacialFortress.java
index bde3b73811..aae9c05ac0 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GlacialFortress.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GlacialFortress.java
@@ -37,7 +37,7 @@ public class GlacialFortress extends mage.sets.magic2010.GlacialFortress {
 
     public GlacialFortress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinArsonist.java b/Mage.Sets/src/mage/sets/magic2012/GoblinArsonist.java
index ac18019f50..8c6edacd30 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GoblinArsonist.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GoblinArsonist.java
@@ -37,7 +37,7 @@ public class GoblinArsonist extends mage.sets.riseoftheeldrazi.GoblinArsonist {
 
     public GoblinArsonist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2012/GoblinChieftain.java
index 5f0fb5bc64..cf063d5083 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GoblinChieftain.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GoblinChieftain.java
@@ -37,7 +37,7 @@ public class GoblinChieftain extends mage.sets.magic2010.GoblinChieftain {
 
     public GoblinChieftain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinPiker.java b/Mage.Sets/src/mage/sets/magic2012/GoblinPiker.java
index a4c56b18e3..51277b7768 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GoblinPiker.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GoblinPiker.java
@@ -37,7 +37,7 @@ public class GoblinPiker extends mage.sets.tenthedition.GoblinPiker {
 
     public GoblinPiker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinTunneler.java b/Mage.Sets/src/mage/sets/magic2012/GoblinTunneler.java
index 442f3ee21b..932d12f7c3 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GoblinTunneler.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GoblinTunneler.java
@@ -37,7 +37,7 @@ public class GoblinTunneler extends mage.sets.riseoftheeldrazi.GoblinTunneler {
 
     public GoblinTunneler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/magic2012/GoblinWarPaint.java
index 18952bc1c7..a81e8ea67d 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GoblinWarPaint.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GoblinWarPaint.java
@@ -37,7 +37,7 @@ public class GoblinWarPaint extends mage.sets.zendikar.GoblinWarPaint {
 
     public GoblinWarPaint(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2012/GraveTitan.java
index 36ba54390d..2e7fd90cd1 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GraveTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GraveTitan.java
@@ -37,7 +37,7 @@ public class GraveTitan extends mage.sets.magic2011.GraveTitan {
 
     public GraveTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Gravedigger.java b/Mage.Sets/src/mage/sets/magic2012/Gravedigger.java
index 102ac99c62..9ccf61076b 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GreaterBasilisk.java b/Mage.Sets/src/mage/sets/magic2012/GreaterBasilisk.java
index 2909f664d8..d73c90af27 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GreaterBasilisk.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GreaterBasilisk.java
@@ -37,7 +37,7 @@ public class GreaterBasilisk extends mage.sets.magic2011.GreaterBasilisk {
 
     public GreaterBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/GriffinSentinel.java b/Mage.Sets/src/mage/sets/magic2012/GriffinSentinel.java
index 1ecc506190..d614b98658 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GriffinSentinel.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GriffinSentinel.java
@@ -37,7 +37,7 @@ public class GriffinSentinel extends mage.sets.magic2010.GriffinSentinel {
 
     public GriffinSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2012/HarborSerpent.java
index 2b9c93e807..492595b03e 100644
--- a/Mage.Sets/src/mage/sets/magic2012/HarborSerpent.java
+++ b/Mage.Sets/src/mage/sets/magic2012/HarborSerpent.java
@@ -37,7 +37,7 @@ public class HarborSerpent extends mage.sets.magic2011.HarborSerpent {
 
     public HarborSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2012/HonorOfThePure.java
index b9dc0f5b10..f27e2d2ef3 100644
--- a/Mage.Sets/src/mage/sets/magic2012/HonorOfThePure.java
+++ b/Mage.Sets/src/mage/sets/magic2012/HonorOfThePure.java
@@ -37,7 +37,7 @@ public class HonorOfThePure extends mage.sets.magic2010.HonorOfThePure {
 
     public HonorOfThePure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/IceCage.java b/Mage.Sets/src/mage/sets/magic2012/IceCage.java
index 0fd9018307..42b723b584 100644
--- a/Mage.Sets/src/mage/sets/magic2012/IceCage.java
+++ b/Mage.Sets/src/mage/sets/magic2012/IceCage.java
@@ -37,7 +37,7 @@ public class IceCage extends mage.sets.magic2010.IceCage {
 
     public IceCage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Incinerate.java b/Mage.Sets/src/mage/sets/magic2012/Incinerate.java
index f9f4173044..0c5efede48 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2012/InfernoTitan.java
index 663bdbcb0d..a3deba13ec 100644
--- a/Mage.Sets/src/mage/sets/magic2012/InfernoTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2012/InfernoTitan.java
@@ -37,7 +37,7 @@ public class InfernoTitan extends mage.sets.magic2011.InfernoTitan {
 
     public InfernoTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/JacesErasure.java b/Mage.Sets/src/mage/sets/magic2012/JacesErasure.java
index 86c80e6a13..c89e8a9a63 100644
--- a/Mage.Sets/src/mage/sets/magic2012/JacesErasure.java
+++ b/Mage.Sets/src/mage/sets/magic2012/JacesErasure.java
@@ -37,7 +37,7 @@ public class JacesErasure extends mage.sets.magic2011.JacesErasure {
 
     public JacesErasure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/KrakensEye.java b/Mage.Sets/src/mage/sets/magic2012/KrakensEye.java
index f81bfe9fd8..b477fa2a42 100644
--- a/Mage.Sets/src/mage/sets/magic2012/KrakensEye.java
+++ b/Mage.Sets/src/mage/sets/magic2012/KrakensEye.java
@@ -37,7 +37,7 @@ public class KrakensEye extends mage.sets.tenthedition.KrakensEye {
 
     public KrakensEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "M12";
 
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2012/LavaAxe.java
index 42583aea4b..214ed717a2 100644
--- a/Mage.Sets/src/mage/sets/magic2012/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/magic2012/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/LightningElemental.java b/Mage.Sets/src/mage/sets/magic2012/LightningElemental.java
index a167b216d3..bf259fbde1 100644
--- a/Mage.Sets/src/mage/sets/magic2012/LightningElemental.java
+++ b/Mage.Sets/src/mage/sets/magic2012/LightningElemental.java
@@ -37,7 +37,7 @@ public class LightningElemental extends mage.sets.tenthedition.LightningElementa
 
     public LightningElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/LlanowarElves.java b/Mage.Sets/src/mage/sets/magic2012/LlanowarElves.java
index 9f011c5648..2715f47f74 100644
--- a/Mage.Sets/src/mage/sets/magic2012/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/magic2012/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Lure.java b/Mage.Sets/src/mage/sets/magic2012/Lure.java
index 0827cd163b..f48d99c123 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Lure.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ManaLeak.java b/Mage.Sets/src/mage/sets/magic2012/ManaLeak.java
index 0d9f097d4c..7f07461cc9 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Manabarbs.java b/Mage.Sets/src/mage/sets/magic2012/Manabarbs.java
index d9b77bfee3..7d6bf8b2b3 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2012/ManicVandal.java
index fc6397441c..07fe0f90d1 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ManicVandal.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ManicVandal.java
@@ -37,7 +37,7 @@ public class ManicVandal extends mage.sets.magic2011.ManicVandal {
 
     public ManicVandal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/MesaEnchantress.java b/Mage.Sets/src/mage/sets/magic2012/MesaEnchantress.java
index da0a5cf2db..7e51cb1a44 100644
--- a/Mage.Sets/src/mage/sets/magic2012/MesaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/magic2012/MesaEnchantress.java
@@ -37,7 +37,7 @@ public class MesaEnchantress extends mage.sets.magic2010.MesaEnchantress {
 
     public MesaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2012/MightyLeap.java
index c1b50c0b69..ad7fa79ec8 100644
--- a/Mage.Sets/src/mage/sets/magic2012/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/magic2012/MightyLeap.java
@@ -37,7 +37,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/MindControl.java b/Mage.Sets/src/mage/sets/magic2012/MindControl.java
index 090ebf3aa8..a6a2f7921e 100644
--- a/Mage.Sets/src/mage/sets/magic2012/MindControl.java
+++ b/Mage.Sets/src/mage/sets/magic2012/MindControl.java
@@ -37,7 +37,7 @@ public class MindControl extends mage.sets.magic2010.MindControl {
 
     public MindControl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/MindRot.java b/Mage.Sets/src/mage/sets/magic2012/MindRot.java
index 8477f4ee92..2a94e3c585 100644
--- a/Mage.Sets/src/mage/sets/magic2012/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magic2012/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Naturalize.java b/Mage.Sets/src/mage/sets/magic2012/Naturalize.java
index 639cad00f3..db309d05a8 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Negate.java b/Mage.Sets/src/mage/sets/magic2012/Negate.java
index 50d666cb05..ef4f83cef4 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Negate.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java b/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java
index b9458492da..80995567ca 100644
--- a/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java
@@ -38,7 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "M12";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2012/Overrun.java b/Mage.Sets/src/mage/sets/magic2012/Overrun.java
index 67de450137..ebc4912bf9 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Overrun.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Pacifism.java b/Mage.Sets/src/mage/sets/magic2012/Pacifism.java
index 5071e95399..cf69e5be95 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Pentavus.java b/Mage.Sets/src/mage/sets/magic2012/Pentavus.java
index f3ceff2e5f..1d7907e41a 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Pentavus.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Pentavus.java
@@ -37,7 +37,7 @@ public class Pentavus extends mage.sets.elspethvstezzeret.Pentavus {
 
     public Pentavus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Plummet.java b/Mage.Sets/src/mage/sets/magic2012/Plummet.java
index 9637e762b3..b9f624bf31 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Plummet.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Ponder.java b/Mage.Sets/src/mage/sets/magic2012/Ponder.java
index d8313ba114..a646fc83e2 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Ponder.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Ponder.java
@@ -37,7 +37,7 @@ public class Ponder extends mage.sets.magic2010.Ponder {
 
     public Ponder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2012/PrimevalTitan.java
index 52fadb4e72..3f2bfe13ba 100644
--- a/Mage.Sets/src/mage/sets/magic2012/PrimevalTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2012/PrimevalTitan.java
@@ -37,7 +37,7 @@ public class PrimevalTitan extends mage.sets.magic2011.PrimevalTitan {
 
     public PrimevalTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/RampantGrowth.java b/Mage.Sets/src/mage/sets/magic2012/RampantGrowth.java
index a5f689ceff..13af221c45 100644
--- a/Mage.Sets/src/mage/sets/magic2012/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/magic2012/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/magic2012/ReassemblingSkeleton.java
index 91e4ba457d..8ac5ba3b32 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ReassemblingSkeleton.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ReassemblingSkeleton.java
@@ -37,7 +37,7 @@ public class ReassemblingSkeleton extends mage.sets.magic2011.ReassemblingSkelet
 
     public ReassemblingSkeleton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Redirect.java b/Mage.Sets/src/mage/sets/magic2012/Redirect.java
index a83812fc17..05ac7b40fd 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Redirect.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Redirect.java
@@ -37,7 +37,7 @@ public class Redirect extends mage.sets.magic2011.Redirect {
 
     public Redirect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Reverberate.java b/Mage.Sets/src/mage/sets/magic2012/Reverberate.java
index 6368635b21..b10b794c80 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Reverberate.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Reverberate.java
@@ -37,7 +37,7 @@ public class Reverberate extends mage.sets.magic2011.Reverberate {
 
     public Reverberate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/RocEgg.java b/Mage.Sets/src/mage/sets/magic2012/RocEgg.java
index b1930bfce6..f59349ae59 100644
--- a/Mage.Sets/src/mage/sets/magic2012/RocEgg.java
+++ b/Mage.Sets/src/mage/sets/magic2012/RocEgg.java
@@ -37,7 +37,7 @@ public class RocEgg extends mage.sets.magic2011.RocEgg {
 
     public RocEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2012/RootboundCrag.java
index d71272c7b9..f5d18414b1 100644
--- a/Mage.Sets/src/mage/sets/magic2012/RootboundCrag.java
+++ b/Mage.Sets/src/mage/sets/magic2012/RootboundCrag.java
@@ -37,7 +37,7 @@ public class RootboundCrag extends mage.sets.magic2010.RootboundCrag {
 
     public RootboundCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/RoyalAssassin.java b/Mage.Sets/src/mage/sets/magic2012/RoyalAssassin.java
index 63f2459e72..0c45402b8b 100644
--- a/Mage.Sets/src/mage/sets/magic2012/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/magic2012/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/RuneclawBear.java b/Mage.Sets/src/mage/sets/magic2012/RuneclawBear.java
index fb240710c6..38d76b4b08 100644
--- a/Mage.Sets/src/mage/sets/magic2012/RuneclawBear.java
+++ b/Mage.Sets/src/mage/sets/magic2012/RuneclawBear.java
@@ -37,7 +37,7 @@ public class RuneclawBear extends mage.sets.magic2010.RuneclawBear {
 
     public RuneclawBear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SacredWolf.java b/Mage.Sets/src/mage/sets/magic2012/SacredWolf.java
index 325888d8f8..66f4e8cd33 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SacredWolf.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SacredWolf.java
@@ -37,7 +37,7 @@ public class SacredWolf extends mage.sets.magic2011.SacredWolf {
 
     public SacredWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SengirVampire.java b/Mage.Sets/src/mage/sets/magic2012/SengirVampire.java
index 8e974a7ec4..657b5aea9e 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "M12";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2012/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2012/SerraAngel.java
index efc0df751d..faa2ad7f13 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SerraAngel.java
@@ -40,7 +40,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
     public SerraAngel(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Shock.java b/Mage.Sets/src/mage/sets/magic2012/Shock.java
index 679b5762c8..27cdbe5d3e 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Shock.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SiegeMastodon.java b/Mage.Sets/src/mage/sets/magic2012/SiegeMastodon.java
index 452f1d1a06..8885231da7 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SiegeMastodon.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SiegeMastodon.java
@@ -37,7 +37,7 @@ public class SiegeMastodon extends mage.sets.magic2010.SiegeMastodon {
 
     public SiegeMastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SlaughterCry.java b/Mage.Sets/src/mage/sets/magic2012/SlaughterCry.java
index a80eedaa50..24be8e271d 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SlaughterCry.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SlaughterCry.java
@@ -37,7 +37,7 @@ public class SlaughterCry extends mage.sets.zendikar.SlaughterCry {
 
     public SlaughterCry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinMarkov.java b/Mage.Sets/src/mage/sets/magic2012/SorinMarkov.java
index 072cd5c151..129d75f0b0 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SorinMarkov.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SorinMarkov.java
@@ -37,7 +37,7 @@ public class SorinMarkov extends mage.sets.zendikar.SorinMarkov {
 
     public SorinMarkov(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/StormfrontPegasus.java b/Mage.Sets/src/mage/sets/magic2012/StormfrontPegasus.java
index 2c12e692e2..b445fac386 100644
--- a/Mage.Sets/src/mage/sets/magic2012/StormfrontPegasus.java
+++ b/Mage.Sets/src/mage/sets/magic2012/StormfrontPegasus.java
@@ -37,7 +37,7 @@ public class StormfrontPegasus extends mage.sets.magic2010.StormfrontPegasus {
 
     public StormfrontPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SunTitan.java b/Mage.Sets/src/mage/sets/magic2012/SunTitan.java
index e76e8c262e..ee8a841d3c 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SunTitan.java
@@ -37,7 +37,7 @@ public class SunTitan extends mage.sets.magic2011.SunTitan {
 
     public SunTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2012/SunpetalGrove.java
index 84d3ebabe8..a238a4874e 100644
--- a/Mage.Sets/src/mage/sets/magic2012/SunpetalGrove.java
+++ b/Mage.Sets/src/mage/sets/magic2012/SunpetalGrove.java
@@ -37,7 +37,7 @@ public class SunpetalGrove extends mage.sets.magic2010.SunpetalGrove {
 
     public SunpetalGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/TimeReversal.java b/Mage.Sets/src/mage/sets/magic2012/TimeReversal.java
index b3b9d13468..2997c02d59 100644
--- a/Mage.Sets/src/mage/sets/magic2012/TimeReversal.java
+++ b/Mage.Sets/src/mage/sets/magic2012/TimeReversal.java
@@ -37,7 +37,7 @@ public class TimeReversal extends mage.sets.magic2011.TimeReversal {
 
     public TimeReversal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/Unsummon.java b/Mage.Sets/src/mage/sets/magic2012/Unsummon.java
index 019ca420b6..b8dd1148e7 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/VastwoodGorger.java b/Mage.Sets/src/mage/sets/magic2012/VastwoodGorger.java
index cd958415bf..d9f2003abc 100644
--- a/Mage.Sets/src/mage/sets/magic2012/VastwoodGorger.java
+++ b/Mage.Sets/src/mage/sets/magic2012/VastwoodGorger.java
@@ -37,7 +37,7 @@ public class VastwoodGorger extends mage.sets.zendikar.VastwoodGorger {
 
     public VastwoodGorger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/WarpathGhoul.java b/Mage.Sets/src/mage/sets/magic2012/WarpathGhoul.java
index a820055f27..8c837c0817 100644
--- a/Mage.Sets/src/mage/sets/magic2012/WarpathGhoul.java
+++ b/Mage.Sets/src/mage/sets/magic2012/WarpathGhoul.java
@@ -37,7 +37,7 @@ public class WarpathGhoul extends mage.sets.magic2010.WarpathGhoul {
 
     public WarpathGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "M12";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/WurmsTooth.java b/Mage.Sets/src/mage/sets/magic2012/WurmsTooth.java
index 9eacceac51..54ed7b31ac 100644
--- a/Mage.Sets/src/mage/sets/magic2012/WurmsTooth.java
+++ b/Mage.Sets/src/mage/sets/magic2012/WurmsTooth.java
@@ -38,7 +38,7 @@ public class WurmsTooth extends mage.sets.tenthedition.WurmsTooth {
 
     public WurmsTooth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "M12";
 
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2013/AcidicSlime.java
index dcbf8c4c52..188c51e753 100644
--- a/Mage.Sets/src/mage/sets/magic2013/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/magic2013/AcidicSlime.java
@@ -37,7 +37,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime {
 
     public AcidicSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/AngelicBenediction.java b/Mage.Sets/src/mage/sets/magic2013/AngelicBenediction.java
index d16610d440..7b3bc748d5 100644
--- a/Mage.Sets/src/mage/sets/magic2013/AngelicBenediction.java
+++ b/Mage.Sets/src/mage/sets/magic2013/AngelicBenediction.java
@@ -37,7 +37,7 @@ public class AngelicBenediction extends mage.sets.shardsofalara.AngelicBenedicti
 
     public AngelicBenediction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/AngelsMercy.java b/Mage.Sets/src/mage/sets/magic2013/AngelsMercy.java
index 3259cfd5a4..695fa897e8 100644
--- a/Mage.Sets/src/mage/sets/magic2013/AngelsMercy.java
+++ b/Mage.Sets/src/mage/sets/magic2013/AngelsMercy.java
@@ -37,7 +37,7 @@ public class AngelsMercy extends mage.sets.magic2010.AngelsMercy {
 
     public AngelsMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ArborElf.java b/Mage.Sets/src/mage/sets/magic2013/ArborElf.java
index 9870c493cf..1bc67f7f09 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ArborElf.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ArborElf.java
@@ -37,7 +37,7 @@ public class ArborElf extends mage.sets.worldwake.ArborElf {
 
     public ArborElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/AvenSquire.java b/Mage.Sets/src/mage/sets/magic2013/AvenSquire.java
index 4a0dcae909..666ba314ba 100644
--- a/Mage.Sets/src/mage/sets/magic2013/AvenSquire.java
+++ b/Mage.Sets/src/mage/sets/magic2013/AvenSquire.java
@@ -37,7 +37,7 @@ public class AvenSquire extends mage.sets.conflux.AvenSquire {
 
     public AvenSquire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/BattleOfWits.java b/Mage.Sets/src/mage/sets/magic2013/BattleOfWits.java
index 776afdd0b9..bc63378228 100644
--- a/Mage.Sets/src/mage/sets/magic2013/BattleOfWits.java
+++ b/Mage.Sets/src/mage/sets/magic2013/BattleOfWits.java
@@ -37,7 +37,7 @@ public class BattleOfWits extends mage.sets.ninthedition.BattleOfWits {
 
     public BattleOfWits(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/BladetuskBoar.java b/Mage.Sets/src/mage/sets/magic2013/BladetuskBoar.java
index 2826b4c039..d6cee67de7 100644
--- a/Mage.Sets/src/mage/sets/magic2013/BladetuskBoar.java
+++ b/Mage.Sets/src/mage/sets/magic2013/BladetuskBoar.java
@@ -37,7 +37,7 @@ public class BladetuskBoar extends mage.sets.zendikar.BladetuskBoar {
 
     public BladetuskBoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/magic2013/BloodthroneVampire.java
index 9e22ba709c..193b24811e 100644
--- a/Mage.Sets/src/mage/sets/magic2013/BloodthroneVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2013/BloodthroneVampire.java
@@ -37,7 +37,7 @@ public class BloodthroneVampire extends mage.sets.riseoftheeldrazi.BloodthroneVa
 
     public BloodthroneVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/BountifulHarvest.java b/Mage.Sets/src/mage/sets/magic2013/BountifulHarvest.java
index 362360c97f..e33e5f9bd9 100644
--- a/Mage.Sets/src/mage/sets/magic2013/BountifulHarvest.java
+++ b/Mage.Sets/src/mage/sets/magic2013/BountifulHarvest.java
@@ -37,7 +37,7 @@ public class BountifulHarvest extends mage.sets.magic2012.BountifulHarvest {
 
     public BountifulHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/magic2013/CanyonMinotaur.java
index 518b5a867e..0c9202fbab 100644
--- a/Mage.Sets/src/mage/sets/magic2013/CanyonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/magic2013/CanyonMinotaur.java
@@ -37,7 +37,7 @@ public class CanyonMinotaur extends mage.sets.conflux.CanyonMinotaur {
 
     public CanyonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/CaptainOfTheWatch.java b/Mage.Sets/src/mage/sets/magic2013/CaptainOfTheWatch.java
index 2703eeadb9..bfe4becf04 100644
--- a/Mage.Sets/src/mage/sets/magic2013/CaptainOfTheWatch.java
+++ b/Mage.Sets/src/mage/sets/magic2013/CaptainOfTheWatch.java
@@ -37,7 +37,7 @@ public class CaptainOfTheWatch extends mage.sets.magic2010.CaptainOfTheWatch {
 
     public CaptainOfTheWatch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/CentaurCourser.java b/Mage.Sets/src/mage/sets/magic2013/CentaurCourser.java
index 1b3c2c8889..badc3f4ad1 100644
--- a/Mage.Sets/src/mage/sets/magic2013/CentaurCourser.java
+++ b/Mage.Sets/src/mage/sets/magic2013/CentaurCourser.java
@@ -37,7 +37,7 @@ public class CentaurCourser extends mage.sets.magic2010.CentaurCourser {
 
     public CentaurCourser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ChandraTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2013/ChandraTheFirebrand.java
index 3af57d38ee..92640ff9ea 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ChandraTheFirebrand.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ChandraTheFirebrand.java
@@ -37,7 +37,7 @@ public class ChandraTheFirebrand extends mage.sets.magic2012.ChandraTheFirebrand
 
     public ChandraTheFirebrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Clone.java b/Mage.Sets/src/mage/sets/magic2013/Clone.java
index 20397f488c..374a74e8cc 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Clone.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Clone.java
@@ -37,7 +37,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DarkFavor.java b/Mage.Sets/src/mage/sets/magic2013/DarkFavor.java
index ac48ec1662..a6c7247441 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DarkFavor.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DarkFavor.java
@@ -37,7 +37,7 @@ public class DarkFavor extends mage.sets.magic2012.DarkFavor {
 
     public DarkFavor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/magic2013/DeadlyRecluse.java
index 1496c7541d..e1695e7a3d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DeadlyRecluse.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DeadlyRecluse.java
@@ -37,7 +37,7 @@ public class DeadlyRecluse extends mage.sets.magic2010.DeadlyRecluse {
 
     public DeadlyRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Disentomb.java b/Mage.Sets/src/mage/sets/magic2013/Disentomb.java
index a0de8fb6e9..33ac953a66 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Disentomb.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Disentomb.java
@@ -37,7 +37,7 @@ public class Disentomb extends mage.sets.magic2010.Disentomb {
 
     public Disentomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Divination.java b/Mage.Sets/src/mage/sets/magic2013/Divination.java
index 6761b2c3c5..bc4af47eb7 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Divination.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Divination.java
@@ -37,7 +37,7 @@ public class Divination extends mage.sets.magic2012.Divination {
 
     public Divination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2013/DivineFavor.java
index ccee6c77f7..5be92b842d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DivineFavor.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DivineFavor.java
@@ -37,7 +37,7 @@ public class DivineFavor extends mage.sets.magic2012.DivineFavor {
 
     public DivineFavor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DivineVerdict.java b/Mage.Sets/src/mage/sets/magic2013/DivineVerdict.java
index a8b5ececdd..4d958d6294 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DivineVerdict.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DivineVerdict.java
@@ -37,7 +37,7 @@ public class DivineVerdict extends mage.sets.magic2010.DivineVerdict {
 
     public DivineVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DoorToNothingness.java b/Mage.Sets/src/mage/sets/magic2013/DoorToNothingness.java
index 975acd9c77..062f48b181 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DoorToNothingness.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DoorToNothingness.java
@@ -37,7 +37,7 @@ public class DoorToNothingness extends mage.sets.planechase.DoorToNothingness {
 
     public DoorToNothingness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2013/DragonskullSummit.java
index 6f6bf325d3..f0904303b5 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DragonskullSummit.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DragonskullSummit.java
@@ -37,7 +37,7 @@ public class DragonskullSummit extends mage.sets.magic2010.DragonskullSummit {
 
     public DragonskullSummit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2013/DrownedCatacomb.java
index 31fe529f03..693a6beadf 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DrownedCatacomb.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DrownedCatacomb.java
@@ -37,7 +37,7 @@ public class DrownedCatacomb extends mage.sets.magic2010.DrownedCatacomb {
 
     public DrownedCatacomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Duress.java b/Mage.Sets/src/mage/sets/magic2013/Duress.java
index 5d01e71b37..52c413a1b3 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Duress.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DuskdaleWurm.java b/Mage.Sets/src/mage/sets/magic2013/DuskdaleWurm.java
index b34bb5d916..6eeb247055 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DuskdaleWurm.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DuskdaleWurm.java
@@ -37,7 +37,7 @@ public class DuskdaleWurm extends mage.sets.magic2011.DuskdaleWurm {
 
     public DuskdaleWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2013/ElixirOfImmortality.java
index a8477ca16f..0dedefaa83 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ElixirOfImmortality.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ElixirOfImmortality.java
@@ -37,7 +37,7 @@ public class ElixirOfImmortality extends mage.sets.magic2011.ElixirOfImmortality
 
     public ElixirOfImmortality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2013/ElvishArchdruid.java
index 89a070cae5..a93da73d25 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ElvishArchdruid.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ElvishArchdruid.java
@@ -37,7 +37,7 @@ public class ElvishArchdruid extends mage.sets.magic2010.ElvishArchdruid {
 
     public ElvishArchdruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ElvishVisionary.java b/Mage.Sets/src/mage/sets/magic2013/ElvishVisionary.java
index 7e36b5dc24..9e81d6ffe3 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ElvishVisionary.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ElvishVisionary.java
@@ -37,7 +37,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
 
     public ElvishVisionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Erase.java b/Mage.Sets/src/mage/sets/magic2013/Erase.java
index 70bc0d0c43..9dab9434ea 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Erase.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Erase.java
@@ -37,7 +37,7 @@ public class Erase extends mage.sets.urzaslegacy.Erase {
 
     public Erase(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/EssenceDrain.java b/Mage.Sets/src/mage/sets/magic2013/EssenceDrain.java
index b9db05be4e..c18689cf0e 100644
--- a/Mage.Sets/src/mage/sets/magic2013/EssenceDrain.java
+++ b/Mage.Sets/src/mage/sets/magic2013/EssenceDrain.java
@@ -37,7 +37,7 @@ public class EssenceDrain extends mage.sets.darksteel.EssenceDrain {
 
     public EssenceDrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/EssenceScatter.java b/Mage.Sets/src/mage/sets/magic2013/EssenceScatter.java
index d4675f3907..2ebe471c04 100644
--- a/Mage.Sets/src/mage/sets/magic2013/EssenceScatter.java
+++ b/Mage.Sets/src/mage/sets/magic2013/EssenceScatter.java
@@ -37,7 +37,7 @@ public class EssenceScatter extends mage.sets.magic2010.EssenceScatter {
 
     public EssenceScatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/EvolvingWilds.java b/Mage.Sets/src/mage/sets/magic2013/EvolvingWilds.java
index 57eb43d6f4..bcecb13e17 100644
--- a/Mage.Sets/src/mage/sets/magic2013/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/magic2013/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Farseek.java b/Mage.Sets/src/mage/sets/magic2013/Farseek.java
index 95a7a92e7d..2964dc09da 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Farseek.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Farseek.java
@@ -37,7 +37,7 @@ public class Farseek extends mage.sets.ravnica.Farseek {
 
     public Farseek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Fog.java b/Mage.Sets/src/mage/sets/magic2013/Fog.java
index 6f080e3be7..1785a9d0a1 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Fog.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/FogBank.java b/Mage.Sets/src/mage/sets/magic2013/FogBank.java
index f957951366..d1777dd4c5 100644
--- a/Mage.Sets/src/mage/sets/magic2013/FogBank.java
+++ b/Mage.Sets/src/mage/sets/magic2013/FogBank.java
@@ -37,7 +37,7 @@ public class FogBank extends mage.sets.urzassaga.FogBank {
 
     public FogBank(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/magic2013/FurnaceWhelp.java
index 822d565bb7..99c397e27c 100644
--- a/Mage.Sets/src/mage/sets/magic2013/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/magic2013/FurnaceWhelp.java
@@ -37,7 +37,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
 
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GarrukPrimalHunter.java b/Mage.Sets/src/mage/sets/magic2013/GarrukPrimalHunter.java
index 53d2ec8640..3b3600fead 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GarrukPrimalHunter.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GarrukPrimalHunter.java
@@ -37,7 +37,7 @@ public class GarrukPrimalHunter extends mage.sets.magic2012.GarrukPrimalHunter {
 
     public GarrukPrimalHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GarruksPackleader.java b/Mage.Sets/src/mage/sets/magic2013/GarruksPackleader.java
index c28c43942d..bc0f0a1b0a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GarruksPackleader.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GarruksPackleader.java
@@ -37,7 +37,7 @@ public class GarruksPackleader extends mage.sets.magic2011.GarruksPackleader {
 
     public GarruksPackleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GiantScorpion.java b/Mage.Sets/src/mage/sets/magic2013/GiantScorpion.java
index 0d233be359..c134ab8898 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GiantScorpion.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GiantScorpion.java
@@ -37,7 +37,7 @@ public class GiantScorpion extends mage.sets.zendikar.GiantScorpion {
 
     public GiantScorpion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2013/GlacialFortress.java
index d769acd3f1..192295b2e1 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GlacialFortress.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GlacialFortress.java
@@ -37,7 +37,7 @@ public class GlacialFortress extends mage.sets.magic2010.GlacialFortress {
 
     public GlacialFortress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GloriousCharge.java b/Mage.Sets/src/mage/sets/magic2013/GloriousCharge.java
index 76a460bb43..c03b647c39 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GloriousCharge.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GloriousCharge.java
@@ -37,7 +37,7 @@ public class GloriousCharge extends mage.sets.magic2010.GloriousCharge {
 
     public GloriousCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GoblinArsonist.java b/Mage.Sets/src/mage/sets/magic2013/GoblinArsonist.java
index e3a04ff76f..fe9d7ee17a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GoblinArsonist.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GoblinArsonist.java
@@ -37,7 +37,7 @@ public class GoblinArsonist extends mage.sets.riseoftheeldrazi.GoblinArsonist {
 
     public GoblinArsonist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/GuardiansOfAkrasa.java b/Mage.Sets/src/mage/sets/magic2013/GuardiansOfAkrasa.java
index f71e3bc5f0..478c7e86c3 100644
--- a/Mage.Sets/src/mage/sets/magic2013/GuardiansOfAkrasa.java
+++ b/Mage.Sets/src/mage/sets/magic2013/GuardiansOfAkrasa.java
@@ -37,7 +37,7 @@ public class GuardiansOfAkrasa extends mage.sets.shardsofalara.GuardiansOfAkrasa
 
     public GuardiansOfAkrasa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2013/HarborSerpent.java
index 2a9e207083..876d89da31 100644
--- a/Mage.Sets/src/mage/sets/magic2013/HarborSerpent.java
+++ b/Mage.Sets/src/mage/sets/magic2013/HarborSerpent.java
@@ -37,7 +37,7 @@ public class HarborSerpent extends mage.sets.magic2011.HarborSerpent {
 
     public HarborSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Index.java b/Mage.Sets/src/mage/sets/magic2013/Index.java
index 73634cdc8b..6a57fad270 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Index.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Index.java
@@ -37,7 +37,7 @@ public class Index extends mage.sets.apocalypse.Index {
 
     public Index(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/IntrepidHero.java b/Mage.Sets/src/mage/sets/magic2013/IntrepidHero.java
index d4bc263905..9f9720c498 100644
--- a/Mage.Sets/src/mage/sets/magic2013/IntrepidHero.java
+++ b/Mage.Sets/src/mage/sets/magic2013/IntrepidHero.java
@@ -37,7 +37,7 @@ public class IntrepidHero extends mage.sets.urzassaga.IntrepidHero {
 
     public IntrepidHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/magic2013/JaceMemoryAdept.java
index 2f1e3f05be..8035dc4a7d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/JaceMemoryAdept.java
+++ b/Mage.Sets/src/mage/sets/magic2013/JaceMemoryAdept.java
@@ -37,7 +37,7 @@ public class JaceMemoryAdept extends mage.sets.magic2012.JaceMemoryAdept {
 
     public JaceMemoryAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java b/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java
index 1c4213ef61..e099f666aa 100644
--- a/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java
@@ -38,7 +38,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/KindledFury.java b/Mage.Sets/src/mage/sets/magic2013/KindledFury.java
index 6d5dd6f334..ca5adc7e6d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/KindledFury.java
+++ b/Mage.Sets/src/mage/sets/magic2013/KindledFury.java
@@ -37,7 +37,7 @@ public class KindledFury extends mage.sets.magic2010.KindledFury {
 
     public KindledFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Kitesail.java b/Mage.Sets/src/mage/sets/magic2013/Kitesail.java
index 5fb1b77d26..a17459d837 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Kitesail.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Kitesail.java
@@ -38,7 +38,7 @@ public class Kitesail extends mage.sets.worldwake.Kitesail {
 
     public Kitesail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/KrakenHatchling.java b/Mage.Sets/src/mage/sets/magic2013/KrakenHatchling.java
index ebdd80307f..d10390a686 100644
--- a/Mage.Sets/src/mage/sets/magic2013/KrakenHatchling.java
+++ b/Mage.Sets/src/mage/sets/magic2013/KrakenHatchling.java
@@ -37,7 +37,7 @@ public class KrakenHatchling extends mage.sets.zendikar.KrakenHatchling {
 
     public KrakenHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/MarkOfMutiny.java b/Mage.Sets/src/mage/sets/magic2013/MarkOfMutiny.java
index 22b1b6d7ba..dff6838e0a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/MarkOfMutiny.java
+++ b/Mage.Sets/src/mage/sets/magic2013/MarkOfMutiny.java
@@ -37,7 +37,7 @@ public class MarkOfMutiny extends mage.sets.zendikar.MarkOfMutiny {
 
     public MarkOfMutiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/magic2013/MerfolkOfThePearlTrident.java
index 8c8424238c..b3ecc163a2 100644
--- a/Mage.Sets/src/mage/sets/magic2013/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/magic2013/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/MindRot.java b/Mage.Sets/src/mage/sets/magic2013/MindRot.java
index adc1f133f9..9e75b63963 100644
--- a/Mage.Sets/src/mage/sets/magic2013/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magic2013/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Naturalize.java b/Mage.Sets/src/mage/sets/magic2013/Naturalize.java
index 7ff7756470..68702b33d2 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Negate.java b/Mage.Sets/src/mage/sets/magic2013/Negate.java
index a8f0c44872..0ef46e7465 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Negate.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/magic2013/NicolBolasPlaneswalker.java
index c66980ff8e..74d2650b89 100644
--- a/Mage.Sets/src/mage/sets/magic2013/NicolBolasPlaneswalker.java
+++ b/Mage.Sets/src/mage/sets/magic2013/NicolBolasPlaneswalker.java
@@ -37,7 +37,7 @@ public class NicolBolasPlaneswalker extends mage.sets.conflux.NicolBolasPlaneswa
 
     public NicolBolasPlaneswalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/OblivionRing.java b/Mage.Sets/src/mage/sets/magic2013/OblivionRing.java
index 7706a19b56..ce3da29955 100644
--- a/Mage.Sets/src/mage/sets/magic2013/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/magic2013/OblivionRing.java
@@ -38,7 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/Pacifism.java b/Mage.Sets/src/mage/sets/magic2013/Pacifism.java
index e8eecc9564..c4da3a15ac 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2013/PhylacteryLich.java
index 0b71373c5d..2ef23a01c2 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PhylacteryLich.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PhylacteryLich.java
@@ -37,7 +37,7 @@ public class PhylacteryLich extends mage.sets.magic2011.PhylacteryLich {
 
     public PhylacteryLich(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java
index 0270632bcc..f2b0797c0f 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/PillarfieldOx.java b/Mage.Sets/src/mage/sets/magic2013/PillarfieldOx.java
index 89c3642668..2733027a98 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PillarfieldOx.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PillarfieldOx.java
@@ -37,7 +37,7 @@ public class PillarfieldOx extends mage.sets.zendikar.PillarfieldOx {
 
     public PillarfieldOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/PlanarCleansing.java b/Mage.Sets/src/mage/sets/magic2013/PlanarCleansing.java
index 94604c828f..fcc8137b7a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PlanarCleansing.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PlanarCleansing.java
@@ -37,7 +37,7 @@ public class PlanarCleansing extends mage.sets.magic2010.PlanarCleansing {
 
     public PlanarCleansing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Plummet.java b/Mage.Sets/src/mage/sets/magic2013/Plummet.java
index b99877313c..492c9e4c73 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Plummet.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/PreyUpon.java b/Mage.Sets/src/mage/sets/magic2013/PreyUpon.java
index 77f194f6f4..ebffce5822 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PreyUpon.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PreyUpon.java
@@ -37,7 +37,7 @@ public class PreyUpon extends mage.sets.innistrad.PreyUpon {
 
     public PreyUpon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java b/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java
index 384d052aeb..7a6b7a6c7b 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java
@@ -38,7 +38,7 @@ public class PrimalClay extends mage.sets.fifthedition.PrimalClay {
 
     public PrimalClay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/PrimordialHydra.java b/Mage.Sets/src/mage/sets/magic2013/PrimordialHydra.java
index 8893e406db..2b1ac04156 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PrimordialHydra.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PrimordialHydra.java
@@ -37,7 +37,7 @@ public class PrimordialHydra extends mage.sets.magic2012.PrimordialHydra {
 
     public PrimordialHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/QuirionDryad.java b/Mage.Sets/src/mage/sets/magic2013/QuirionDryad.java
index 05555ee53c..a1e8553357 100644
--- a/Mage.Sets/src/mage/sets/magic2013/QuirionDryad.java
+++ b/Mage.Sets/src/mage/sets/magic2013/QuirionDryad.java
@@ -37,7 +37,7 @@ public class QuirionDryad extends mage.sets.tenthedition.QuirionDryad {
 
     public QuirionDryad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Rancor.java b/Mage.Sets/src/mage/sets/magic2013/Rancor.java
index 435df6b19d..bf26b672e4 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Rancor.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Rancor.java
@@ -38,7 +38,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/RavenousRats.java b/Mage.Sets/src/mage/sets/magic2013/RavenousRats.java
index a0a8297a02..e200f56a02 100644
--- a/Mage.Sets/src/mage/sets/magic2013/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/magic2013/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Redirect.java b/Mage.Sets/src/mage/sets/magic2013/Redirect.java
index e8affb41c7..7029c19899 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Redirect.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Redirect.java
@@ -37,7 +37,7 @@ public class Redirect extends mage.sets.magic2011.Redirect {
 
     public Redirect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ReliquaryTower.java b/Mage.Sets/src/mage/sets/magic2013/ReliquaryTower.java
index ed2d0da208..93bdf729eb 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ReliquaryTower.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ReliquaryTower.java
@@ -37,7 +37,7 @@ public class ReliquaryTower extends mage.sets.conflux.ReliquaryTower {
 
     public ReliquaryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Reverberate.java b/Mage.Sets/src/mage/sets/magic2013/Reverberate.java
index 3910099169..1ff8bd642c 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Reverberate.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Reverberate.java
@@ -37,7 +37,7 @@ public class Reverberate extends mage.sets.magic2011.Reverberate {
 
     public Reverberate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Rewind.java b/Mage.Sets/src/mage/sets/magic2013/Rewind.java
index cf3cb5d9a2..bb408ff77c 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Rewind.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Rewind.java
@@ -38,7 +38,7 @@ public class Rewind extends mage.sets.urzassaga.Rewind {
 
     public Rewind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/magic2013/RiseFromTheGrave.java
index c6b03ef28d..49695dab10 100644
--- a/Mage.Sets/src/mage/sets/magic2013/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/magic2013/RiseFromTheGrave.java
@@ -37,7 +37,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2013/RootboundCrag.java
index f32abbdab0..de88e45414 100644
--- a/Mage.Sets/src/mage/sets/magic2013/RootboundCrag.java
+++ b/Mage.Sets/src/mage/sets/magic2013/RootboundCrag.java
@@ -37,7 +37,7 @@ public class RootboundCrag extends mage.sets.magic2010.RootboundCrag {
 
     public RootboundCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SafePassage.java b/Mage.Sets/src/mage/sets/magic2013/SafePassage.java
index c08a8359a9..f48ec5f9f6 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SafePassage.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SafePassage.java
@@ -37,7 +37,7 @@ public class SafePassage extends mage.sets.magic2010.SafePassage {
 
     public SafePassage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ScrollThief.java b/Mage.Sets/src/mage/sets/magic2013/ScrollThief.java
index 051316f6a4..1e7f6d03df 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ScrollThief.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ScrollThief.java
@@ -37,7 +37,7 @@ public class ScrollThief extends mage.sets.magic2011.ScrollThief {
 
     public ScrollThief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java
index 79e443fe48..a397b8e983 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java b/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java
index 4a939a411f..465ba36d21 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java
@@ -38,7 +38,7 @@ public class SerraAvatar extends mage.sets.urzassaga.SerraAvatar {
 
     public SerraAvatar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/SerraAvenger.java b/Mage.Sets/src/mage/sets/magic2013/SerraAvenger.java
index 406fb6de92..6a911b5f1d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SerraAvenger.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SerraAvenger.java
@@ -36,7 +36,7 @@ public class SerraAvenger extends mage.sets.timespiral.SerraAvenger {
 
     public SerraAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2013/SignInBlood.java
index d0ab2ebd71..960be01464 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SilklashSpider.java b/Mage.Sets/src/mage/sets/magic2013/SilklashSpider.java
index 504e57ab97..f5f3501b03 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SilklashSpider.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SilklashSpider.java
@@ -37,7 +37,7 @@ public class SilklashSpider extends mage.sets.onslaught.SilklashSpider {
 
     public SilklashSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SilvercoatLion.java b/Mage.Sets/src/mage/sets/magic2013/SilvercoatLion.java
index 2b0f510584..f5761c9d68 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SilvercoatLion.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SilvercoatLion.java
@@ -37,7 +37,7 @@ public class SilvercoatLion extends mage.sets.magic2010.SilvercoatLion {
 
     public SilvercoatLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Sleep.java b/Mage.Sets/src/mage/sets/magic2013/Sleep.java
index 1867f1f653..d775f7337a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Sleep.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Sleep.java
@@ -37,7 +37,7 @@ public class Sleep extends mage.sets.magic2010.Sleep {
 
     public Sleep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SphinxOfUthuun.java b/Mage.Sets/src/mage/sets/magic2013/SphinxOfUthuun.java
index f3ad9356fb..7f10303e5e 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SphinxOfUthuun.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SphinxOfUthuun.java
@@ -37,7 +37,7 @@ public class SphinxOfUthuun extends mage.sets.magic2012.SphinxOfUthuun {
 
     public SphinxOfUthuun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/StormtideLeviathan.java b/Mage.Sets/src/mage/sets/magic2013/StormtideLeviathan.java
index 210d84d841..0e2ff215e3 100644
--- a/Mage.Sets/src/mage/sets/magic2013/StormtideLeviathan.java
+++ b/Mage.Sets/src/mage/sets/magic2013/StormtideLeviathan.java
@@ -37,7 +37,7 @@ public class StormtideLeviathan extends mage.sets.magic2011.StormtideLeviathan {
 
     public StormtideLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/StuffyDoll.java b/Mage.Sets/src/mage/sets/magic2013/StuffyDoll.java
index 47c97b0056..d3a37d3143 100644
--- a/Mage.Sets/src/mage/sets/magic2013/StuffyDoll.java
+++ b/Mage.Sets/src/mage/sets/magic2013/StuffyDoll.java
@@ -37,7 +37,7 @@ public class StuffyDoll extends mage.sets.timespiral.StuffyDoll {
 
     public StuffyDoll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2013/SunpetalGrove.java
index 8eaafd3fa6..e5a9cfd288 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SunpetalGrove.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SunpetalGrove.java
@@ -37,7 +37,7 @@ public class SunpetalGrove extends mage.sets.magic2010.SunpetalGrove {
 
     public SunpetalGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/TitanicGrowth.java b/Mage.Sets/src/mage/sets/magic2013/TitanicGrowth.java
index 99a5f949e2..72227e798d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/TitanicGrowth.java
+++ b/Mage.Sets/src/mage/sets/magic2013/TitanicGrowth.java
@@ -37,7 +37,7 @@ public class TitanicGrowth extends mage.sets.magic2012.TitanicGrowth {
 
     public TitanicGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java b/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java
index 52abee4016..af3a993d93 100644
--- a/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java
+++ b/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java
@@ -38,7 +38,7 @@ public class TorchFiend extends mage.sets.darkascension.TorchFiend {
 
     public TorchFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/TormentedSoul.java b/Mage.Sets/src/mage/sets/magic2013/TormentedSoul.java
index c1508b8e4f..ab6ed3b4af 100644
--- a/Mage.Sets/src/mage/sets/magic2013/TormentedSoul.java
+++ b/Mage.Sets/src/mage/sets/magic2013/TormentedSoul.java
@@ -37,7 +37,7 @@ public class TormentedSoul extends mage.sets.magic2012.TormentedSoul {
 
     public TormentedSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java b/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java
index 627198a02f..95a8a63938 100644
--- a/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java
+++ b/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java
@@ -38,7 +38,7 @@ public class TormodsCrypt extends mage.sets.timeshifted.TormodsCrypt {
 
     public TormodsCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/TrumpetBlast.java b/Mage.Sets/src/mage/sets/magic2013/TrumpetBlast.java
index 9be6996f99..253cd23187 100644
--- a/Mage.Sets/src/mage/sets/magic2013/TrumpetBlast.java
+++ b/Mage.Sets/src/mage/sets/magic2013/TrumpetBlast.java
@@ -37,7 +37,7 @@ public class TrumpetBlast extends mage.sets.magic2010.TrumpetBlast {
 
     public TrumpetBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/TurnToSlag.java b/Mage.Sets/src/mage/sets/magic2013/TurnToSlag.java
index 0cc9e418c8..f4bea69453 100644
--- a/Mage.Sets/src/mage/sets/magic2013/TurnToSlag.java
+++ b/Mage.Sets/src/mage/sets/magic2013/TurnToSlag.java
@@ -37,7 +37,7 @@ public class TurnToSlag extends mage.sets.scarsofmirrodin.TurnToSlag {
 
     public TurnToSlag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Unsummon.java b/Mage.Sets/src/mage/sets/magic2013/Unsummon.java
index 648a46a183..12c55aef52 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/VampireNighthawk.java b/Mage.Sets/src/mage/sets/magic2013/VampireNighthawk.java
index a4a61b1cfb..80896cba91 100644
--- a/Mage.Sets/src/mage/sets/magic2013/VampireNighthawk.java
+++ b/Mage.Sets/src/mage/sets/magic2013/VampireNighthawk.java
@@ -37,7 +37,7 @@ public class VampireNighthawk extends mage.sets.zendikar.VampireNighthawk {
 
     public VampireNighthawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/VampireNocturnus.java b/Mage.Sets/src/mage/sets/magic2013/VampireNocturnus.java
index 8d4e8532df..dd7d6e6972 100644
--- a/Mage.Sets/src/mage/sets/magic2013/VampireNocturnus.java
+++ b/Mage.Sets/src/mage/sets/magic2013/VampireNocturnus.java
@@ -37,7 +37,7 @@ public class VampireNocturnus extends mage.sets.magic2010.VampireNocturnus {
 
     public VampireNocturnus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/VastwoodGorger.java b/Mage.Sets/src/mage/sets/magic2013/VastwoodGorger.java
index 62aae4d597..8a2f0cc210 100644
--- a/Mage.Sets/src/mage/sets/magic2013/VastwoodGorger.java
+++ b/Mage.Sets/src/mage/sets/magic2013/VastwoodGorger.java
@@ -37,7 +37,7 @@ public class VastwoodGorger extends mage.sets.zendikar.VastwoodGorger {
 
     public VastwoodGorger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/VedalkenEntrancer.java b/Mage.Sets/src/mage/sets/magic2013/VedalkenEntrancer.java
index 285a71ce57..927f1ca318 100644
--- a/Mage.Sets/src/mage/sets/magic2013/VedalkenEntrancer.java
+++ b/Mage.Sets/src/mage/sets/magic2013/VedalkenEntrancer.java
@@ -37,7 +37,7 @@ public class VedalkenEntrancer extends mage.sets.ravnica.VedalkenEntrancer {
 
     public VedalkenEntrancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/VolcanicStrength.java b/Mage.Sets/src/mage/sets/magic2013/VolcanicStrength.java
index f8b095bc09..7104150125 100644
--- a/Mage.Sets/src/mage/sets/magic2013/VolcanicStrength.java
+++ b/Mage.Sets/src/mage/sets/magic2013/VolcanicStrength.java
@@ -37,7 +37,7 @@ public class VolcanicStrength extends mage.sets.magic2011.VolcanicStrength {
 
     public VolcanicStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/WalkingCorpse.java b/Mage.Sets/src/mage/sets/magic2013/WalkingCorpse.java
index 9f87929aa9..cbb78169a4 100644
--- a/Mage.Sets/src/mage/sets/magic2013/WalkingCorpse.java
+++ b/Mage.Sets/src/mage/sets/magic2013/WalkingCorpse.java
@@ -37,7 +37,7 @@ public class WalkingCorpse extends mage.sets.innistrad.WalkingCorpse {
 
     public WalkingCorpse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java b/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java
index d560b27dea..3da2ba79a4 100644
--- a/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java
@@ -38,7 +38,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "M13";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/magic2013/WarPriestOfThune.java
index 6e014f7947..e5f05c36d9 100644
--- a/Mage.Sets/src/mage/sets/magic2013/WarPriestOfThune.java
+++ b/Mage.Sets/src/mage/sets/magic2013/WarPriestOfThune.java
@@ -37,7 +37,7 @@ public class WarPriestOfThune extends mage.sets.magic2011.WarPriestOfThune {
 
     public WarPriestOfThune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/WelkinTern.java b/Mage.Sets/src/mage/sets/magic2013/WelkinTern.java
index 3514c275e4..976352fbe6 100644
--- a/Mage.Sets/src/mage/sets/magic2013/WelkinTern.java
+++ b/Mage.Sets/src/mage/sets/magic2013/WelkinTern.java
@@ -37,7 +37,7 @@ public class WelkinTern extends mage.sets.zendikar.WelkinTern {
 
     public WelkinTern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/WindDrake.java b/Mage.Sets/src/mage/sets/magic2013/WindDrake.java
index 5e55ff8c54..de7dbbfa4d 100644
--- a/Mage.Sets/src/mage/sets/magic2013/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/magic2013/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/ZombieGoliath.java b/Mage.Sets/src/mage/sets/magic2013/ZombieGoliath.java
index ee26949c8c..e663f9cf49 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ZombieGoliath.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ZombieGoliath.java
@@ -37,7 +37,7 @@ public class ZombieGoliath extends mage.sets.magic2012.ZombieGoliath {
 
     public ZombieGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "M13";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/AccordersShield.java b/Mage.Sets/src/mage/sets/magic2014/AccordersShield.java
index 0a3a57c6a0..722ba8777b 100644
--- a/Mage.Sets/src/mage/sets/magic2014/AccordersShield.java
+++ b/Mage.Sets/src/mage/sets/magic2014/AccordersShield.java
@@ -38,7 +38,7 @@ public class AccordersShield extends mage.sets.scarsofmirrodin.AccordersShield {
 
     public AccordersShield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2014/ActOfTreason.java
index c583d2988a..abaeb591f9 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ActOfTreason.java
@@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/AirServant.java b/Mage.Sets/src/mage/sets/magic2014/AirServant.java
index 08a18957f9..659fd3ae2b 100644
--- a/Mage.Sets/src/mage/sets/magic2014/AirServant.java
+++ b/Mage.Sets/src/mage/sets/magic2014/AirServant.java
@@ -37,7 +37,7 @@ public class AirServant extends mage.sets.magic2011.AirServant {
 
     public AirServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/sets/magic2014/AjaniCallerOfThePride.java
index 8b28f5afd9..2ce51c913b 100644
--- a/Mage.Sets/src/mage/sets/magic2014/AjaniCallerOfThePride.java
+++ b/Mage.Sets/src/mage/sets/magic2014/AjaniCallerOfThePride.java
@@ -37,7 +37,7 @@ public class AjaniCallerOfThePride extends mage.sets.magic2013.AjaniCallerOfTheP
 
     public AjaniCallerOfThePride(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/AltarsReap.java b/Mage.Sets/src/mage/sets/magic2014/AltarsReap.java
index c34d070927..70006bb320 100644
--- a/Mage.Sets/src/mage/sets/magic2014/AltarsReap.java
+++ b/Mage.Sets/src/mage/sets/magic2014/AltarsReap.java
@@ -37,7 +37,7 @@ public class AltarsReap extends mage.sets.innistrad.AltarsReap {
 
     public AltarsReap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/AngelicWall.java b/Mage.Sets/src/mage/sets/magic2014/AngelicWall.java
index 11d8f2ab38..124ffcbd54 100644
--- a/Mage.Sets/src/mage/sets/magic2014/AngelicWall.java
+++ b/Mage.Sets/src/mage/sets/magic2014/AngelicWall.java
@@ -37,7 +37,7 @@ public class AngelicWall extends mage.sets.tenthedition.AngelicWall {
 
     public AngelicWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Archaeomancer.java b/Mage.Sets/src/mage/sets/magic2014/Archaeomancer.java
index 6c38a761c5..3244717ef9 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Archaeomancer.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Archaeomancer.java
@@ -37,7 +37,7 @@ public class Archaeomancer extends mage.sets.magic2013.Archaeomancer {
 
     public Archaeomancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ArmoredCancrix.java b/Mage.Sets/src/mage/sets/magic2014/ArmoredCancrix.java
index b0b5c58d4c..bfb4875ecb 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ArmoredCancrix.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ArmoredCancrix.java
@@ -37,7 +37,7 @@ public class ArmoredCancrix extends mage.sets.magic2011.ArmoredCancrix {
 
     public ArmoredCancrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Auramancer.java b/Mage.Sets/src/mage/sets/magic2014/Auramancer.java
index 9f2a032452..f0a7ec354d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Auramancer.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Auramancer.java
@@ -37,7 +37,7 @@ public class Auramancer extends mage.sets.magic2012.Auramancer {
 
     public Auramancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Blessing.java b/Mage.Sets/src/mage/sets/magic2014/Blessing.java
index b06c0169f9..3b6e9a7175 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Blessing.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Blessing.java
@@ -38,7 +38,7 @@ public class Blessing extends mage.sets.fourthedition.Blessing {
 
     public Blessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/Bramblecrush.java b/Mage.Sets/src/mage/sets/magic2014/Bramblecrush.java
index de3de67e5b..80340a8a17 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Bramblecrush.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Bramblecrush.java
@@ -37,7 +37,7 @@ public class Bramblecrush extends mage.sets.innistrad.Bramblecrush {
 
     public Bramblecrush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/BraveTheElements.java b/Mage.Sets/src/mage/sets/magic2014/BraveTheElements.java
index 7b0505cfaa..1313fa912d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/BraveTheElements.java
+++ b/Mage.Sets/src/mage/sets/magic2014/BraveTheElements.java
@@ -37,7 +37,7 @@ public class BraveTheElements extends mage.sets.zendikar.BraveTheElements {
 
     public BraveTheElements(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/BriarpackAlpha.java b/Mage.Sets/src/mage/sets/magic2014/BriarpackAlpha.java
index 9e428f428b..25d182d7aa 100644
--- a/Mage.Sets/src/mage/sets/magic2014/BriarpackAlpha.java
+++ b/Mage.Sets/src/mage/sets/magic2014/BriarpackAlpha.java
@@ -37,7 +37,7 @@ public class BriarpackAlpha extends mage.sets.darkascension.BriarpackAlpha {
 
     public BriarpackAlpha(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/BrindleBoar.java b/Mage.Sets/src/mage/sets/magic2014/BrindleBoar.java
index 61961daf95..a157815969 100644
--- a/Mage.Sets/src/mage/sets/magic2014/BrindleBoar.java
+++ b/Mage.Sets/src/mage/sets/magic2014/BrindleBoar.java
@@ -37,7 +37,7 @@ public class BrindleBoar extends mage.sets.magic2011.BrindleBoar {
 
     public BrindleBoar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Cancel.java b/Mage.Sets/src/mage/sets/magic2014/Cancel.java
index bafb62d57c..f6b5f6e6dc 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Cancel.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/magic2014/CanyonMinotaur.java
index 87eb64c3b4..26e55940a7 100644
--- a/Mage.Sets/src/mage/sets/magic2014/CanyonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/magic2014/CanyonMinotaur.java
@@ -37,7 +37,7 @@ public class CanyonMinotaur extends mage.sets.conflux.CanyonMinotaur {
 
     public CanyonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/CapashenKnight.java b/Mage.Sets/src/mage/sets/magic2014/CapashenKnight.java
index 5c09007fde..9781a22708 100644
--- a/Mage.Sets/src/mage/sets/magic2014/CapashenKnight.java
+++ b/Mage.Sets/src/mage/sets/magic2014/CapashenKnight.java
@@ -37,7 +37,7 @@ public class CapashenKnight extends mage.sets.urzasdestiny.CapashenKnight {
 
     public CapashenKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2014/ChandrasOutrage.java
index d72d328f22..bd3daaa070 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ChandrasOutrage.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ChandrasOutrage.java
@@ -37,7 +37,7 @@ public class ChandrasOutrage extends mage.sets.magic2011.ChandrasOutrage {
 
     public ChandrasOutrage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ChandrasPhoenix.java b/Mage.Sets/src/mage/sets/magic2014/ChandrasPhoenix.java
index 263c6261c2..62abbe3141 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ChandrasPhoenix.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ChandrasPhoenix.java
@@ -37,7 +37,7 @@ public class ChandrasPhoenix extends mage.sets.magic2012.ChandrasPhoenix {
 
     public ChandrasPhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2014/ChildOfNight.java
index c7f2ac7de9..99ea706e0c 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ChildOfNight.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ChildOfNight.java
@@ -37,7 +37,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight {
 
     public ChildOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Claustrophobia.java b/Mage.Sets/src/mage/sets/magic2014/Claustrophobia.java
index 89e7d6ddf5..212ec55238 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Claustrophobia.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Claustrophobia.java
@@ -37,7 +37,7 @@ public class Claustrophobia extends mage.sets.innistrad.Claustrophobia {
 
     public Claustrophobia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Clone.java b/Mage.Sets/src/mage/sets/magic2014/Clone.java
index 8cf76c3eae..ceecba1b74 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Clone.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Clone.java
@@ -37,7 +37,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Congregate.java b/Mage.Sets/src/mage/sets/magic2014/Congregate.java
index e47bae2c15..06ac91db1d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Congregate.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Congregate.java
@@ -38,7 +38,7 @@ public class Congregate extends mage.sets.urzassaga.Congregate {
 
     public Congregate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/CoralMerfolk.java b/Mage.Sets/src/mage/sets/magic2014/CoralMerfolk.java
index 4aae268fd5..b22bf6fa3f 100644
--- a/Mage.Sets/src/mage/sets/magic2014/CoralMerfolk.java
+++ b/Mage.Sets/src/mage/sets/magic2014/CoralMerfolk.java
@@ -37,7 +37,7 @@ public class CoralMerfolk extends mage.sets.magic2010.CoralMerfolk {
 
     public CoralMerfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Corrupt.java b/Mage.Sets/src/mage/sets/magic2014/Corrupt.java
index 913c8e4431..319cbe0d18 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Corrupt.java
@@ -37,7 +37,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/DarkFavor.java b/Mage.Sets/src/mage/sets/magic2014/DarkFavor.java
index 5835a33852..a791c41266 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DarkFavor.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DarkFavor.java
@@ -37,7 +37,7 @@ public class DarkFavor extends mage.sets.magic2012.DarkFavor {
 
     public DarkFavor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/DarksteelForge.java b/Mage.Sets/src/mage/sets/magic2014/DarksteelForge.java
index 15f76b11c0..7e568eb4ff 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DarksteelForge.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DarksteelForge.java
@@ -38,7 +38,7 @@ public class DarksteelForge extends mage.sets.darksteel.DarksteelForge {
 
     public DarksteelForge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/DarksteelIngot.java b/Mage.Sets/src/mage/sets/magic2014/DarksteelIngot.java
index a96db7f540..f96ff9d676 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DarksteelIngot.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DarksteelIngot.java
@@ -37,7 +37,7 @@ public class DarksteelIngot extends mage.sets.darksteel.DarksteelIngot {
 
     public DarksteelIngot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/magic2014/DeadlyRecluse.java
index 490127c1c8..c96e2279a0 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DeadlyRecluse.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DeadlyRecluse.java
@@ -37,7 +37,7 @@ public class DeadlyRecluse extends mage.sets.magic2010.DeadlyRecluse {
 
     public DeadlyRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Demolish.java b/Mage.Sets/src/mage/sets/magic2014/Demolish.java
index 58b3eed689..2beaf83d45 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Demolish.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Demolish.java
@@ -37,7 +37,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/DiabolicTutor.java b/Mage.Sets/src/mage/sets/magic2014/DiabolicTutor.java
index 8c2201fda1..ff97ab07e9 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DiabolicTutor.java
@@ -37,7 +37,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Disperse.java b/Mage.Sets/src/mage/sets/magic2014/Disperse.java
index 6aa4c9bf38..bbe3effe59 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Disperse.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Disperse.java
@@ -37,7 +37,7 @@ public class Disperse extends mage.sets.scarsofmirrodin.Disperse {
 
     public Disperse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Divination.java b/Mage.Sets/src/mage/sets/magic2014/Divination.java
index 68d2e04290..6fc46f0dc1 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Divination.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Divination.java
@@ -37,7 +37,7 @@ public class Divination extends mage.sets.magic2012.Divination {
 
     public Divination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2014/DivineFavor.java
index d2bbeefc12..1a9477de8c 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DivineFavor.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DivineFavor.java
@@ -37,7 +37,7 @@ public class DivineFavor extends mage.sets.magic2012.DivineFavor {
 
     public DivineFavor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Domestication.java b/Mage.Sets/src/mage/sets/magic2014/Domestication.java
index c5e8c309be..53d52a79e0 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Domestication.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Domestication.java
@@ -38,7 +38,7 @@ public class Domestication extends mage.sets.riseoftheeldrazi.Domestication {
 
     public Domestication(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2014/DoomBlade.java
index 0a722d42e4..286c8ab9f5 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DoomBlade.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DoomBlade.java
@@ -38,7 +38,7 @@ public class DoomBlade extends mage.sets.magic2010.DoomBlade {
 
     public DoomBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/DragonHatchling.java b/Mage.Sets/src/mage/sets/magic2014/DragonHatchling.java
index f23ab992e3..740c467e9f 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DragonHatchling.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DragonHatchling.java
@@ -37,7 +37,7 @@ public class DragonHatchling extends mage.sets.magic2013.DragonHatchling {
 
     public DragonHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Duress.java b/Mage.Sets/src/mage/sets/magic2014/Duress.java
index 63a6b80c9d..f76e770788 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Duress.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2014/ElixirOfImmortality.java
index 39955bc918..5f1eb6dbf6 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ElixirOfImmortality.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ElixirOfImmortality.java
@@ -37,7 +37,7 @@ public class ElixirOfImmortality extends mage.sets.magic2011.ElixirOfImmortality
 
     public ElixirOfImmortality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/EssenceScatter.java b/Mage.Sets/src/mage/sets/magic2014/EssenceScatter.java
index b688f120c7..5aa36c80d6 100644
--- a/Mage.Sets/src/mage/sets/magic2014/EssenceScatter.java
+++ b/Mage.Sets/src/mage/sets/magic2014/EssenceScatter.java
@@ -37,7 +37,7 @@ public class EssenceScatter extends mage.sets.magic2010.EssenceScatter {
 
     public EssenceScatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/FlamesOfTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2014/FlamesOfTheFirebrand.java
index 381107eb45..d1d0e30c26 100644
--- a/Mage.Sets/src/mage/sets/magic2014/FlamesOfTheFirebrand.java
+++ b/Mage.Sets/src/mage/sets/magic2014/FlamesOfTheFirebrand.java
@@ -37,7 +37,7 @@ public class FlamesOfTheFirebrand extends mage.sets.magic2013.FlamesOfTheFirebra
 
     public FlamesOfTheFirebrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Fog.java b/Mage.Sets/src/mage/sets/magic2014/Fog.java
index 6ccef4262f..dfc64b1699 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Fog.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Fortify.java b/Mage.Sets/src/mage/sets/magic2014/Fortify.java
index 93a6b345d9..51fd56425c 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Fortify.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Fortify.java
@@ -37,7 +37,7 @@ public class Fortify extends mage.sets.timespiral.Fortify {
 
     public Fortify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/FrostBreath.java b/Mage.Sets/src/mage/sets/magic2014/FrostBreath.java
index 78afd02580..f992c0a667 100644
--- a/Mage.Sets/src/mage/sets/magic2014/FrostBreath.java
+++ b/Mage.Sets/src/mage/sets/magic2014/FrostBreath.java
@@ -37,7 +37,7 @@ public class FrostBreath extends mage.sets.magic2012.FrostBreath {
 
     public FrostBreath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/GarruksHorde.java b/Mage.Sets/src/mage/sets/magic2014/GarruksHorde.java
index c289a02d26..9caba0fc07 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GarruksHorde.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GarruksHorde.java
@@ -37,7 +37,7 @@ public class GarruksHorde extends mage.sets.magic2012.GarruksHorde {
 
     public GarruksHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/GiantGrowth.java b/Mage.Sets/src/mage/sets/magic2014/GiantGrowth.java
index 6fe6321110..42897a4e52 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/GiantSpider.java b/Mage.Sets/src/mage/sets/magic2014/GiantSpider.java
index b2f5abfc9d..98870c1515 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/GladecoverScout.java b/Mage.Sets/src/mage/sets/magic2014/GladecoverScout.java
index 209b894ef9..eaa1652ac9 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GladecoverScout.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GladecoverScout.java
@@ -37,7 +37,7 @@ public class GladecoverScout extends mage.sets.magic2012.GladecoverScout {
 
     public GladecoverScout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/GoblinShortcutter.java b/Mage.Sets/src/mage/sets/magic2014/GoblinShortcutter.java
index 554ab9e586..283708a26a 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GoblinShortcutter.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GoblinShortcutter.java
@@ -37,7 +37,7 @@ public class GoblinShortcutter extends mage.sets.zendikar.GoblinShortcutter {
 
     public GoblinShortcutter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/GriffinSentinel.java b/Mage.Sets/src/mage/sets/magic2014/GriffinSentinel.java
index b013f7de29..4a4df25400 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GriffinSentinel.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GriffinSentinel.java
@@ -37,7 +37,7 @@ public class GriffinSentinel extends mage.sets.magic2010.GriffinSentinel {
 
     public GriffinSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/HowlOfTheNightPack.java b/Mage.Sets/src/mage/sets/magic2014/HowlOfTheNightPack.java
index ee78cd3c97..20b9684b96 100644
--- a/Mage.Sets/src/mage/sets/magic2014/HowlOfTheNightPack.java
+++ b/Mage.Sets/src/mage/sets/magic2014/HowlOfTheNightPack.java
@@ -37,7 +37,7 @@ public class HowlOfTheNightPack extends mage.sets.magic2010.HowlOfTheNightPack {
 
     public HowlOfTheNightPack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Indestructibility.java b/Mage.Sets/src/mage/sets/magic2014/Indestructibility.java
index e7f58ea9fe..57aa7b47a8 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Indestructibility.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Indestructibility.java
@@ -37,7 +37,7 @@ public class Indestructibility extends mage.sets.magic2010.Indestructibility {
 
     public Indestructibility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/magic2014/JaceMemoryAdept.java
index 0ccc9f2cea..b100b738c8 100644
--- a/Mage.Sets/src/mage/sets/magic2014/JaceMemoryAdept.java
+++ b/Mage.Sets/src/mage/sets/magic2014/JaceMemoryAdept.java
@@ -37,7 +37,7 @@ public class JaceMemoryAdept extends mage.sets.magic2012.JaceMemoryAdept {
 
     public JaceMemoryAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2014/LavaAxe.java
index e2afd6e4d8..060a37d1e3 100644
--- a/Mage.Sets/src/mage/sets/magic2014/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/magic2014/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/LayOfTheLand.java b/Mage.Sets/src/mage/sets/magic2014/LayOfTheLand.java
index e7bdc6cab2..a781db64f8 100644
--- a/Mage.Sets/src/mage/sets/magic2014/LayOfTheLand.java
+++ b/Mage.Sets/src/mage/sets/magic2014/LayOfTheLand.java
@@ -37,7 +37,7 @@ public class LayOfTheLand extends mage.sets.apocalypse.LayOfTheLand {
 
     public LayOfTheLand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/LightningTalons.java b/Mage.Sets/src/mage/sets/magic2014/LightningTalons.java
index 490db3d519..35ba14e35e 100644
--- a/Mage.Sets/src/mage/sets/magic2014/LightningTalons.java
+++ b/Mage.Sets/src/mage/sets/magic2014/LightningTalons.java
@@ -37,7 +37,7 @@ public class LightningTalons extends mage.sets.shardsofalara.LightningTalons {
 
     public LightningTalons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/magic2014/LilianaOfTheDarkRealms.java
index 7387114cda..fab63c48a6 100644
--- a/Mage.Sets/src/mage/sets/magic2014/LilianaOfTheDarkRealms.java
+++ b/Mage.Sets/src/mage/sets/magic2014/LilianaOfTheDarkRealms.java
@@ -37,7 +37,7 @@ public class LilianaOfTheDarkRealms extends mage.sets.magic2013.LilianaOfTheDark
 
     public LilianaOfTheDarkRealms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/MarkOfTheVampire.java b/Mage.Sets/src/mage/sets/magic2014/MarkOfTheVampire.java
index 7538add52a..5303a17703 100644
--- a/Mage.Sets/src/mage/sets/magic2014/MarkOfTheVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2014/MarkOfTheVampire.java
@@ -37,7 +37,7 @@ public class MarkOfTheVampire extends mage.sets.magic2013.MarkOfTheVampire {
 
     public MarkOfTheVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/MerfolkSpy.java b/Mage.Sets/src/mage/sets/magic2014/MerfolkSpy.java
index 373a1577ca..619d36ca56 100644
--- a/Mage.Sets/src/mage/sets/magic2014/MerfolkSpy.java
+++ b/Mage.Sets/src/mage/sets/magic2014/MerfolkSpy.java
@@ -37,7 +37,7 @@ public class MerfolkSpy extends mage.sets.magic2011.MerfolkSpy {
 
     public MerfolkSpy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Millstone.java b/Mage.Sets/src/mage/sets/magic2014/Millstone.java
index 383a679748..0e9ff25d33 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Millstone.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Millstone.java
@@ -38,7 +38,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/MindRot.java b/Mage.Sets/src/mage/sets/magic2014/MindRot.java
index 3e1cbcc2c1..3e4434183f 100644
--- a/Mage.Sets/src/mage/sets/magic2014/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magic2014/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Mutavault.java b/Mage.Sets/src/mage/sets/magic2014/Mutavault.java
index 606de67080..b7b31678ee 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Mutavault.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Mutavault.java
@@ -37,7 +37,7 @@ public class Mutavault extends mage.sets.morningtide.Mutavault {
 
     public Mutavault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Naturalize.java b/Mage.Sets/src/mage/sets/magic2014/Naturalize.java
index d20d9dc064..ba8461cf71 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Negate.java b/Mage.Sets/src/mage/sets/magic2014/Negate.java
index 9db04e7ecb..2f391faf39 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Negate.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/NephaliaSeakite.java b/Mage.Sets/src/mage/sets/magic2014/NephaliaSeakite.java
index 0e879180d1..622ae3ebce 100644
--- a/Mage.Sets/src/mage/sets/magic2014/NephaliaSeakite.java
+++ b/Mage.Sets/src/mage/sets/magic2014/NephaliaSeakite.java
@@ -37,7 +37,7 @@ public class NephaliaSeakite extends mage.sets.darkascension.NephaliaSeakite {
 
     public NephaliaSeakite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Nightmare.java b/Mage.Sets/src/mage/sets/magic2014/Nightmare.java
index 85d494cd14..8fad1ebbca 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/NightwingShade.java b/Mage.Sets/src/mage/sets/magic2014/NightwingShade.java
index 2b1e020bef..1e33bcd9e2 100644
--- a/Mage.Sets/src/mage/sets/magic2014/NightwingShade.java
+++ b/Mage.Sets/src/mage/sets/magic2014/NightwingShade.java
@@ -37,7 +37,7 @@ public class NightwingShade extends mage.sets.magic2011.NightwingShade {
 
     public NightwingShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Opportunity.java b/Mage.Sets/src/mage/sets/magic2014/Opportunity.java
index 1c7e1d1c7f..1812d9a857 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Opportunity.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Opportunity.java
@@ -37,7 +37,7 @@ public class Opportunity extends mage.sets.urzaslegacy.Opportunity {
 
     public Opportunity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Pacifism.java b/Mage.Sets/src/mage/sets/magic2014/Pacifism.java
index 30ad0bc95f..1d194febbe 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/PhantomWarrior.java b/Mage.Sets/src/mage/sets/magic2014/PhantomWarrior.java
index caacb8d43c..ff55e5a953 100644
--- a/Mage.Sets/src/mage/sets/magic2014/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/magic2014/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/PillarfieldOx.java b/Mage.Sets/src/mage/sets/magic2014/PillarfieldOx.java
index 8aa078d73a..8ed9d2e7c2 100644
--- a/Mage.Sets/src/mage/sets/magic2014/PillarfieldOx.java
+++ b/Mage.Sets/src/mage/sets/magic2014/PillarfieldOx.java
@@ -37,7 +37,7 @@ public class PillarfieldOx extends mage.sets.zendikar.PillarfieldOx {
 
     public PillarfieldOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/PitchburnDevils.java b/Mage.Sets/src/mage/sets/magic2014/PitchburnDevils.java
index ef5eb1ed9c..cd059d2e5f 100644
--- a/Mage.Sets/src/mage/sets/magic2014/PitchburnDevils.java
+++ b/Mage.Sets/src/mage/sets/magic2014/PitchburnDevils.java
@@ -37,7 +37,7 @@ public class PitchburnDevils extends mage.sets.innistrad.PitchburnDevils {
 
     public PitchburnDevils(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/PlanarCleansing.java b/Mage.Sets/src/mage/sets/magic2014/PlanarCleansing.java
index 4f79966a8c..f02ce20c1e 100644
--- a/Mage.Sets/src/mage/sets/magic2014/PlanarCleansing.java
+++ b/Mage.Sets/src/mage/sets/magic2014/PlanarCleansing.java
@@ -37,7 +37,7 @@ public class PlanarCleansing extends mage.sets.magic2010.PlanarCleansing {
 
     public PlanarCleansing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Plummet.java b/Mage.Sets/src/mage/sets/magic2014/Plummet.java
index 3657c3f332..33c31f352e 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Plummet.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/QuagSickness.java b/Mage.Sets/src/mage/sets/magic2014/QuagSickness.java
index 026f314c2c..0284c1d684 100644
--- a/Mage.Sets/src/mage/sets/magic2014/QuagSickness.java
+++ b/Mage.Sets/src/mage/sets/magic2014/QuagSickness.java
@@ -37,7 +37,7 @@ public class QuagSickness extends mage.sets.magic2011.QuagSickness {
 
     public QuagSickness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Quicken.java b/Mage.Sets/src/mage/sets/magic2014/Quicken.java
index 1c1787e714..2a316ba626 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Quicken.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Quicken.java
@@ -37,7 +37,7 @@ public class Quicken extends mage.sets.guildpact.Quicken {
 
     public Quicken(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/RangersGuile.java b/Mage.Sets/src/mage/sets/magic2014/RangersGuile.java
index 781844d02f..330d4042e9 100644
--- a/Mage.Sets/src/mage/sets/magic2014/RangersGuile.java
+++ b/Mage.Sets/src/mage/sets/magic2014/RangersGuile.java
@@ -37,7 +37,7 @@ public class RangersGuile extends mage.sets.innistrad.RangersGuile {
 
     public RangersGuile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/RatchetBomb.java b/Mage.Sets/src/mage/sets/magic2014/RatchetBomb.java
index aca4b3c905..d3e7fa02fe 100644
--- a/Mage.Sets/src/mage/sets/magic2014/RatchetBomb.java
+++ b/Mage.Sets/src/mage/sets/magic2014/RatchetBomb.java
@@ -37,7 +37,7 @@ public class RatchetBomb extends mage.sets.scarsofmirrodin.RatchetBomb {
 
     public RatchetBomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/RodOfRuin.java b/Mage.Sets/src/mage/sets/magic2014/RodOfRuin.java
index 0bdfc4a62a..c4e1068a31 100644
--- a/Mage.Sets/src/mage/sets/magic2014/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/magic2014/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Rootwalla.java b/Mage.Sets/src/mage/sets/magic2014/Rootwalla.java
index 1151af8751..2d2295e69f 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Rootwalla.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Rootwalla.java
@@ -37,7 +37,7 @@ public class Rootwalla extends mage.sets.tempest.Rootwalla {
 
     public Rootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/SanguineBond.java b/Mage.Sets/src/mage/sets/magic2014/SanguineBond.java
index 6bfced6149..319a84fec4 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SanguineBond.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SanguineBond.java
@@ -37,7 +37,7 @@ public class SanguineBond extends mage.sets.magic2010.SanguineBond {
 
     public SanguineBond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ScavengingOoze.java b/Mage.Sets/src/mage/sets/magic2014/ScavengingOoze.java
index e6a0210af1..754f054b75 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ScavengingOoze.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ScavengingOoze.java
@@ -37,7 +37,7 @@ public class ScavengingOoze extends mage.sets.commander.ScavengingOoze {
 
     public ScavengingOoze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ScrollThief.java b/Mage.Sets/src/mage/sets/magic2014/ScrollThief.java
index ac25f0a648..f3c0bc232d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ScrollThief.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ScrollThief.java
@@ -37,7 +37,7 @@ public class ScrollThief extends mage.sets.magic2011.ScrollThief {
 
     public ScrollThief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/SengirVampire.java b/Mage.Sets/src/mage/sets/magic2014/SengirVampire.java
index fd55cb5eb0..9ffbfa2064 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/SensoryDeprivation.java b/Mage.Sets/src/mage/sets/magic2014/SensoryDeprivation.java
index ea213e54c5..28b3cf4f24 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SensoryDeprivation.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SensoryDeprivation.java
@@ -37,7 +37,7 @@ public class SensoryDeprivation extends mage.sets.innistrad.SensoryDeprivation {
 
     public SensoryDeprivation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2014/SerraAngel.java
index d3f1040525..84850f072f 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/ShimmeringGrotto.java b/Mage.Sets/src/mage/sets/magic2014/ShimmeringGrotto.java
index 9f9234bffd..e947360e05 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ShimmeringGrotto.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ShimmeringGrotto.java
@@ -37,7 +37,7 @@ public class ShimmeringGrotto extends mage.sets.lorwyn.ShimmeringGrotto {
 
     public ShimmeringGrotto(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ShivanDragon.java b/Mage.Sets/src/mage/sets/magic2014/ShivanDragon.java
index d93a720b22..bd7fac375d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/magic2014/ShivsEmbrace.java
index 18d8dc9da4..1d88bac12d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ShivsEmbrace.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ShivsEmbrace.java
@@ -37,7 +37,7 @@ public class ShivsEmbrace extends mage.sets.magic2011.ShivsEmbrace {
 
     public ShivsEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Shock.java b/Mage.Sets/src/mage/sets/magic2014/Shock.java
index 6d93d5d223..e1f51acabc 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Shock.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ShowOfValor.java b/Mage.Sets/src/mage/sets/magic2014/ShowOfValor.java
index fc9f972753..e0d92c0711 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ShowOfValor.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ShowOfValor.java
@@ -37,7 +37,7 @@ public class ShowOfValor extends mage.sets.magic2013.ShowOfValor {
 
     public ShowOfValor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Shrivel.java b/Mage.Sets/src/mage/sets/magic2014/Shrivel.java
index 4a3b73e646..c9030a7417 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Shrivel.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Shrivel.java
@@ -37,7 +37,7 @@ public class Shrivel extends mage.sets.riseoftheeldrazi.Shrivel {
 
     public Shrivel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/SiegeMastodon.java b/Mage.Sets/src/mage/sets/magic2014/SiegeMastodon.java
index 6f13898fd5..de9a3c111e 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SiegeMastodon.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SiegeMastodon.java
@@ -37,7 +37,7 @@ public class SiegeMastodon extends mage.sets.magic2010.SiegeMastodon {
 
     public SiegeMastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Silence.java b/Mage.Sets/src/mage/sets/magic2014/Silence.java
index 51fd48a2bd..f04e708b73 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Silence.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Silence.java
@@ -37,7 +37,7 @@ public class Silence extends mage.sets.magic2010.Silence {
 
     public Silence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Smelt.java b/Mage.Sets/src/mage/sets/magic2014/Smelt.java
index e331d0cf5f..08cadce931 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Smelt.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Smelt.java
@@ -37,7 +37,7 @@ public class Smelt extends mage.sets.magic2013.Smelt {
 
     public Smelt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2014/SolemnOffering.java
index 0a5db86b73..e1fe48fcf8 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SolemnOffering.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SolemnOffering.java
@@ -37,7 +37,7 @@ public class SolemnOffering extends mage.sets.magic2010.SolemnOffering {
 
     public SolemnOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/SpellBlast.java b/Mage.Sets/src/mage/sets/magic2014/SpellBlast.java
index 38ca654f44..4d7fa4ad3c 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SpellBlast.java
@@ -38,7 +38,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "M14";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/SuntailHawk.java b/Mage.Sets/src/mage/sets/magic2014/SuntailHawk.java
index f21efe7e7e..6a5e104d23 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SuntailHawk.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SuntailHawk.java
@@ -37,7 +37,7 @@ public class SuntailHawk extends mage.sets.tenthedition.SuntailHawk {
 
     public SuntailHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/ThunderStrike.java b/Mage.Sets/src/mage/sets/magic2014/ThunderStrike.java
index 385eefc861..9a87fd5470 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ThunderStrike.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ThunderStrike.java
@@ -37,7 +37,7 @@ public class ThunderStrike extends mage.sets.magic2011.ThunderStrike {
 
     public ThunderStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/TimeEbb.java b/Mage.Sets/src/mage/sets/magic2014/TimeEbb.java
index e611cd9da4..19f4ccd642 100644
--- a/Mage.Sets/src/mage/sets/magic2014/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/magic2014/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/TomeScour.java b/Mage.Sets/src/mage/sets/magic2014/TomeScour.java
index 32c4ced98c..a096b38abb 100644
--- a/Mage.Sets/src/mage/sets/magic2014/TomeScour.java
+++ b/Mage.Sets/src/mage/sets/magic2014/TomeScour.java
@@ -37,7 +37,7 @@ public class TomeScour extends mage.sets.magic2010.TomeScour {
 
     public TomeScour(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/TradingPost.java b/Mage.Sets/src/mage/sets/magic2014/TradingPost.java
index eab7bb4609..693e80532a 100644
--- a/Mage.Sets/src/mage/sets/magic2014/TradingPost.java
+++ b/Mage.Sets/src/mage/sets/magic2014/TradingPost.java
@@ -37,7 +37,7 @@ public class TradingPost extends mage.sets.magic2013.TradingPost {
 
     public TradingPost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Traumatize.java b/Mage.Sets/src/mage/sets/magic2014/Traumatize.java
index 97b301996b..4851aa4521 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Traumatize.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Traumatize.java
@@ -37,7 +37,7 @@ public class Traumatize extends mage.sets.tenthedition.Traumatize {
 
     public Traumatize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Trollhide.java b/Mage.Sets/src/mage/sets/magic2014/Trollhide.java
index 6982e12026..f5242d9cf6 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Trollhide.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Trollhide.java
@@ -37,7 +37,7 @@ public class Trollhide extends mage.sets.magic2012.Trollhide {
 
     public Trollhide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/VerdantHaven.java b/Mage.Sets/src/mage/sets/magic2014/VerdantHaven.java
index e8905e35c8..1bbda6b23a 100644
--- a/Mage.Sets/src/mage/sets/magic2014/VerdantHaven.java
+++ b/Mage.Sets/src/mage/sets/magic2014/VerdantHaven.java
@@ -37,7 +37,7 @@ public class VerdantHaven extends mage.sets.gatecrash.VerdantHaven {
 
     public VerdantHaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/VileRebirth.java b/Mage.Sets/src/mage/sets/magic2014/VileRebirth.java
index 319096c3cc..a43c5473ce 100644
--- a/Mage.Sets/src/mage/sets/magic2014/VileRebirth.java
+++ b/Mage.Sets/src/mage/sets/magic2014/VileRebirth.java
@@ -37,7 +37,7 @@ public class VileRebirth extends mage.sets.magic2013.VileRebirth {
 
     public VileRebirth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/magic2014/VolcanicGeyser.java
index 4989e05c39..8b271ba179 100644
--- a/Mage.Sets/src/mage/sets/magic2014/VolcanicGeyser.java
+++ b/Mage.Sets/src/mage/sets/magic2014/VolcanicGeyser.java
@@ -37,7 +37,7 @@ public class VolcanicGeyser extends mage.sets.magic2013.VolcanicGeyser {
 
     public VolcanicGeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2014/WallOfFrost.java
index 28e8684466..419042ad7d 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WallOfFrost.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WallOfFrost.java
@@ -37,7 +37,7 @@ public class WallOfFrost extends mage.sets.magic2010.WallOfFrost {
 
     public WallOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/WallOfSwords.java b/Mage.Sets/src/mage/sets/magic2014/WallOfSwords.java
index 4e9a36695d..54267ab9e5 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/WaterServant.java b/Mage.Sets/src/mage/sets/magic2014/WaterServant.java
index 6d6ebc5af4..f02b6a8e86 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WaterServant.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WaterServant.java
@@ -37,7 +37,7 @@ public class WaterServant extends mage.sets.magic2011.WaterServant {
 
     public WaterServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/WildGuess.java b/Mage.Sets/src/mage/sets/magic2014/WildGuess.java
index 6a27a9f969..8839335c70 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WildGuess.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WildGuess.java
@@ -37,7 +37,7 @@ public class WildGuess extends mage.sets.magic2013.WildGuess {
 
     public WildGuess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/WildRicochet.java b/Mage.Sets/src/mage/sets/magic2014/WildRicochet.java
index 2f8182eaf6..7f5e99ea2a 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WildRicochet.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WildRicochet.java
@@ -37,7 +37,7 @@ public class WildRicochet extends mage.sets.commander.WildRicochet {
 
     public WildRicochet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/Windstorm.java b/Mage.Sets/src/mage/sets/magic2014/Windstorm.java
index 45c97b6520..4f86ee6981 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Windstorm.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Windstorm.java
@@ -37,7 +37,7 @@ public class Windstorm extends mage.sets.magic2010.Windstorm {
 
     public Windstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/WringFlesh.java b/Mage.Sets/src/mage/sets/magic2014/WringFlesh.java
index bfea433f01..49fe25b6eb 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WringFlesh.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WringFlesh.java
@@ -37,7 +37,7 @@ public class WringFlesh extends mage.sets.magic2012.WringFlesh {
 
     public WringFlesh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "M14";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java b/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java
index 22da70a0a8..eb6ccd8415 100644
--- a/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java
+++ b/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java
@@ -37,7 +37,7 @@ public class AccursedSpirit extends mage.sets.magic2014.AccursedSpirit {
 
     public AccursedSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java b/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java
index 784b3f3d68..30bb155279 100644
--- a/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java
@@ -37,7 +37,7 @@ public class AegisAngel extends mage.sets.magic2012.AegisAngel {
 
     public AegisAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java
index 5efe01d761..8566cfee13 100644
--- a/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java
+++ b/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java
@@ -37,7 +37,7 @@ public class AjanisPridemate extends mage.sets.magic2011.AjanisPridemate {
 
     public AjanisPridemate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/AncientSilverback.java b/Mage.Sets/src/mage/sets/magic2015/AncientSilverback.java
index 47e22b0b42..27167baa3d 100644
--- a/Mage.Sets/src/mage/sets/magic2015/AncientSilverback.java
+++ b/Mage.Sets/src/mage/sets/magic2015/AncientSilverback.java
@@ -38,7 +38,7 @@ public class AncientSilverback extends mage.sets.urzasdestiny.AncientSilverback
 
     public AncientSilverback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/BackToNature.java b/Mage.Sets/src/mage/sets/magic2015/BackToNature.java
index 078a42dfc0..db4d74770b 100644
--- a/Mage.Sets/src/mage/sets/magic2015/BackToNature.java
+++ b/Mage.Sets/src/mage/sets/magic2015/BackToNature.java
@@ -37,7 +37,7 @@ public class BackToNature extends mage.sets.magic2011.BackToNature {
 
     public BackToNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/BattleMastery.java b/Mage.Sets/src/mage/sets/magic2015/BattleMastery.java
index dfb7943197..841dcd9f68 100644
--- a/Mage.Sets/src/mage/sets/magic2015/BattleMastery.java
+++ b/Mage.Sets/src/mage/sets/magic2015/BattleMastery.java
@@ -37,7 +37,7 @@ public class BattleMastery extends mage.sets.lorwyn.BattleMastery {
 
     public BattleMastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/BattlefieldForge.java b/Mage.Sets/src/mage/sets/magic2015/BattlefieldForge.java
index 614ed39644..0c50cf298e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/BattlefieldForge.java
+++ b/Mage.Sets/src/mage/sets/magic2015/BattlefieldForge.java
@@ -37,7 +37,7 @@ public class BattlefieldForge extends mage.sets.apocalypse.BattlefieldForge {
 
     public BattlefieldForge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/BlackCat.java b/Mage.Sets/src/mage/sets/magic2015/BlackCat.java
index 18cbe531c3..cdefc50b43 100644
--- a/Mage.Sets/src/mage/sets/magic2015/BlackCat.java
+++ b/Mage.Sets/src/mage/sets/magic2015/BlackCat.java
@@ -37,7 +37,7 @@ public class BlackCat extends mage.sets.darkascension.BlackCat {
 
     public BlackCat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java b/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java
index 185d726df5..7c44afad1c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java
+++ b/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java
@@ -37,7 +37,7 @@ public class BronzeSable extends mage.sets.theros.BronzeSable {
 
     public BronzeSable(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Cancel.java b/Mage.Sets/src/mage/sets/magic2015/Cancel.java
index 13dc169c09..e04aa66999 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Cancel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/CausticTar.java b/Mage.Sets/src/mage/sets/magic2015/CausticTar.java
index cd17bcbc3e..dd3f124ccd 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CausticTar.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CausticTar.java
@@ -37,7 +37,7 @@ public class CausticTar extends mage.sets.odyssey.CausticTar {
 
     public CausticTar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/CavesOfKoilos.java b/Mage.Sets/src/mage/sets/magic2015/CavesOfKoilos.java
index 4ff50355f1..3e272da9b5 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CavesOfKoilos.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CavesOfKoilos.java
@@ -37,7 +37,7 @@ public class CavesOfKoilos extends mage.sets.apocalypse.CavesOfKoilos {
 
     public CavesOfKoilos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/CentaurCourser.java b/Mage.Sets/src/mage/sets/magic2015/CentaurCourser.java
index 0e5c292180..4d64fe4a77 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CentaurCourser.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CentaurCourser.java
@@ -37,7 +37,7 @@ public class CentaurCourser extends mage.sets.magic2010.CentaurCourser {
 
     public CentaurCourser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ChandraPyromaster.java b/Mage.Sets/src/mage/sets/magic2015/ChandraPyromaster.java
index 87e9bf13e8..8d06c6a895 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ChandraPyromaster.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ChandraPyromaster.java
@@ -37,7 +37,7 @@ public class ChandraPyromaster extends mage.sets.magic2014.ChandraPyromaster {
 
     public ChandraPyromaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ChargingRhino.java b/Mage.Sets/src/mage/sets/magic2015/ChargingRhino.java
index e9dc713ade..05b621d2b4 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ChargingRhino.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ChargingRhino.java
@@ -38,7 +38,7 @@ public class ChargingRhino extends mage.sets.tempest.ChargingRhino {
 
     public ChargingRhino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java
index 9dd321579b..1a241c7e09 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java
@@ -37,7 +37,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight {
 
     public ChildOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ChordOfCalling.java b/Mage.Sets/src/mage/sets/magic2015/ChordOfCalling.java
index 76f8688bc6..acd60e85da 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ChordOfCalling.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ChordOfCalling.java
@@ -37,7 +37,7 @@ public class ChordOfCalling extends mage.sets.ravnica.ChordOfCalling {
 
     public ChordOfCalling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/CircleOfFlame.java b/Mage.Sets/src/mage/sets/magic2015/CircleOfFlame.java
index 715ba09e2d..86b6ada52a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CircleOfFlame.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CircleOfFlame.java
@@ -37,7 +37,7 @@ public class CircleOfFlame extends mage.sets.magic2012.CircleOfFlame {
 
     public CircleOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java b/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java
index 458dfcc74e..bac3e64ab2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java
@@ -37,7 +37,7 @@ public class ClearAPath extends mage.sets.dragonsmaze.ClearAPath {
 
     public ClearAPath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ConeOfFlame.java b/Mage.Sets/src/mage/sets/magic2015/ConeOfFlame.java
index e4787eb34d..3d4bbcdeea 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Congregate.java b/Mage.Sets/src/mage/sets/magic2015/Congregate.java
index 5be37aee57..846e2604b9 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Congregate.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Congregate.java
@@ -38,7 +38,7 @@ public class Congregate extends mage.sets.urzassaga.Congregate {
 
     public Congregate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/CripplingBlight.java b/Mage.Sets/src/mage/sets/magic2015/CripplingBlight.java
index 13e5196f33..94a584b445 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CripplingBlight.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CripplingBlight.java
@@ -37,7 +37,7 @@ public class CripplingBlight extends mage.sets.magic2013.CripplingBlight {
 
     public CripplingBlight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/CrucibleOfFire.java b/Mage.Sets/src/mage/sets/magic2015/CrucibleOfFire.java
index e95ca283e7..9086b7cd7d 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CrucibleOfFire.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CrucibleOfFire.java
@@ -37,7 +37,7 @@ public class CrucibleOfFire extends mage.sets.shardsofalara.CrucibleOfFire {
 
     public CrucibleOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/DarksteelCitadel.java b/Mage.Sets/src/mage/sets/magic2015/DarksteelCitadel.java
index bb20ef4c09..535e875938 100644
--- a/Mage.Sets/src/mage/sets/magic2015/DarksteelCitadel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/DarksteelCitadel.java
@@ -39,7 +39,7 @@ public class DarksteelCitadel extends mage.sets.darksteel.DarksteelCitadel {
     public DarksteelCitadel(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/DevouringLight.java b/Mage.Sets/src/mage/sets/magic2015/DevouringLight.java
index 639c4158e1..29cc7eb422 100644
--- a/Mage.Sets/src/mage/sets/magic2015/DevouringLight.java
+++ b/Mage.Sets/src/mage/sets/magic2015/DevouringLight.java
@@ -37,7 +37,7 @@ public class DevouringLight extends mage.sets.ravnica.DevouringLight {
 
     public DevouringLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Dissipate.java b/Mage.Sets/src/mage/sets/magic2015/Dissipate.java
index a7fb789d20..a40d22d2f2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Dissipate.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Dissipate.java
@@ -37,7 +37,7 @@ public class Dissipate extends mage.sets.innistrad.Dissipate {
 
     public Dissipate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Divination.java b/Mage.Sets/src/mage/sets/magic2015/Divination.java
index 1d81ec894b..6ce8e170c2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Divination.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Divination.java
@@ -37,7 +37,7 @@ public class Divination extends mage.sets.magic2012.Divination {
 
     public Divination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java
index 9ba890fbc0..865d5eeff9 100644
--- a/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java
+++ b/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java
@@ -37,7 +37,7 @@ public class DivineFavor extends mage.sets.magic2012.DivineFavor {
 
     public DivineFavor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java b/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java
index 6f1974e077..1c3384dd90 100644
--- a/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java
+++ b/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java
@@ -37,7 +37,7 @@ public class DivineVerdict extends mage.sets.magic2010.DivineVerdict {
 
     public DivineVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ElvishMystic.java b/Mage.Sets/src/mage/sets/magic2015/ElvishMystic.java
index 9478227d01..0b6574417d 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ElvishMystic.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ElvishMystic.java
@@ -37,7 +37,7 @@ public class ElvishMystic extends mage.sets.magic2014.ElvishMystic {
 
     public ElvishMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Encrust.java b/Mage.Sets/src/mage/sets/magic2015/Encrust.java
index 8acff5ca2b..3317c4df1c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Encrust.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Encrust.java
@@ -37,7 +37,7 @@ public class Encrust extends mage.sets.magic2013.Encrust {
 
     public Encrust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/EvolvingWilds.java b/Mage.Sets/src/mage/sets/magic2015/EvolvingWilds.java
index 2f877d32e4..337a101e5a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/magic2015/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ForgeDevil.java b/Mage.Sets/src/mage/sets/magic2015/ForgeDevil.java
index 363a266984..ebfb7df87f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ForgeDevil.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ForgeDevil.java
@@ -37,7 +37,7 @@ public class ForgeDevil extends mage.sets.darkascension.ForgeDevil {
 
     public ForgeDevil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/FoundryStreetDenizen.java b/Mage.Sets/src/mage/sets/magic2015/FoundryStreetDenizen.java
index 1b8a9f7963..13361351fa 100644
--- a/Mage.Sets/src/mage/sets/magic2015/FoundryStreetDenizen.java
+++ b/Mage.Sets/src/mage/sets/magic2015/FoundryStreetDenizen.java
@@ -37,7 +37,7 @@ public class FoundryStreetDenizen extends mage.sets.gatecrash.FoundryStreetDeniz
 
     public FoundryStreetDenizen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/FrenziedGoblin.java b/Mage.Sets/src/mage/sets/magic2015/FrenziedGoblin.java
index fccfaa7952..72ec98f413 100644
--- a/Mage.Sets/src/mage/sets/magic2015/FrenziedGoblin.java
+++ b/Mage.Sets/src/mage/sets/magic2015/FrenziedGoblin.java
@@ -37,7 +37,7 @@ public class FrenziedGoblin extends mage.sets.ravnica.FrenziedGoblin {
 
     public FrenziedGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/FugitiveWizard.java b/Mage.Sets/src/mage/sets/magic2015/FugitiveWizard.java
index 654663514b..7adcc42f4c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/FugitiveWizard.java
+++ b/Mage.Sets/src/mage/sets/magic2015/FugitiveWizard.java
@@ -37,7 +37,7 @@ public class FugitiveWizard extends mage.sets.tenthedition.FugitiveWizard {
 
     public FugitiveWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/magic2015/FurnaceWhelp.java
index 0de25ac62a..069cd95177 100644
--- a/Mage.Sets/src/mage/sets/magic2015/FurnaceWhelp.java
+++ b/Mage.Sets/src/mage/sets/magic2015/FurnaceWhelp.java
@@ -39,7 +39,7 @@ public class FurnaceWhelp extends mage.sets.tenthedition.FurnaceWhelp {
     public FurnaceWhelp(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java b/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java
index 01a5c141cd..ff320a4ae4 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java
@@ -39,7 +39,7 @@ public class GargoyleSentinel extends mage.sets.magic2011.GargoyleSentinel {
     public GargoyleSentinel(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/GarruksPackleader.java b/Mage.Sets/src/mage/sets/magic2015/GarruksPackleader.java
index bf5831ff3c..5582468c20 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GarruksPackleader.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GarruksPackleader.java
@@ -39,7 +39,7 @@ public class GarruksPackleader extends mage.sets.magic2011.GarruksPackleader {
     public GarruksPackleader(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java b/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
index 115b4d4045..4b26d93e11 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
@@ -39,7 +39,7 @@ public class GatherCourage extends mage.sets.ravnica.GatherCourage {
     public GatherCourage(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/GoblinRoughrider.java b/Mage.Sets/src/mage/sets/magic2015/GoblinRoughrider.java
index 37701fe08b..4f1aba52e3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GoblinRoughrider.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GoblinRoughrider.java
@@ -37,7 +37,7 @@ public class GoblinRoughrider extends mage.sets.worldwake.GoblinRoughrider {
 
     public GoblinRoughrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Gravedigger.java b/Mage.Sets/src/mage/sets/magic2015/Gravedigger.java
index 20b70c68e3..8786b67bab 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Gravedigger.java
@@ -39,7 +39,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
     public Gravedigger(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Grindclock.java b/Mage.Sets/src/mage/sets/magic2015/Grindclock.java
index 833e3027f3..fb98c432f8 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Grindclock.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Grindclock.java
@@ -37,7 +37,7 @@ public class Grindclock extends mage.sets.scarsofmirrodin.Grindclock {
 
     public Grindclock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HauntedPlateMail.java b/Mage.Sets/src/mage/sets/magic2015/HauntedPlateMail.java
index ddfec3b040..e6ce207c32 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HauntedPlateMail.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HauntedPlateMail.java
@@ -37,7 +37,7 @@ public class HauntedPlateMail extends mage.sets.magic2014.HauntedPlateMail {
 
     public HauntedPlateMail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HeatRay.java b/Mage.Sets/src/mage/sets/magic2015/HeatRay.java
index f5cf2deae5..b9124f9f0b 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HeatRay.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HeatRay.java
@@ -39,7 +39,7 @@ public class HeatRay extends mage.sets.riseoftheeldrazi.HeatRay {
     public HeatRay(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java
index 174de244ae..17c8462ab1 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java
@@ -37,7 +37,7 @@ public class HoardingDragon extends mage.sets.magic2011.HoardingDragon {
 
     public HoardingDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java b/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java
index ee2b9eb274..38eabb4ad1 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java
@@ -37,7 +37,7 @@ public class HornetQueen extends mage.sets.commander.HornetQueen {
 
     public HornetQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HuntTheWeak.java b/Mage.Sets/src/mage/sets/magic2015/HuntTheWeak.java
index 9e41a9b832..8190c9f46e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HuntTheWeak.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HuntTheWeak.java
@@ -37,7 +37,7 @@ public class HuntTheWeak extends mage.sets.magic2014.HuntTheWeak {
 
     public HuntTheWeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Hydrosurge.java b/Mage.Sets/src/mage/sets/magic2015/Hydrosurge.java
index 4654b42822..83b529a725 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Hydrosurge.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Hydrosurge.java
@@ -37,7 +37,7 @@ public class Hydrosurge extends mage.sets.magic2013.Hydrosurge {
 
     public Hydrosurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/IllusoryAngel.java b/Mage.Sets/src/mage/sets/magic2015/IllusoryAngel.java
index bb777bf14d..27448b58e7 100644
--- a/Mage.Sets/src/mage/sets/magic2015/IllusoryAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/IllusoryAngel.java
@@ -39,7 +39,7 @@ public class IllusoryAngel extends mage.sets.planechase2012.IllusoryAngel {
     public IllusoryAngel(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java
index 1d5437b54e..4d08166e88 100644
--- a/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java
+++ b/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java
@@ -37,7 +37,7 @@ public class InspiredCharge extends mage.sets.magic2011.InspiredCharge {
 
     public InspiredCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/IntoTheVoid.java b/Mage.Sets/src/mage/sets/magic2015/IntoTheVoid.java
index 7f82cba18e..6b470cd3fa 100644
--- a/Mage.Sets/src/mage/sets/magic2015/IntoTheVoid.java
+++ b/Mage.Sets/src/mage/sets/magic2015/IntoTheVoid.java
@@ -39,7 +39,7 @@ public class IntoTheVoid extends mage.sets.avacynrestored.IntoTheVoid {
     public IntoTheVoid(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Invisibility.java b/Mage.Sets/src/mage/sets/magic2015/Invisibility.java
index 6601035b32..049fea9a7a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Invisibility.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Invisibility.java
@@ -37,7 +37,7 @@ public class Invisibility extends mage.sets.limitedalpha.Invisibility {
 
     public Invisibility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/JacesIngenuity.java b/Mage.Sets/src/mage/sets/magic2015/JacesIngenuity.java
index 79e078864f..c6603c72fd 100644
--- a/Mage.Sets/src/mage/sets/magic2015/JacesIngenuity.java
+++ b/Mage.Sets/src/mage/sets/magic2015/JacesIngenuity.java
@@ -39,7 +39,7 @@ public class JacesIngenuity extends mage.sets.magic2011.JacesIngenuity {
     public JacesIngenuity(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java b/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java
index 81095bb959..3c358107d3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java
@@ -39,7 +39,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
     public Juggernaut(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java
index 3ebb1c7fa3..4cee24589f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java
@@ -37,7 +37,7 @@ public class KinsbaileSkirmisher extends mage.sets.lorwyn.KinsbaileSkirmisher {
 
     public KinsbaileSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2015/LavaAxe.java
index bfe44dee9a..91a18be83b 100644
--- a/Mage.Sets/src/mage/sets/magic2015/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/magic2015/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/LightningStrike.java b/Mage.Sets/src/mage/sets/magic2015/LightningStrike.java
index 06c4300ebc..a383ca9a22 100644
--- a/Mage.Sets/src/mage/sets/magic2015/LightningStrike.java
+++ b/Mage.Sets/src/mage/sets/magic2015/LightningStrike.java
@@ -37,7 +37,7 @@ public class LightningStrike extends mage.sets.theros.LightningStrike {
 
     public LightningStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2015/LilianaVess.java
index d9ded796f3..714049e181 100644
--- a/Mage.Sets/src/mage/sets/magic2015/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/magic2015/LilianaVess.java
@@ -37,7 +37,7 @@ public class LilianaVess extends mage.sets.magic2010.LilianaVess {
 
     public LilianaVess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/LlanowarWastes.java b/Mage.Sets/src/mage/sets/magic2015/LlanowarWastes.java
index 38004a8fe7..20d9c6ad31 100644
--- a/Mage.Sets/src/mage/sets/magic2015/LlanowarWastes.java
+++ b/Mage.Sets/src/mage/sets/magic2015/LlanowarWastes.java
@@ -37,7 +37,7 @@ public class LlanowarWastes extends mage.sets.apocalypse.LlanowarWastes {
 
     public LlanowarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/magic2015/MahamotiDjinn.java
index c5a4f4eb3e..5d4909fc51 100644
--- a/Mage.Sets/src/mage/sets/magic2015/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/magic2015/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/MassCalcify.java b/Mage.Sets/src/mage/sets/magic2015/MassCalcify.java
index c4de129389..cc06ca4621 100644
--- a/Mage.Sets/src/mage/sets/magic2015/MassCalcify.java
+++ b/Mage.Sets/src/mage/sets/magic2015/MassCalcify.java
@@ -37,7 +37,7 @@ public class MassCalcify extends mage.sets.shadowmoor.MassCalcify {
 
     public MassCalcify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java b/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java
index ef0d653518..0c95237f2f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java
+++ b/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java
@@ -37,7 +37,7 @@ public class MidnightGuard extends mage.sets.darkascension.MidnightGuard {
 
     public MidnightGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/MindRot.java b/Mage.Sets/src/mage/sets/magic2015/MindRot.java
index af37e45dbc..048d92bd24 100644
--- a/Mage.Sets/src/mage/sets/magic2015/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magic2015/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/MindSculpt.java b/Mage.Sets/src/mage/sets/magic2015/MindSculpt.java
index d43cad97cb..8a0d2895d2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/MindSculpt.java
+++ b/Mage.Sets/src/mage/sets/magic2015/MindSculpt.java
@@ -37,7 +37,7 @@ public class MindSculpt extends mage.sets.magic2013.MindSculpt {
 
     public MindSculpt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Naturalize.java b/Mage.Sets/src/mage/sets/magic2015/Naturalize.java
index 2bf62f684d..75735a7e3c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Necrobite.java b/Mage.Sets/src/mage/sets/magic2015/Necrobite.java
index 56e4e65454..1193716a56 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Necrobite.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Necrobite.java
@@ -37,7 +37,7 @@ public class Necrobite extends mage.sets.avacynrestored.Necrobite {
 
     public Necrobite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/NecrogenScudder.java b/Mage.Sets/src/mage/sets/magic2015/NecrogenScudder.java
index e8b94c4155..d36fcb7135 100644
--- a/Mage.Sets/src/mage/sets/magic2015/NecrogenScudder.java
+++ b/Mage.Sets/src/mage/sets/magic2015/NecrogenScudder.java
@@ -37,7 +37,7 @@ public class NecrogenScudder extends mage.sets.scarsofmirrodin.NecrogenScudder {
 
     public NecrogenScudder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Negate.java b/Mage.Sets/src/mage/sets/magic2015/Negate.java
index 4931779bf7..3d568d3dd9 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Negate.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Nightmare.java b/Mage.Sets/src/mage/sets/magic2015/Nightmare.java
index 34deab4e69..36c5927dbc 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/OppressiveRays.java b/Mage.Sets/src/mage/sets/magic2015/OppressiveRays.java
index e26a81d843..71fd319c00 100644
--- a/Mage.Sets/src/mage/sets/magic2015/OppressiveRays.java
+++ b/Mage.Sets/src/mage/sets/magic2015/OppressiveRays.java
@@ -37,7 +37,7 @@ public class OppressiveRays extends mage.sets.journeyintonyx.OppressiveRays {
 
     public OppressiveRays(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java b/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java
index ded773cc2a..190ec76de2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java
+++ b/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java
@@ -37,7 +37,7 @@ public class OreskosSwiftclaw extends mage.sets.journeyintonyx.OreskosSwiftclaw
 
     public OreskosSwiftclaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java
index 55d99bf35c..7bf6dfbe2c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java
@@ -38,7 +38,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java b/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
index 951379b1ef..c768f3a189 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
@@ -39,7 +39,7 @@ public class Overwhelm extends mage.sets.ravnica.Overwhelm {
     public Overwhelm(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java b/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java
index a0aef3adcb..2f0bbb95c4 100644
--- a/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java
+++ b/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java
@@ -37,7 +37,7 @@ public class PeelFromReality extends mage.sets.avacynrestored.PeelFromReality {
 
     public PeelFromReality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/PhyrexianRevoker.java b/Mage.Sets/src/mage/sets/magic2015/PhyrexianRevoker.java
index 6dc9cf2586..2d406ad83c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/PhyrexianRevoker.java
+++ b/Mage.Sets/src/mage/sets/magic2015/PhyrexianRevoker.java
@@ -37,7 +37,7 @@ public class PhyrexianRevoker extends mage.sets.mirrodinbesieged.PhyrexianRevoke
 
     public PhyrexianRevoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Plummet.java b/Mage.Sets/src/mage/sets/magic2015/Plummet.java
index 87a88aa813..e0014e511b 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Plummet.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java b/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java
index 2eb8226b05..b3d4424447 100644
--- a/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java
+++ b/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java
@@ -37,7 +37,7 @@ public class PreeminentCaptain extends mage.sets.morningtide.PreeminentCaptain {
 
     public PreeminentCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/magic2015/RaiseTheAlarm.java
index 10d260d71e..a7b19e3936 100644
--- a/Mage.Sets/src/mage/sets/magic2015/RaiseTheAlarm.java
+++ b/Mage.Sets/src/mage/sets/magic2015/RaiseTheAlarm.java
@@ -37,7 +37,7 @@ public class RaiseTheAlarm extends mage.sets.mirrodin.RaiseTheAlarm {
 
     public RaiseTheAlarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/RangersGuile.java b/Mage.Sets/src/mage/sets/magic2015/RangersGuile.java
index d2cd03bdbb..a1641a84c3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/RangersGuile.java
+++ b/Mage.Sets/src/mage/sets/magic2015/RangersGuile.java
@@ -37,7 +37,7 @@ public class RangersGuile extends mage.sets.innistrad.RangersGuile {
 
     public RangersGuile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java
index 3d5e6deaff..a12df3041e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java
+++ b/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java
@@ -37,7 +37,7 @@ public class RazorfootGriffin extends mage.sets.magic2010.RazorfootGriffin {
 
     public RazorfootGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Restock.java b/Mage.Sets/src/mage/sets/magic2015/Restock.java
index 37aa62650e..6b0295a89c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Restock.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Restock.java
@@ -39,7 +39,7 @@ public class Restock extends mage.sets.invasion.Restock {
     public Restock(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/RoaringPrimadox.java b/Mage.Sets/src/mage/sets/magic2015/RoaringPrimadox.java
index 9b42c4aa84..87ddb1a73c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/RoaringPrimadox.java
+++ b/Mage.Sets/src/mage/sets/magic2015/RoaringPrimadox.java
@@ -39,7 +39,7 @@ public class RoaringPrimadox extends mage.sets.magic2013.RoaringPrimadox {
     public RoaringPrimadox(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/RummagingGoblin.java b/Mage.Sets/src/mage/sets/magic2015/RummagingGoblin.java
index 6e95ab6828..fbcf5b833d 100644
--- a/Mage.Sets/src/mage/sets/magic2015/RummagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/magic2015/RummagingGoblin.java
@@ -37,7 +37,7 @@ public class RummagingGoblin extends mage.sets.magic2013.RummagingGoblin {
 
     public RummagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/RuneclawBear.java b/Mage.Sets/src/mage/sets/magic2015/RuneclawBear.java
index c3d6244ef2..84a1c727e7 100644
--- a/Mage.Sets/src/mage/sets/magic2015/RuneclawBear.java
+++ b/Mage.Sets/src/mage/sets/magic2015/RuneclawBear.java
@@ -37,7 +37,7 @@ public class RuneclawBear extends mage.sets.magic2010.RuneclawBear {
 
     public RuneclawBear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SatyrWayfinder.java b/Mage.Sets/src/mage/sets/magic2015/SatyrWayfinder.java
index 49de110f18..549f94c9c2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SatyrWayfinder.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SatyrWayfinder.java
@@ -37,7 +37,7 @@ public class SatyrWayfinder extends mage.sets.bornofthegods.SatyrWayfinder {
 
     public SatyrWayfinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SeismicStrike.java b/Mage.Sets/src/mage/sets/magic2015/SeismicStrike.java
index 0e786809af..375a67491e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SeismicStrike.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SeismicStrike.java
@@ -37,7 +37,7 @@ public class SeismicStrike extends mage.sets.magic2010.SeismicStrike {
 
     public SeismicStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java b/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java
index 84192a7ec2..3363b121ec 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java
@@ -37,7 +37,7 @@ public class SelflessCathar extends mage.sets.innistrad.SelflessCathar {
 
     public SelflessCathar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SengirVampire.java b/Mage.Sets/src/mage/sets/magic2015/SengirVampire.java
index 55291b2f0e..08fcc2486d 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SengirVampire.java
@@ -39,7 +39,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
     public SengirVampire(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java
index ce631ee33e..1570bcf8eb 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/ShivanDragon.java b/Mage.Sets/src/mage/sets/magic2015/ShivanDragon.java
index 94cd5ff034..92b9f835ee 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ShivanReef.java b/Mage.Sets/src/mage/sets/magic2015/ShivanReef.java
index 1e929b7036..94143e4df9 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ShivanReef.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ShivanReef.java
@@ -37,7 +37,7 @@ public class ShivanReef extends mage.sets.apocalypse.ShivanReef {
 
     public ShivanReef(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/magic2015/ShrapnelBlast.java
index 0a69f5e409..a07e24170c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ShrapnelBlast.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ShrapnelBlast.java
@@ -39,7 +39,7 @@ public class ShrapnelBlast extends mage.sets.mirrodin.ShrapnelBlast {
     public ShrapnelBlast(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java b/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
index add71d0579..ee6293ef4a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
@@ -37,7 +37,7 @@ public class SiegeWurm extends mage.sets.ravnica.SiegeWurm {
 
     public SiegeWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2015/SignInBlood.java
index 9ca7f10d24..c865a781ff 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2015/SolemnOffering.java
index 203bd4b136..19efc09f5a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SolemnOffering.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SolemnOffering.java
@@ -37,7 +37,7 @@ public class SolemnOffering extends mage.sets.magic2010.SolemnOffering {
 
     public SolemnOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Soulmender.java b/Mage.Sets/src/mage/sets/magic2015/Soulmender.java
index 5b5ae9e8e3..41d15fa781 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Soulmender.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Soulmender.java
@@ -37,7 +37,7 @@ public class Soulmender extends mage.sets.magic2014.Soulmender {
 
     public Soulmender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StabWound.java b/Mage.Sets/src/mage/sets/magic2015/StabWound.java
index 137024e3e1..40e28b02dd 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StabWound.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StabWound.java
@@ -39,7 +39,7 @@ public class StabWound extends mage.sets.returntoravnica.StabWound {
     public StabWound(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheDeathMagus.java b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheDeathMagus.java
index 2f546bec15..1b01c7373f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheDeathMagus.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheDeathMagus.java
@@ -39,7 +39,7 @@ public class StaffOfTheDeathMagus extends mage.sets.magic2014.StaffOfTheDeathMag
     public StaffOfTheDeathMagus(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheFlameMagus.java b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheFlameMagus.java
index ad3064c7bc..db194fd315 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheFlameMagus.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheFlameMagus.java
@@ -39,7 +39,7 @@ public class StaffOfTheFlameMagus extends mage.sets.magic2014.StaffOfTheFlameMag
     public StaffOfTheFlameMagus(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheMindMagus.java b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheMindMagus.java
index 184c5ca0ba..2a16253b59 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheMindMagus.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheMindMagus.java
@@ -39,7 +39,7 @@ public class StaffOfTheMindMagus extends mage.sets.magic2014.StaffOfTheMindMagus
     public StaffOfTheMindMagus(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheSunMagus.java b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheSunMagus.java
index 64a5ac3d7f..896bb2f58a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheSunMagus.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheSunMagus.java
@@ -39,7 +39,7 @@ public class StaffOfTheSunMagus extends mage.sets.magic2014.StaffOfTheSunMagus {
     public StaffOfTheSunMagus(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheWildMagus.java b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheWildMagus.java
index 38cf50949f..1d0afd9ab2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StaffOfTheWildMagus.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StaffOfTheWildMagus.java
@@ -39,7 +39,7 @@ public class StaffOfTheWildMagus extends mage.sets.magic2014.StaffOfTheWildMagus
     public StaffOfTheWildMagus(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StormtideLeviathan.java b/Mage.Sets/src/mage/sets/magic2015/StormtideLeviathan.java
index 3a1f2df548..1e34edcee3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StormtideLeviathan.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StormtideLeviathan.java
@@ -37,7 +37,7 @@ public class StormtideLeviathan extends mage.sets.magic2011.StormtideLeviathan {
 
     public StormtideLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TerraStomper.java b/Mage.Sets/src/mage/sets/magic2015/TerraStomper.java
index f90c9c5b47..b46bbcaaf2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TerraStomper.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TerraStomper.java
@@ -37,7 +37,7 @@ public class TerraStomper extends mage.sets.zendikar.TerraStomper {
 
     public TerraStomper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ThunderingGiant.java b/Mage.Sets/src/mage/sets/magic2015/ThunderingGiant.java
index 8930336425..04ba7e1f32 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ThunderingGiant.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ThunderingGiant.java
@@ -38,7 +38,7 @@ public class ThunderingGiant extends mage.sets.tenthedition.ThunderingGiant {
 
     public ThunderingGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java b/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java
index 9cb6174216..434b8869f8 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java
@@ -37,7 +37,7 @@ public class TirelessMissionaries extends mage.sets.magic2011.TirelessMissionari
 
     public TirelessMissionaries(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TitanicGrowth.java b/Mage.Sets/src/mage/sets/magic2015/TitanicGrowth.java
index d7f753093b..9e46b79899 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TitanicGrowth.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TitanicGrowth.java
@@ -37,7 +37,7 @@ public class TitanicGrowth extends mage.sets.magic2012.TitanicGrowth {
 
     public TitanicGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java b/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java
index 2caee91b7d..4513b3527e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java
@@ -37,7 +37,7 @@ public class TorchFiend extends mage.sets.darkascension.TorchFiend {
 
     public TorchFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TormodsCrypt.java b/Mage.Sets/src/mage/sets/magic2015/TormodsCrypt.java
index 81695a5945..7295b75178 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TormodsCrypt.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TormodsCrypt.java
@@ -38,7 +38,7 @@ public class TormodsCrypt extends mage.sets.timeshifted.TormodsCrypt {
 
     public TormodsCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java b/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java
index 5468b1fa20..3a71c4955c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java
@@ -39,7 +39,7 @@ public class TurnToFrog extends mage.sets.magic2012.TurnToFrog {
     public TurnToFrog(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TyphoidRats.java b/Mage.Sets/src/mage/sets/magic2015/TyphoidRats.java
index b1bf069e6b..9c2101091f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TyphoidRats.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TyphoidRats.java
@@ -37,7 +37,7 @@ public class TyphoidRats extends mage.sets.innistrad.TyphoidRats {
 
     public TyphoidRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/UrborgTombOfYawgmoth.java b/Mage.Sets/src/mage/sets/magic2015/UrborgTombOfYawgmoth.java
index aa0733b513..e7687efe61 100644
--- a/Mage.Sets/src/mage/sets/magic2015/UrborgTombOfYawgmoth.java
+++ b/Mage.Sets/src/mage/sets/magic2015/UrborgTombOfYawgmoth.java
@@ -37,7 +37,7 @@ public class UrborgTombOfYawgmoth extends mage.sets.planarchaos.UrborgTombOfYawg
 
     public UrborgTombOfYawgmoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/VerdantHaven.java b/Mage.Sets/src/mage/sets/magic2015/VerdantHaven.java
index 8690c7c29c..50bcb4af62 100644
--- a/Mage.Sets/src/mage/sets/magic2015/VerdantHaven.java
+++ b/Mage.Sets/src/mage/sets/magic2015/VerdantHaven.java
@@ -37,7 +37,7 @@ public class VerdantHaven extends mage.sets.gatecrash.VerdantHaven {
 
     public VerdantHaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/WalkingCorpse.java b/Mage.Sets/src/mage/sets/magic2015/WalkingCorpse.java
index f11908c57d..49b39a0a0d 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WalkingCorpse.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WalkingCorpse.java
@@ -37,7 +37,7 @@ public class WalkingCorpse extends mage.sets.innistrad.WalkingCorpse {
 
     public WalkingCorpse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfEssence.java b/Mage.Sets/src/mage/sets/magic2015/WallOfEssence.java
index 643d69b1b5..9ac34fe8c6 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WallOfEssence.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WallOfEssence.java
@@ -37,7 +37,7 @@ public class WallOfEssence extends mage.sets.stronghold.WallOfEssence {
 
     public WallOfEssence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfFire.java b/Mage.Sets/src/mage/sets/magic2015/WallOfFire.java
index ee8f6f194e..fdc94c1c75 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WallOfFire.java
@@ -38,7 +38,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java
index cb280c4e6f..7b5e131733 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java
@@ -39,7 +39,7 @@ public class WallOfFrost extends mage.sets.magic2010.WallOfFrost {
     public WallOfFrost(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java b/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java
index 77d99a5e30..f67e80ceee 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java
@@ -39,7 +39,7 @@ public class WallOfMulch extends mage.sets.onslaught.WallOfMulch {
     public WallOfMulch(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/WelkinTern.java b/Mage.Sets/src/mage/sets/magic2015/WelkinTern.java
index 37d3a59047..2b343dbe5e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WelkinTern.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WelkinTern.java
@@ -37,7 +37,7 @@ public class WelkinTern extends mage.sets.zendikar.WelkinTern {
 
     public WelkinTern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/YavimayaCoast.java b/Mage.Sets/src/mage/sets/magic2015/YavimayaCoast.java
index 6263090e8f..39320fc1c3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/YavimayaCoast.java
+++ b/Mage.Sets/src/mage/sets/magic2015/YavimayaCoast.java
@@ -37,7 +37,7 @@ public class YavimayaCoast extends mage.sets.apocalypse.YavimayaCoast {
 
     public YavimayaCoast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ZofShade.java b/Mage.Sets/src/mage/sets/magic2015/ZofShade.java
index 6610a15ad3..a76d9782b9 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ZofShade.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ZofShade.java
@@ -37,7 +37,7 @@ public class ZofShade extends mage.sets.riseoftheeldrazi.ZofShade {
 
     public ZofShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ActOfTreason.java b/Mage.Sets/src/mage/sets/magicorigins/ActOfTreason.java
index 2f052678a7..1d98094125 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ActOfTreason.java
@@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/AegisAngel.java b/Mage.Sets/src/mage/sets/magicorigins/AegisAngel.java
index 14eb572245..488ba66cf5 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/AegisAngel.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/AegisAngel.java
@@ -37,7 +37,7 @@ public class AegisAngel extends mage.sets.magic2012.AegisAngel {
 
     public AegisAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/AngelsTomb.java b/Mage.Sets/src/mage/sets/magicorigins/AngelsTomb.java
index f396bccc0d..bdbc891e88 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/AngelsTomb.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/AngelsTomb.java
@@ -37,7 +37,7 @@ public class AngelsTomb extends mage.sets.avacynrestored.AngelsTomb {
 
     public AngelsTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Auramancer.java b/Mage.Sets/src/mage/sets/magicorigins/Auramancer.java
index 9c745f50a2..ac19971f99 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Auramancer.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Auramancer.java
@@ -37,7 +37,7 @@ public class Auramancer extends mage.sets.magic2012.Auramancer {
 
     public Auramancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BattlefieldForge.java b/Mage.Sets/src/mage/sets/magicorigins/BattlefieldForge.java
index bfeaebc725..b4467210b3 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/BattlefieldForge.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/BattlefieldForge.java
@@ -37,7 +37,7 @@ public class BattlefieldForge extends mage.sets.apocalypse.BattlefieldForge {
 
     public BattlefieldForge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BellowsLizard.java b/Mage.Sets/src/mage/sets/magicorigins/BellowsLizard.java
index d3c5b9b0da..b8a740b79a 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/BellowsLizard.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/BellowsLizard.java
@@ -37,7 +37,7 @@ public class BellowsLizard extends mage.sets.returntoravnica.BellowsLizard {
 
     public BellowsLizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java b/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java
index 9d9e818aef..11993fe529 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java
@@ -37,7 +37,7 @@ public class Blightcaster extends mage.sets.magic2014.Blightcaster {
 
     public Blightcaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BoneToAsh.java b/Mage.Sets/src/mage/sets/magicorigins/BoneToAsh.java
index a6651a364a..a332598a98 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/BoneToAsh.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/BoneToAsh.java
@@ -37,7 +37,7 @@ public class BoneToAsh extends mage.sets.darkascension.BoneToAsh {
 
     public BoneToAsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BrawlersPlate.java b/Mage.Sets/src/mage/sets/magicorigins/BrawlersPlate.java
index f9799a426d..608f519537 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/BrawlersPlate.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/BrawlersPlate.java
@@ -37,7 +37,7 @@ public class BrawlersPlate extends mage.sets.magic2015.BrawlersPlate {
 
     public BrawlersPlate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/CatacombSlug.java b/Mage.Sets/src/mage/sets/magicorigins/CatacombSlug.java
index a4bde24ec4..13f40fcaf4 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/CatacombSlug.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/CatacombSlug.java
@@ -37,7 +37,7 @@ public class CatacombSlug extends mage.sets.returntoravnica.CatacombSlug {
 
     public CatacombSlug(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/CavesOfKoilos.java b/Mage.Sets/src/mage/sets/magicorigins/CavesOfKoilos.java
index d88b5f5448..ae3d55c587 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/CavesOfKoilos.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/CavesOfKoilos.java
@@ -37,7 +37,7 @@ public class CavesOfKoilos extends mage.sets.apocalypse.CavesOfKoilos {
 
     public CavesOfKoilos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/CelestialFlare.java b/Mage.Sets/src/mage/sets/magicorigins/CelestialFlare.java
index bece532069..8dbad79897 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/CelestialFlare.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/CelestialFlare.java
@@ -37,7 +37,7 @@ public class CelestialFlare extends mage.sets.magic2014.CelestialFlare {
 
     public CelestialFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ChandrasFury.java b/Mage.Sets/src/mage/sets/magicorigins/ChandrasFury.java
index 584e50a884..9b92e216e5 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ChandrasFury.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ChandrasFury.java
@@ -37,7 +37,7 @@ public class ChandrasFury extends mage.sets.magic2013.ChandrasFury {
 
     public ChandrasFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ChargingGriffin.java b/Mage.Sets/src/mage/sets/magicorigins/ChargingGriffin.java
index f33c54091d..fb167df06a 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ChargingGriffin.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ChargingGriffin.java
@@ -37,7 +37,7 @@ public class ChargingGriffin extends mage.sets.magic2014.ChargingGriffin {
 
     public ChargingGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Claustrophobia.java b/Mage.Sets/src/mage/sets/magicorigins/Claustrophobia.java
index 980a3d777f..573e5d342a 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Claustrophobia.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Claustrophobia.java
@@ -37,7 +37,7 @@ public class Claustrophobia extends mage.sets.innistrad.Claustrophobia {
 
     public Claustrophobia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Cobblebrute.java b/Mage.Sets/src/mage/sets/magicorigins/Cobblebrute.java
index a701ed49ed..22909405ab 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Cobblebrute.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Cobblebrute.java
@@ -37,7 +37,7 @@ public class Cobblebrute extends mage.sets.returntoravnica.Cobblebrute {
 
     public Cobblebrute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/CruelRevival.java b/Mage.Sets/src/mage/sets/magicorigins/CruelRevival.java
index 99ae44297e..3e79b6956d 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/CruelRevival.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/CruelRevival.java
@@ -39,7 +39,7 @@ public class CruelRevival extends mage.sets.onslaught.CruelRevival {
     public CruelRevival(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Demolish.java b/Mage.Sets/src/mage/sets/magicorigins/Demolish.java
index befe051f75..962beb4134 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Demolish.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Demolish.java
@@ -37,7 +37,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Disperse.java b/Mage.Sets/src/mage/sets/magicorigins/Disperse.java
index b017ea9a3a..220a99e768 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Disperse.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Disperse.java
@@ -37,7 +37,7 @@ public class Disperse extends mage.sets.scarsofmirrodin.Disperse {
 
     public Disperse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/DivineVerdict.java b/Mage.Sets/src/mage/sets/magicorigins/DivineVerdict.java
index aea2c673d7..2506b62515 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/DivineVerdict.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/DivineVerdict.java
@@ -37,7 +37,7 @@ public class DivineVerdict extends mage.sets.magic2010.DivineVerdict {
 
     public DivineVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/DragonFodder.java b/Mage.Sets/src/mage/sets/magicorigins/DragonFodder.java
index f25053d379..91179a1407 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/DragonFodder.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/DragonFodder.java
@@ -37,7 +37,7 @@ public class DragonFodder extends mage.sets.shardsofalara.DragonFodder {
 
     public DragonFodder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Dreadwaters.java b/Mage.Sets/src/mage/sets/magicorigins/Dreadwaters.java
index ebf064c883..c4afdf2c04 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Dreadwaters.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Dreadwaters.java
@@ -37,7 +37,7 @@ public class Dreadwaters extends mage.sets.avacynrestored.Dreadwaters {
 
     public Dreadwaters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ElvishVisionary.java b/Mage.Sets/src/mage/sets/magicorigins/ElvishVisionary.java
index 90760ea95d..4607b5bc7b 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ElvishVisionary.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ElvishVisionary.java
@@ -37,7 +37,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
 
     public ElvishVisionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/EvolvingWilds.java b/Mage.Sets/src/mage/sets/magicorigins/EvolvingWilds.java
index f2a078bbcd..efd90e212c 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/FieryConclusion.java b/Mage.Sets/src/mage/sets/magicorigins/FieryConclusion.java
index 39b2154763..58c7d0b310 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/FieryConclusion.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/FieryConclusion.java
@@ -38,7 +38,7 @@ public class FieryConclusion extends mage.sets.ravnica.FieryConclusion {
 
     public FieryConclusion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/FieryHellhound.java b/Mage.Sets/src/mage/sets/magicorigins/FieryHellhound.java
index 2d5b12f3ee..34700b9527 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/FieryHellhound.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/FieryHellhound.java
@@ -37,7 +37,7 @@ public class FieryHellhound extends mage.sets.magic2010.FieryHellhound {
 
     public FieryHellhound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/FleshToDust.java b/Mage.Sets/src/mage/sets/magicorigins/FleshToDust.java
index 9990fbeb04..86ebe41700 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/FleshToDust.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/FleshToDust.java
@@ -37,7 +37,7 @@ public class FleshToDust extends mage.sets.magic2015.FleshToDust {
 
     public FleshToDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java
index 09748f16d1..a5dcbba5fb 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java
@@ -37,7 +37,7 @@ public class FleshbagMarauder extends mage.sets.shardsofalara.FleshbagMarauder {
 
     public FleshbagMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/GaeasRevenge.java b/Mage.Sets/src/mage/sets/magicorigins/GaeasRevenge.java
index 4738c7ff0f..8971c98826 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/GaeasRevenge.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/GaeasRevenge.java
@@ -38,7 +38,7 @@ public class GaeasRevenge extends mage.sets.magic2011.GaeasRevenge {
 
     public GaeasRevenge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/magicorigins/GoblinPiledriver.java
index 0cffc1fb8f..aecc447b21 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/GoblinPiledriver.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/GoblinPiledriver.java
@@ -37,7 +37,7 @@ public class GoblinPiledriver extends mage.sets.onslaught.GoblinPiledriver {
 
     public GoblinPiledriver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/GoldForgedSentinel.java b/Mage.Sets/src/mage/sets/magicorigins/GoldForgedSentinel.java
index 720ea6a780..f507a3d58a 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/GoldForgedSentinel.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/GoldForgedSentinel.java
@@ -37,7 +37,7 @@ public class GoldForgedSentinel extends mage.sets.journeyintonyx.GoldForgedSenti
 
     public GoldForgedSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/GuardiansOfMeletis.java b/Mage.Sets/src/mage/sets/magicorigins/GuardiansOfMeletis.java
index 0a83a9a017..8eb7ba6912 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/GuardiansOfMeletis.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/GuardiansOfMeletis.java
@@ -37,7 +37,7 @@ public class GuardiansOfMeletis extends mage.sets.theros.GuardiansOfMeletis {
 
     public GuardiansOfMeletis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/IntoTheVoid.java b/Mage.Sets/src/mage/sets/magicorigins/IntoTheVoid.java
index f84e4a8621..8948d23944 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/IntoTheVoid.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/IntoTheVoid.java
@@ -37,7 +37,7 @@ public class IntoTheVoid extends mage.sets.avacynrestored.IntoTheVoid {
 
     public IntoTheVoid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/JayemdaeTome.java b/Mage.Sets/src/mage/sets/magicorigins/JayemdaeTome.java
index 3d9276bee7..8098bd93dd 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/JayemdaeTome.java
@@ -38,7 +38,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/KnightOfTheWhiteOrchid.java b/Mage.Sets/src/mage/sets/magicorigins/KnightOfTheWhiteOrchid.java
index 75952b92da..43de2e3b7f 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/KnightOfTheWhiteOrchid.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/KnightOfTheWhiteOrchid.java
@@ -37,7 +37,7 @@ public class KnightOfTheWhiteOrchid extends mage.sets.shardsofalara.KnightOfTheW
 
     public KnightOfTheWhiteOrchid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/KnightlyValor.java b/Mage.Sets/src/mage/sets/magicorigins/KnightlyValor.java
index a4f142eca4..4a9eb2b0be 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/KnightlyValor.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/KnightlyValor.java
@@ -38,7 +38,7 @@ public class KnightlyValor extends mage.sets.returntoravnica.KnightlyValor {
 
     public KnightlyValor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/LeafGilder.java b/Mage.Sets/src/mage/sets/magicorigins/LeafGilder.java
index 8e52ca290d..82c016d8d2 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/LeafGilder.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/LeafGilder.java
@@ -37,7 +37,7 @@ public class LeafGilder extends mage.sets.lorwyn.LeafGilder {
 
     public LeafGilder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/LlanowarEmpath.java b/Mage.Sets/src/mage/sets/magicorigins/LlanowarEmpath.java
index 5690532be5..1b97c2827d 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/LlanowarEmpath.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/LlanowarEmpath.java
@@ -37,7 +37,7 @@ public class LlanowarEmpath extends mage.sets.futuresight.LlanowarEmpath {
 
     public LlanowarEmpath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/LlanowarWastes.java b/Mage.Sets/src/mage/sets/magicorigins/LlanowarWastes.java
index 74a997f25b..69f96a09f7 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/LlanowarWastes.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/LlanowarWastes.java
@@ -37,7 +37,7 @@ public class LlanowarWastes extends mage.sets.apocalypse.LlanowarWastes {
 
     public LlanowarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/magicorigins/MahamotiDjinn.java
index 8a00bacddf..d90a4fe327 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MaritimeGuard.java b/Mage.Sets/src/mage/sets/magicorigins/MaritimeGuard.java
index c3ced1cd74..5cf84138bf 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/MaritimeGuard.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/MaritimeGuard.java
@@ -37,7 +37,7 @@ public class MaritimeGuard extends mage.sets.magic2011.MaritimeGuard {
 
     public MaritimeGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Meteorite.java b/Mage.Sets/src/mage/sets/magicorigins/Meteorite.java
index 70d7746d47..18f2159bd9 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Meteorite.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Meteorite.java
@@ -37,7 +37,7 @@ public class Meteorite extends mage.sets.magic2015.Meteorite {
 
     public Meteorite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MightOfTheMasses.java b/Mage.Sets/src/mage/sets/magicorigins/MightOfTheMasses.java
index 432f4844b1..8134698769 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/MightOfTheMasses.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/MightOfTheMasses.java
@@ -37,7 +37,7 @@ public class MightOfTheMasses extends mage.sets.riseoftheeldrazi.MightOfTheMasse
 
     public MightOfTheMasses(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MightyLeap.java b/Mage.Sets/src/mage/sets/magicorigins/MightyLeap.java
index db8d284578..fa0e6362e5 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/MightyLeap.java
@@ -37,7 +37,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MindRot.java b/Mage.Sets/src/mage/sets/magicorigins/MindRot.java
index 38935bd7e5..c62a706f0f 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/MindRot.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MurderInvestigation.java b/Mage.Sets/src/mage/sets/magicorigins/MurderInvestigation.java
index feaefc63bc..59103104c0 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/MurderInvestigation.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/MurderInvestigation.java
@@ -37,7 +37,7 @@ public class MurderInvestigation extends mage.sets.gatecrash.MurderInvestigation
 
     public MurderInvestigation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/NantukoHusk.java b/Mage.Sets/src/mage/sets/magicorigins/NantukoHusk.java
index d28c30a8f5..c23c9186fc 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/NantukoHusk.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/NantukoHusk.java
@@ -38,7 +38,7 @@ public class NantukoHusk extends mage.sets.tenthedition.NantukoHusk {
 
     public NantukoHusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Negate.java b/Mage.Sets/src/mage/sets/magicorigins/Negate.java
index 0a985ce7e1..0d74de842c 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Negate.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Nightmare.java b/Mage.Sets/src/mage/sets/magicorigins/Nightmare.java
index e52910b016..d78e7ada95 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/OrchardSpirit.java b/Mage.Sets/src/mage/sets/magicorigins/OrchardSpirit.java
index 3824427ebd..5cbb82ac49 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/OrchardSpirit.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/OrchardSpirit.java
@@ -37,7 +37,7 @@ public class OrchardSpirit extends mage.sets.innistrad.OrchardSpirit {
 
     public OrchardSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Plummet.java b/Mage.Sets/src/mage/sets/magicorigins/Plummet.java
index 1e2e373dcc..d9b4f61fef 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Plummet.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magicorigins/PrizedUnicorn.java
index 5c4adcd601..6f25169856 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/PrizedUnicorn.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/PrizedUnicorn.java
@@ -37,7 +37,7 @@ public class PrizedUnicorn extends mage.sets.magic2010.PrizedUnicorn {
 
     public PrizedUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ReadTheBones.java b/Mage.Sets/src/mage/sets/magicorigins/ReadTheBones.java
index 4f5beac217..bffff8fad4 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ReadTheBones.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ReadTheBones.java
@@ -37,7 +37,7 @@ public class ReadTheBones extends mage.sets.theros.ReadTheBones {
 
     public ReadTheBones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Reclaim.java b/Mage.Sets/src/mage/sets/magicorigins/Reclaim.java
index ad9988f6b5..684d553e00 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Reclaim.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Reclaim.java
@@ -37,7 +37,7 @@ public class Reclaim extends mage.sets.magic2012.Reclaim {
 
     public Reclaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ReturnedCentaur.java b/Mage.Sets/src/mage/sets/magicorigins/ReturnedCentaur.java
index 73dbab5276..ab913c89ef 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ReturnedCentaur.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ReturnedCentaur.java
@@ -37,7 +37,7 @@ public class ReturnedCentaur extends mage.sets.theros.ReturnedCentaur {
 
     public ReturnedCentaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Revenant.java b/Mage.Sets/src/mage/sets/magicorigins/Revenant.java
index fe75b2ed18..8e9fa51096 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Revenant.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Revenant.java
@@ -37,7 +37,7 @@ public class Revenant extends mage.sets.tempestremastered.Revenant {
 
     public Revenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/RoguesPassage.java b/Mage.Sets/src/mage/sets/magicorigins/RoguesPassage.java
index c46ef9c3b5..d2e2e5af5c 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/RoguesPassage.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/RoguesPassage.java
@@ -37,7 +37,7 @@ public class RoguesPassage extends mage.sets.returntoravnica.RoguesPassage {
 
     public RoguesPassage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/RunedServitor.java b/Mage.Sets/src/mage/sets/magicorigins/RunedServitor.java
index 0dcc1df24c..761b457640 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/RunedServitor.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/RunedServitor.java
@@ -37,7 +37,7 @@ public class RunedServitor extends mage.sets.riseoftheeldrazi.RunedServitor {
 
     public RunedServitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ScrapskinDrake.java b/Mage.Sets/src/mage/sets/magicorigins/ScrapskinDrake.java
index 4ece0b9375..48ed8acac3 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ScrapskinDrake.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ScrapskinDrake.java
@@ -37,7 +37,7 @@ public class ScrapskinDrake extends mage.sets.avacynrestored.ScrapskinDrake {
 
     public ScrapskinDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ScreechingSkaab.java b/Mage.Sets/src/mage/sets/magicorigins/ScreechingSkaab.java
index 11008c9e25..db8d2117a8 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ScreechingSkaab.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ScreechingSkaab.java
@@ -37,7 +37,7 @@ public class ScreechingSkaab extends mage.sets.darkascension.ScreechingSkaab {
 
     public ScreechingSkaab(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SengirVampire.java b/Mage.Sets/src/mage/sets/magicorigins/SengirVampire.java
index ef413bd70c..6f158d19e5 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SerraAngel.java b/Mage.Sets/src/mage/sets/magicorigins/SerraAngel.java
index 31a4d846bf..81856b8e61 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ShivanDragon.java b/Mage.Sets/src/mage/sets/magicorigins/ShivanDragon.java
index e49d2afd69..80fd40da5a 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ShivanReef.java b/Mage.Sets/src/mage/sets/magicorigins/ShivanReef.java
index c35dfb1fa5..d7a6f7ac62 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ShivanReef.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ShivanReef.java
@@ -37,7 +37,7 @@ public class ShivanReef extends mage.sets.apocalypse.ShivanReef {
 
     public ShivanReef(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/magicorigins/SigilOfTheEmptyThrone.java
index ffaace95ee..20b7f79cf3 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SigilOfTheEmptyThrone.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SigilOfTheEmptyThrone.java
@@ -37,7 +37,7 @@ public class SigilOfTheEmptyThrone extends mage.sets.conflux.SigilOfTheEmptyThro
 
     public SigilOfTheEmptyThrone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SigiledStarfish.java b/Mage.Sets/src/mage/sets/magicorigins/SigiledStarfish.java
index f1275a2c8c..ad7264c656 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SigiledStarfish.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SigiledStarfish.java
@@ -38,7 +38,7 @@ public class SigiledStarfish extends mage.sets.journeyintonyx.SigiledStarfish {
 
     public SigiledStarfish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SkaabGoliath.java b/Mage.Sets/src/mage/sets/magicorigins/SkaabGoliath.java
index 84e67a8f63..8a537dbeda 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SkaabGoliath.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SkaabGoliath.java
@@ -37,7 +37,7 @@ public class SkaabGoliath extends mage.sets.innistrad.SkaabGoliath {
 
     public SkaabGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SmashToSmithereens.java b/Mage.Sets/src/mage/sets/magicorigins/SmashToSmithereens.java
index ff4d5d7721..b553627403 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SmashToSmithereens.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SmashToSmithereens.java
@@ -37,7 +37,7 @@ public class SmashToSmithereens extends mage.sets.shadowmoor.SmashToSmithereens
 
     public SmashToSmithereens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/StratusWalk.java b/Mage.Sets/src/mage/sets/magicorigins/StratusWalk.java
index f8e8b6b7b2..d2319dc4ae 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/StratusWalk.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/StratusWalk.java
@@ -37,7 +37,7 @@ public class StratusWalk extends mage.sets.bornofthegods.StratusWalk {
 
     public StratusWalk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SylvanMessenger.java b/Mage.Sets/src/mage/sets/magicorigins/SylvanMessenger.java
index d20d231068..7dd541b9cd 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/SylvanMessenger.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/SylvanMessenger.java
@@ -37,7 +37,7 @@ public class SylvanMessenger extends mage.sets.apocalypse.SylvanMessenger {
 
     public SylvanMessenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TerraStomper.java b/Mage.Sets/src/mage/sets/magicorigins/TerraStomper.java
index 6ace0be841..ec3dbe6dd3 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TerraStomper.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TerraStomper.java
@@ -37,7 +37,7 @@ public class TerraStomper extends mage.sets.zendikar.TerraStomper {
 
     public TerraStomper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TimberpackWolf.java b/Mage.Sets/src/mage/sets/magicorigins/TimberpackWolf.java
index f0b6523cae..561114c724 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TimberpackWolf.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TimberpackWolf.java
@@ -37,7 +37,7 @@ public class TimberpackWolf extends mage.sets.magic2013.TimberpackWolf {
 
     public TimberpackWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TitanicGrowth.java b/Mage.Sets/src/mage/sets/magicorigins/TitanicGrowth.java
index d28ef6aac6..8b963bdc97 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TitanicGrowth.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TitanicGrowth.java
@@ -37,7 +37,7 @@ public class TitanicGrowth extends mage.sets.magic2012.TitanicGrowth {
 
     public TitanicGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TitansStrength.java b/Mage.Sets/src/mage/sets/magicorigins/TitansStrength.java
index c0271e51b7..9499695f6b 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TitansStrength.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TitansStrength.java
@@ -37,7 +37,7 @@ public class TitansStrength extends mage.sets.theros.TitansStrength {
 
     public TitansStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TormentedThoughts.java b/Mage.Sets/src/mage/sets/magicorigins/TormentedThoughts.java
index 3aea38c456..19659117e5 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TormentedThoughts.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TormentedThoughts.java
@@ -37,7 +37,7 @@ public class TormentedThoughts extends mage.sets.journeyintonyx.TormentedThought
 
     public TormentedThoughts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TotemGuideHartebeest.java b/Mage.Sets/src/mage/sets/magicorigins/TotemGuideHartebeest.java
index 80cd703bc3..85ace6fd10 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TotemGuideHartebeest.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TotemGuideHartebeest.java
@@ -38,7 +38,7 @@ public class TotemGuideHartebeest extends mage.sets.riseoftheeldrazi.TotemGuideH
 
     public TotemGuideHartebeest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "ORI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TowerGeist.java b/Mage.Sets/src/mage/sets/magicorigins/TowerGeist.java
index e73ff57866..19bbc88d97 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TowerGeist.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TowerGeist.java
@@ -37,7 +37,7 @@ public class TowerGeist extends mage.sets.darkascension.TowerGeist {
 
     public TowerGeist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/TurnToFrog.java b/Mage.Sets/src/mage/sets/magicorigins/TurnToFrog.java
index f54c723335..7b3dc852c4 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TurnToFrog.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TurnToFrog.java
@@ -37,7 +37,7 @@ public class TurnToFrog extends mage.sets.magic2012.TurnToFrog {
 
     public TurnToFrog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/VastwoodGorger.java b/Mage.Sets/src/mage/sets/magicorigins/VastwoodGorger.java
index c2076759a5..71cda0de08 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/VastwoodGorger.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/VastwoodGorger.java
@@ -37,7 +37,7 @@ public class VastwoodGorger extends mage.sets.zendikar.VastwoodGorger {
 
     public VastwoodGorger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Watercourser.java b/Mage.Sets/src/mage/sets/magicorigins/Watercourser.java
index 8a050aabc5..b272282ce0 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/Watercourser.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/Watercourser.java
@@ -37,7 +37,7 @@ public class Watercourser extends mage.sets.magic2013.Watercourser {
 
     public Watercourser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/WeaveFate.java b/Mage.Sets/src/mage/sets/magicorigins/WeaveFate.java
index 3b746b7c4e..2ebd08a69b 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/WeaveFate.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/WeaveFate.java
@@ -37,7 +37,7 @@ public class WeaveFate extends mage.sets.khansoftarkir.WeaveFate {
 
     public WeaveFate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/WeightOfTheUnderworld.java b/Mage.Sets/src/mage/sets/magicorigins/WeightOfTheUnderworld.java
index 5a75c41873..2276c08c9b 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/WeightOfTheUnderworld.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/WeightOfTheUnderworld.java
@@ -37,7 +37,7 @@ public class WeightOfTheUnderworld extends mage.sets.bornofthegods.WeightOfTheUn
 
     public WeightOfTheUnderworld(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/YavimayaCoast.java b/Mage.Sets/src/mage/sets/magicorigins/YavimayaCoast.java
index 2775603052..e1de820d67 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/YavimayaCoast.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/YavimayaCoast.java
@@ -37,7 +37,7 @@ public class YavimayaCoast extends mage.sets.apocalypse.YavimayaCoast {
 
     public YavimayaCoast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/YevasForcemage.java b/Mage.Sets/src/mage/sets/magicorigins/YevasForcemage.java
index efa8f05185..4f6e53049b 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/YevasForcemage.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/YevasForcemage.java
@@ -37,7 +37,7 @@ public class YevasForcemage extends mage.sets.magic2013.YevasForcemage {
 
     public YevasForcemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicorigins/YokedOx.java b/Mage.Sets/src/mage/sets/magicorigins/YokedOx.java
index 355f303de8..780b22bbff 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/YokedOx.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/YokedOx.java
@@ -37,7 +37,7 @@ public class YokedOx extends mage.sets.theros.YokedOx {
 
     public YokedOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ORI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/BituminousBlast.java b/Mage.Sets/src/mage/sets/magicplayerrewards/BituminousBlast.java
index d7a9465999..8ad072c17b 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/BituminousBlast.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/BituminousBlast.java
@@ -38,7 +38,7 @@ public class BituminousBlast extends mage.sets.alarareborn.BituminousBlast {
 
     public BituminousBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Blightning.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Blightning.java
index a058617c38..81f3a40917 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Blightning.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Blightning.java
@@ -38,7 +38,7 @@ public class Blightning extends mage.sets.shardsofalara.Blightning {
 
     public Blightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/BraveTheElements.java b/Mage.Sets/src/mage/sets/magicplayerrewards/BraveTheElements.java
index 3f79596850..1975af7216 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/BraveTheElements.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/BraveTheElements.java
@@ -38,7 +38,7 @@ public class BraveTheElements extends mage.sets.zendikar.BraveTheElements {
 
     public BraveTheElements(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/BurstLightning.java b/Mage.Sets/src/mage/sets/magicplayerrewards/BurstLightning.java
index 7b85d09fc2..0460abd440 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/BurstLightning.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/BurstLightning.java
@@ -38,7 +38,7 @@ public class BurstLightning extends mage.sets.zendikar.BurstLightning {
 
     public BurstLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Cancel.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Cancel.java
index e3092f12da..c5882fa143 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Cancel.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Cancel.java
@@ -38,7 +38,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/CelestialPurge.java b/Mage.Sets/src/mage/sets/magicplayerrewards/CelestialPurge.java
index 329f71fbf4..536d4e42cd 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/CelestialPurge.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/CelestialPurge.java
@@ -38,7 +38,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge {
 
     public CelestialPurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Condemn.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Condemn.java
index 6ea7264f99..ac5dac682b 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Condemn.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Condemn.java
@@ -38,7 +38,7 @@ public class Condemn extends mage.sets.tenthedition.Condemn {
 
     public Condemn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Corrupt.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Corrupt.java
index 4833af61ee..d8877324df 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Corrupt.java
@@ -38,7 +38,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/CruelEdict.java b/Mage.Sets/src/mage/sets/magicplayerrewards/CruelEdict.java
index 8bda48ff9d..a1c5add24e 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/CruelEdict.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/CruelEdict.java
@@ -38,7 +38,7 @@ public class CruelEdict extends mage.sets.tenthedition.CruelEdict {
 
     public CruelEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/CrypticCommand.java b/Mage.Sets/src/mage/sets/magicplayerrewards/CrypticCommand.java
index 523f220ace..c4fd7f20b9 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/CrypticCommand.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/CrypticCommand.java
@@ -38,7 +38,7 @@ public class CrypticCommand extends mage.sets.lorwyn.CrypticCommand {
 
     public CrypticCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Damnation.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Damnation.java
index 470bea4e01..1eac2a05b7 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Damnation.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Damnation.java
@@ -38,7 +38,7 @@ public class Damnation extends mage.sets.planarchaos.Damnation {
 
     public Damnation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/DayOfJudgment.java b/Mage.Sets/src/mage/sets/magicplayerrewards/DayOfJudgment.java
index 40d219e21f..f33ff37b37 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/DayOfJudgment.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/DayOfJudgment.java
@@ -38,7 +38,7 @@ public class DayOfJudgment extends mage.sets.zendikar.DayOfJudgment {
 
     public DayOfJudgment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Disenchant.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Disenchant.java
index 73e3676dc8..f72e1b5f14 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Disenchant.java
@@ -38,7 +38,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/DoomBlade.java b/Mage.Sets/src/mage/sets/magicplayerrewards/DoomBlade.java
index ecad9059d5..6ef2b710bf 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/DoomBlade.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/DoomBlade.java
@@ -38,7 +38,7 @@ public class DoomBlade extends mage.sets.magic2010.DoomBlade {
 
     public DoomBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Fireball.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Fireball.java
index 64f1003b7e..eda0ba1cef 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Fireball.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/FlameJavelin.java b/Mage.Sets/src/mage/sets/magicplayerrewards/FlameJavelin.java
index b1c04e6a67..da403e61c0 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/FlameJavelin.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/FlameJavelin.java
@@ -38,7 +38,7 @@ public class FlameJavelin extends mage.sets.shadowmoor.FlameJavelin {
 
     public FlameJavelin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/GiantGrowth.java b/Mage.Sets/src/mage/sets/magicplayerrewards/GiantGrowth.java
index bc6fe01ae0..61589474d1 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/GiantGrowth.java
@@ -38,7 +38,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Harmonize.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Harmonize.java
index 9933f14f6b..f7d2204773 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Harmonize.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Harmonize.java
@@ -38,7 +38,7 @@ public class Harmonize extends mage.sets.planarchaos.Harmonize {
 
     public Harmonize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Harrow.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Harrow.java
index 705820d3c7..b73950e983 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Harrow.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Harrow.java
@@ -38,7 +38,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Hinder.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Hinder.java
index f4e54fa282..93f4a98cbb 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Hinder.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Hinder.java
@@ -38,7 +38,7 @@ public class Hinder extends mage.sets.championsofkamigawa.Hinder {
 
     public Hinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/magicplayerrewards/HypnoticSpecter.java
index e5218d1b51..715464be75 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/HypnoticSpecter.java
@@ -38,7 +38,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Incinerate.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Incinerate.java
index 51cd32bf6d..65a87b0a36 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Incinerate.java
@@ -38,7 +38,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Infest.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Infest.java
index 7fbea8c270..ceb11ba2a8 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Infest.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Infest.java
@@ -38,7 +38,7 @@ public class Infest extends mage.sets.shardsofalara.Infest {
 
     public Infest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/LightningBolt.java b/Mage.Sets/src/mage/sets/magicplayerrewards/LightningBolt.java
index 174f455cc1..fd3fefaf2b 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/LightningBolt.java
@@ -38,7 +38,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/LightningHelix.java b/Mage.Sets/src/mage/sets/magicplayerrewards/LightningHelix.java
index 2ebfdf0667..810f67afca 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/LightningHelix.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/LightningHelix.java
@@ -38,7 +38,7 @@ public class LightningHelix extends mage.sets.ravnica.LightningHelix {
 
     public LightningHelix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/ManaLeak.java b/Mage.Sets/src/mage/sets/magicplayerrewards/ManaLeak.java
index f7e11cbc2b..26c767a33e 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/ManaLeak.java
@@ -38,7 +38,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/ManaTithe.java b/Mage.Sets/src/mage/sets/magicplayerrewards/ManaTithe.java
index 5832d17739..a6012ac275 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/ManaTithe.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/ManaTithe.java
@@ -38,7 +38,7 @@ public class ManaTithe extends mage.sets.planarchaos.ManaTithe {
 
     public ManaTithe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Mortify.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Mortify.java
index a4c1c99b47..8c93d7b784 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Mortify.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Mortify.java
@@ -38,7 +38,7 @@ public class Mortify extends mage.sets.guildpact.Mortify {
 
     public Mortify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/NamelessInversion.java b/Mage.Sets/src/mage/sets/magicplayerrewards/NamelessInversion.java
index 3fb93a2fb8..6233049f2c 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/NamelessInversion.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/NamelessInversion.java
@@ -38,7 +38,7 @@ public class NamelessInversion extends mage.sets.lorwyn.NamelessInversion {
 
     public NamelessInversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Negate.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Negate.java
index 6a683b5701..f17aec14e2 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Negate.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Negate.java
@@ -38,7 +38,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Oxidize.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Oxidize.java
index 0dc6bedb1e..a6440622c9 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Oxidize.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Oxidize.java
@@ -38,7 +38,7 @@ public class Oxidize extends mage.sets.darksteel.Oxidize {
 
     public Oxidize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Ponder.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Ponder.java
index de4f8f755b..9705b5adf9 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Ponder.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Ponder.java
@@ -38,7 +38,7 @@ public class Ponder extends mage.sets.magic2010.Ponder {
 
     public Ponder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/PsionicBlast.java b/Mage.Sets/src/mage/sets/magicplayerrewards/PsionicBlast.java
index f4481ddb0c..44d3dfdfce 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/PsionicBlast.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/PsionicBlast.java
@@ -37,7 +37,7 @@ public class PsionicBlast extends mage.sets.timeshifted.PsionicBlast {
 
     public PsionicBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "MPRP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Psychatog.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Psychatog.java
index 024a905b22..0f1c52c904 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Psychatog.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Psychatog.java
@@ -38,7 +38,7 @@ public class Psychatog extends mage.sets.vintagemasters.Psychatog {
 
     public Psychatog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Putrefy.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Putrefy.java
index ffd786e20a..db04a821ac 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Putrefy.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Putrefy.java
@@ -38,7 +38,7 @@ public class Putrefy extends mage.sets.ravnica.Putrefy {
 
     public Putrefy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Pyroclasm.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Pyroclasm.java
index d73d6ebb25..11865db53f 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Pyroclasm.java
@@ -38,7 +38,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/RampantGrowth.java b/Mage.Sets/src/mage/sets/magicplayerrewards/RampantGrowth.java
index 8cb8165dad..3136e900d5 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/RampantGrowth.java
@@ -38,7 +38,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Reciprocate.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Reciprocate.java
index fd9c07076c..0174feecbe 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Reciprocate.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Reciprocate.java
@@ -38,7 +38,7 @@ public class Reciprocate extends mage.sets.championsofkamigawa.Reciprocate {
 
     public Reciprocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Recollect.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Recollect.java
index 9b1ddfaa55..bc65643e91 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Recollect.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Recollect.java
@@ -38,7 +38,7 @@ public class Recollect extends mage.sets.tenthedition.Recollect {
 
     public Recollect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/RemoveSoul.java b/Mage.Sets/src/mage/sets/magicplayerrewards/RemoveSoul.java
index 6653590491..f7cef9d33c 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/RemoveSoul.java
@@ -38,7 +38,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/SearingBlaze.java b/Mage.Sets/src/mage/sets/magicplayerrewards/SearingBlaze.java
index ce01b13ee8..bbb2031543 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/SearingBlaze.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/SearingBlaze.java
@@ -38,7 +38,7 @@ public class SearingBlaze extends mage.sets.worldwake.SearingBlaze {
 
     public SearingBlaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/SignInBlood.java b/Mage.Sets/src/mage/sets/magicplayerrewards/SignInBlood.java
index 15fb6d1e9a..80beb2acb7 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/SignInBlood.java
@@ -38,7 +38,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Terminate.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Terminate.java
index fa86703bc8..e2422f51f0 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Terminate.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Terminate.java
@@ -38,7 +38,7 @@ public class Terminate extends mage.sets.alarareborn.Terminate {
 
     public Terminate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Terror.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Terror.java
index 99d22c8b04..664aafe000 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Terror.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Terror.java
@@ -38,7 +38,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Tidings.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Tidings.java
index f834460710..b2bd87ea9e 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Tidings.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Tidings.java
@@ -38,7 +38,7 @@ public class Tidings extends mage.sets.tenthedition.Tidings {
 
     public Tidings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/TreasureHunt.java b/Mage.Sets/src/mage/sets/magicplayerrewards/TreasureHunt.java
index 7b35e09f8d..2feb9e45a5 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/TreasureHunt.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/TreasureHunt.java
@@ -38,7 +38,7 @@ public class TreasureHunt extends mage.sets.worldwake.TreasureHunt {
 
     public TreasureHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Unmake.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Unmake.java
index 20de1af8f5..87e396db29 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Unmake.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Unmake.java
@@ -38,7 +38,7 @@ public class Unmake extends mage.sets.eventide.Unmake {
 
     public Unmake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/VoidmageProdigy.java b/Mage.Sets/src/mage/sets/magicplayerrewards/VoidmageProdigy.java
index 293227434f..f1a2a91b6a 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/VoidmageProdigy.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/VoidmageProdigy.java
@@ -38,7 +38,7 @@ public class VoidmageProdigy extends mage.sets.onslaught.VoidmageProdigy {
 
     public VoidmageProdigy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/VolcanicFallout.java b/Mage.Sets/src/mage/sets/magicplayerrewards/VolcanicFallout.java
index da13cece3b..faa7698cb2 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/VolcanicFallout.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/VolcanicFallout.java
@@ -38,7 +38,7 @@ public class VolcanicFallout extends mage.sets.conflux.VolcanicFallout {
 
     public VolcanicFallout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Wasteland.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Wasteland.java
index 6aeddb3f8b..01a249fa35 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Wasteland.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Wasteland.java
@@ -38,7 +38,7 @@ public class Wasteland extends mage.sets.tempest.Wasteland {
 
     public Wasteland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/WrathOfGod.java b/Mage.Sets/src/mage/sets/magicplayerrewards/WrathOfGod.java
index bb05eb96ba..6a16d749e0 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/WrathOfGod.java
@@ -38,7 +38,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/Zombify.java b/Mage.Sets/src/mage/sets/magicplayerrewards/Zombify.java
index efc88b6846..3920f5337d 100644
--- a/Mage.Sets/src/mage/sets/magicplayerrewards/Zombify.java
+++ b/Mage.Sets/src/mage/sets/magicplayerrewards/Zombify.java
@@ -38,7 +38,7 @@ public class Zombify extends mage.sets.ninthedition.Zombify {
 
     public Zombify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "MPRP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/AdunOakenshield.java b/Mage.Sets/src/mage/sets/mastersedition/AdunOakenshield.java
index c3deb947ee..01b3466de7 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/AdunOakenshield.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/AdunOakenshield.java
@@ -37,7 +37,7 @@ public class AdunOakenshield extends mage.sets.legends.AdunOakenshield {
 
     public AdunOakenshield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Amnesia.java b/Mage.Sets/src/mage/sets/mastersedition/Amnesia.java
index 9e28875155..8a5762f554 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Amnesia.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Amnesia.java
@@ -38,7 +38,7 @@ public class Amnesia extends mage.sets.thedark.Amnesia {
 
     public Amnesia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/AnimateDead.java b/Mage.Sets/src/mage/sets/mastersedition/AnimateDead.java
index 71367e78f6..61c92be648 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/AnimateWall.java b/Mage.Sets/src/mage/sets/mastersedition/AnimateWall.java
index 9375fe8dfa..bc71432f4f 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/AnimateWall.java
@@ -38,7 +38,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/mastersedition/AnkhOfMishra.java
index 265b3d4aad..e1b2ca1eac 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/AnkhOfMishra.java
@@ -37,7 +37,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ArcaneDenial.java b/Mage.Sets/src/mage/sets/mastersedition/ArcaneDenial.java
index 71f3b6d801..45657d5144 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ArcaneDenial.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ArcaneDenial.java
@@ -37,7 +37,7 @@ public class ArcaneDenial extends mage.sets.commander2013.ArcaneDenial {
 
     public ArcaneDenial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ArgivianArchaeologist.java b/Mage.Sets/src/mage/sets/mastersedition/ArgivianArchaeologist.java
index 3a1811ad5c..b8e5012e58 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ArgivianArchaeologist.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ArgivianArchaeologist.java
@@ -37,7 +37,7 @@ public class ArgivianArchaeologist extends mage.sets.antiquities.ArgivianArchaeo
 
     public ArgivianArchaeologist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Armageddon.java b/Mage.Sets/src/mage/sets/mastersedition/Armageddon.java
index 911430d1b8..b6514da4e4 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ArtifactBlast.java b/Mage.Sets/src/mage/sets/mastersedition/ArtifactBlast.java
index 9433ebb7cd..e2410e0d4f 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ArtifactBlast.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ArtifactBlast.java
@@ -37,7 +37,7 @@ public class ArtifactBlast extends mage.sets.antiquities.ArtifactBlast {
 
     public ArtifactBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/AshnodsTransmogrant.java b/Mage.Sets/src/mage/sets/mastersedition/AshnodsTransmogrant.java
index d0f15a9e57..fcd228bcd3 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/AshnodsTransmogrant.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/AshnodsTransmogrant.java
@@ -38,7 +38,7 @@ public class AshnodsTransmogrant extends mage.sets.fifthedition.AshnodsTransmogr
 
     public AshnodsTransmogrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/BalduvianHorde.java b/Mage.Sets/src/mage/sets/mastersedition/BalduvianHorde.java
index e99f8b9e4a..300e325840 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/BalduvianHorde.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/BalduvianHorde.java
@@ -37,7 +37,7 @@ public class BalduvianHorde extends mage.sets.alliances.BalduvianHorde {
 
     public BalduvianHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/BallLightning.java b/Mage.Sets/src/mage/sets/mastersedition/BallLightning.java
index cb31a05e7b..49cc77d444 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/BallLightning.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/BallLightning.java
@@ -37,7 +37,7 @@ public class BallLightning extends mage.sets.magic2010.BallLightning {
 
     public BallLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/BasalThrull.java b/Mage.Sets/src/mage/sets/mastersedition/BasalThrull.java
index 2bc1aa3a90..539f87eecb 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/BasalThrull.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/BasalThrull.java
@@ -37,7 +37,7 @@ public class BasalThrull extends mage.sets.fallenempires.BasalThrull1 {
 
     public BasalThrull(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Berserk.java b/Mage.Sets/src/mage/sets/mastersedition/Berserk.java
index 0076109f60..b40773e63b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Berserk.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Berserk.java
@@ -38,7 +38,7 @@ public class Berserk extends mage.sets.limitedalpha.Berserk {
 
     public Berserk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/BlackKnight.java b/Mage.Sets/src/mage/sets/mastersedition/BlackKnight.java
index 84181617ec..baa2101a63 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Blight.java b/Mage.Sets/src/mage/sets/mastersedition/Blight.java
index d4dce1173e..1aef4695a1 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Blight.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Blight.java
@@ -37,7 +37,7 @@ public class Blight extends mage.sets.fifthedition.Blight {
 
     public Blight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/BreedingPit.java b/Mage.Sets/src/mage/sets/mastersedition/BreedingPit.java
index b4e02eab87..722babafd7 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/BreedingPit.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/BreedingPit.java
@@ -37,7 +37,7 @@ public class BreedingPit extends mage.sets.fifthedition.BreedingPit {
 
     public BreedingPit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/BrothersOfFire.java b/Mage.Sets/src/mage/sets/mastersedition/BrothersOfFire.java
index 12c5713a9e..9a5a340451 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/BrothersOfFire.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/BrothersOfFire.java
@@ -37,7 +37,7 @@ public class BrothersOfFire extends mage.sets.fourthedition.BrothersOfFire {
 
     public BrothersOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/CarnivorousPlant.java b/Mage.Sets/src/mage/sets/mastersedition/CarnivorousPlant.java
index e238ef1fc7..3b9c7a3f0c 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/CarnivorousPlant.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/CarnivorousPlant.java
@@ -38,7 +38,7 @@ public class CarnivorousPlant extends mage.sets.fourthedition.CarnivorousPlant {
 
     public CarnivorousPlant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/CentaurArcher.java b/Mage.Sets/src/mage/sets/mastersedition/CentaurArcher.java
index 98414cc5cb..39ea160d49 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/CentaurArcher.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/CentaurArcher.java
@@ -37,7 +37,7 @@ public class CentaurArcher extends mage.sets.iceage.CentaurArcher {
 
     public CentaurArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/sets/mastersedition/ChainsOfMephistopheles.java
index 380469cc3a..b8544dc34d 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ChainsOfMephistopheles.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ChainsOfMephistopheles.java
@@ -37,7 +37,7 @@ public class ChainsOfMephistopheles extends mage.sets.legends.ChainsOfMephistoph
 
     public ChainsOfMephistopheles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ChubToad.java b/Mage.Sets/src/mage/sets/mastersedition/ChubToad.java
index d780f6d7e7..1db01de8b6 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ChubToad.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ChubToad.java
@@ -37,7 +37,7 @@ public class ChubToad extends mage.sets.iceage.ChubToad {
 
     public ChubToad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ClockworkBeast.java b/Mage.Sets/src/mage/sets/mastersedition/ClockworkBeast.java
index 9107374342..dd8c7be485 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ClockworkBeast.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ClockworkBeast.java
@@ -38,7 +38,7 @@ public class ClockworkBeast extends mage.sets.limitedalpha.ClockworkBeast {
 
     public ClockworkBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Contagion.java b/Mage.Sets/src/mage/sets/mastersedition/Contagion.java
index 13215dfbcd..7045f50b0e 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Contagion.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Contagion.java
@@ -38,7 +38,7 @@ public class Contagion extends mage.sets.alliances.Contagion {
 
     public Contagion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/CopperTablet.java b/Mage.Sets/src/mage/sets/mastersedition/CopperTablet.java
index 6610030f4a..9988e38b15 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/CopperTablet.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/CopperTablet.java
@@ -37,7 +37,7 @@ public class CopperTablet extends mage.sets.limitedalpha.CopperTablet {
 
     public CopperTablet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/CrookshankKobolds.java b/Mage.Sets/src/mage/sets/mastersedition/CrookshankKobolds.java
index d01c4d5ab5..413fab5589 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/CrookshankKobolds.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/CrookshankKobolds.java
@@ -37,7 +37,7 @@ public class CrookshankKobolds extends mage.sets.legends.CrookshankKobolds {
 
     public CrookshankKobolds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Crusade.java b/Mage.Sets/src/mage/sets/mastersedition/Crusade.java
index 42e862c368..f202ee30c3 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Crusade.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/CursedRack.java b/Mage.Sets/src/mage/sets/mastersedition/CursedRack.java
index 91433fd95e..cf14518726 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/CursedRack.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/CursedRack.java
@@ -37,7 +37,7 @@ public class CursedRack extends mage.sets.antiquities.CursedRack {
 
     public CursedRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DakkonBlackblade.java b/Mage.Sets/src/mage/sets/mastersedition/DakkonBlackblade.java
index cab468034b..afa8139d41 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DakkonBlackblade.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DakkonBlackblade.java
@@ -37,7 +37,7 @@ public class DakkonBlackblade extends mage.sets.legends.DakkonBlackblade {
 
     public DakkonBlackblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DeathSpeakers.java b/Mage.Sets/src/mage/sets/mastersedition/DeathSpeakers.java
index a4714441e5..074ce2d7a7 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DeathSpeakers.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DeathSpeakers.java
@@ -38,7 +38,7 @@ public class DeathSpeakers extends mage.sets.homelands.DeathSpeakers {
 
     public DeathSpeakers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DeathWard.java b/Mage.Sets/src/mage/sets/mastersedition/DeathWard.java
index 055a2fba2c..c7343764a6 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DeathWard.java
@@ -37,7 +37,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Derelor.java b/Mage.Sets/src/mage/sets/mastersedition/Derelor.java
index 0edb855b4d..ea5c9aefad 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Derelor.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Derelor.java
@@ -38,7 +38,7 @@ public class Derelor extends mage.sets.fallenempires.Derelor {
 
     public Derelor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DiamondValley.java b/Mage.Sets/src/mage/sets/mastersedition/DiamondValley.java
index 7aaeead3d6..e60f77923f 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DiamondValley.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DiamondValley.java
@@ -38,7 +38,7 @@ public class DiamondValley extends mage.sets.arabiannights.DiamondValley {
 
     public DiamondValley(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DiminishingReturns.java b/Mage.Sets/src/mage/sets/mastersedition/DiminishingReturns.java
index 9ee41fb655..fbdb45f170 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DiminishingReturns.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DiminishingReturns.java
@@ -37,7 +37,7 @@ public class DiminishingReturns extends mage.sets.alliances.DiminishingReturns {
 
     public DiminishingReturns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/mastersedition/DivineTransformation.java
index 04aff988fe..5619a518c5 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DivineTransformation.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DivineTransformation.java
@@ -37,7 +37,7 @@ public class DivineTransformation extends mage.sets.fifthedition.DivineTransform
 
     public DivineTransformation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DragonEngine.java b/Mage.Sets/src/mage/sets/mastersedition/DragonEngine.java
index 4d87d3ef85..c3cb3dd37e 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DragonEngine.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DragonEngine.java
@@ -38,7 +38,7 @@ public class DragonEngine extends mage.sets.fifthedition.DragonEngine {
 
     public DragonEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DustToDust.java b/Mage.Sets/src/mage/sets/mastersedition/DustToDust.java
index bda403bd33..8bc0eec051 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DustToDust.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DustToDust.java
@@ -37,7 +37,7 @@ public class DustToDust extends mage.sets.thedark.DustToDust {
 
     public DustToDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java b/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java
index b6235477f6..0100bb33c7 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java
@@ -37,7 +37,7 @@ public class DwarvenCatapult extends mage.sets.fifthedition.DwarvenCatapult {
 
     public DwarvenCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/DwarvenSoldier.java b/Mage.Sets/src/mage/sets/mastersedition/DwarvenSoldier.java
index 174f995efe..7168c97d63 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/DwarvenSoldier.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/DwarvenSoldier.java
@@ -37,7 +37,7 @@ public class DwarvenSoldier extends mage.sets.fallenempires.DwarvenSoldier1 {
 
     public DwarvenSoldier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ErgRaiders.java b/Mage.Sets/src/mage/sets/mastersedition/ErgRaiders.java
index 52a1dfa012..63ad071f33 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ErgRaiders.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ErgRaiders.java
@@ -38,7 +38,7 @@ public class ErgRaiders extends mage.sets.fourthedition.ErgRaiders {
 
     public ErgRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Eureka.java b/Mage.Sets/src/mage/sets/mastersedition/Eureka.java
index 856b881665..e14f34814f 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Eureka.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Eureka.java
@@ -38,7 +38,7 @@ public class Eureka extends mage.sets.vintagemasters.Eureka {
 
     public Eureka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Exile.java b/Mage.Sets/src/mage/sets/mastersedition/Exile.java
index ac8f75c0ff..182b1cc77d 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Exile.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Exile.java
@@ -38,7 +38,7 @@ public class Exile extends mage.sets.alliances.Exile {
 
     public Exile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/FeastOrFamine.java b/Mage.Sets/src/mage/sets/mastersedition/FeastOrFamine.java
index 3111226a3e..e3b2422cae 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/FeastOrFamine.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/FeastOrFamine.java
@@ -37,7 +37,7 @@ public class FeastOrFamine extends mage.sets.izzetvsgolgari.FeastOrFamine {
 
     public FeastOrFamine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/FireCovenant.java b/Mage.Sets/src/mage/sets/mastersedition/FireCovenant.java
index ef8c493e29..b246317e5d 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/FireCovenant.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/FireCovenant.java
@@ -37,7 +37,7 @@ public class FireCovenant extends mage.sets.iceage.FireCovenant {
 
     public FireCovenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Fissure.java b/Mage.Sets/src/mage/sets/mastersedition/Fissure.java
index 1999cce448..5a59a79d0d 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Fissure.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Fissure.java
@@ -37,7 +37,7 @@ public class Fissure extends mage.sets.thedark.Fissure {
 
     public Fissure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ForceOfWill.java b/Mage.Sets/src/mage/sets/mastersedition/ForceOfWill.java
index 258f1eca89..5c9e90fae6 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ForceOfWill.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ForceOfWill.java
@@ -38,7 +38,7 @@ public class ForceOfWill extends mage.sets.alliances.ForceOfWill {
 
     public ForceOfWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/FyndhornElves.java b/Mage.Sets/src/mage/sets/mastersedition/FyndhornElves.java
index fd2cb9985e..1f58c80e87 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/FyndhornElves.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/FyndhornElves.java
@@ -37,7 +37,7 @@ public class FyndhornElves extends mage.sets.iceage.FyndhornElves {
 
     public FyndhornElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GhazbanOgre.java b/Mage.Sets/src/mage/sets/mastersedition/GhazbanOgre.java
index e1e7394f9d..903ae47e70 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GhazbanOgre.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GhazbanOgre.java
@@ -37,7 +37,7 @@ public class GhazbanOgre extends mage.sets.fifthedition.GhazbanOgre {
 
     public GhazbanOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GiantTortoise.java b/Mage.Sets/src/mage/sets/mastersedition/GiantTortoise.java
index d86588277a..128d264964 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GiantTortoise.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GiantTortoise.java
@@ -37,7 +37,7 @@ public class GiantTortoise extends mage.sets.fourthedition.GiantTortoise {
 
     public GiantTortoise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinChirurgeon.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinChirurgeon.java
index bc22c4da36..8f73f5011b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GoblinChirurgeon.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinChirurgeon.java
@@ -37,7 +37,7 @@ public class GoblinChirurgeon extends mage.sets.fallenempires.GoblinChirurgeon1
 
     public GoblinChirurgeon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinGrenade.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinGrenade.java
index 4473d1a0e4..d10c7d1ab5 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GoblinGrenade.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinGrenade.java
@@ -37,7 +37,7 @@ public class GoblinGrenade extends mage.sets.magic2012.GoblinGrenade {
 
     public GoblinGrenade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinMutant.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinMutant.java
index 1fe41f0eb9..a461209e73 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GoblinMutant.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinMutant.java
@@ -38,7 +38,7 @@ public class GoblinMutant extends mage.sets.iceage.GoblinMutant {
     public GoblinMutant(UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "MED";
-        this.cardNumber = 96;
+        this.cardNumber = "96";
     }
 
     public GoblinMutant(final GoblinMutant card) {
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java
index 1562548d3d..fdab5bc7ed 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java
@@ -37,7 +37,7 @@ public class GoblinWizard extends mage.sets.thedark.GoblinWizard {
 
     public GoblinWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinsOfTheFlarg.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinsOfTheFlarg.java
index 0fa43306c5..43d7025193 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GoblinsOfTheFlarg.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinsOfTheFlarg.java
@@ -37,7 +37,7 @@ public class GoblinsOfTheFlarg extends mage.sets.thedark.GoblinsOfTheFlarg {
 
     public GoblinsOfTheFlarg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/GraniteGargoyle.java b/Mage.Sets/src/mage/sets/mastersedition/GraniteGargoyle.java
index 855e78d116..44b6d98ae2 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/GraniteGargoyle.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/GraniteGargoyle.java
@@ -38,7 +38,7 @@ public class GraniteGargoyle extends mage.sets.revisededition.GraniteGargoyle {
 
     public GraniteGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Hecatomb.java b/Mage.Sets/src/mage/sets/mastersedition/Hecatomb.java
index 7f25a2020b..6bdde1cba4 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Hecatomb.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Hecatomb.java
@@ -37,7 +37,7 @@ public class Hecatomb extends mage.sets.iceage.Hecatomb {
 
     public Hecatomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HighTide.java b/Mage.Sets/src/mage/sets/mastersedition/HighTide.java
index 1f7cfbd127..6bd5792e24 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HighTide.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HighTide.java
@@ -38,7 +38,7 @@ public class HighTide extends mage.sets.fallenempires.HighTide1 {
 
     public HighTide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HolyLight.java b/Mage.Sets/src/mage/sets/mastersedition/HolyLight.java
index 8b2e7df3ec..e7013b01f7 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HolyLight.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HolyLight.java
@@ -37,7 +37,7 @@ public class HolyLight extends mage.sets.thedark.HolyLight {
 
     public HolyLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HomaridSpawningBed.java b/Mage.Sets/src/mage/sets/mastersedition/HomaridSpawningBed.java
index 5728fb36e1..6c3e09977e 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HomaridSpawningBed.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HomaridSpawningBed.java
@@ -37,7 +37,7 @@ public class HomaridSpawningBed extends mage.sets.fallenempires.HomaridSpawningB
 
     public HomaridSpawningBed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HungryMist.java b/Mage.Sets/src/mage/sets/mastersedition/HungryMist.java
index 1bd68a513a..21baa0fcc6 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HungryMist.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HungryMist.java
@@ -37,7 +37,7 @@ public class HungryMist extends mage.sets.fifthedition.HungryMist {
 
     public HungryMist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HyalopterousLemure.java b/Mage.Sets/src/mage/sets/mastersedition/HyalopterousLemure.java
index be6961b775..469130c2cb 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HyalopterousLemure.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HyalopterousLemure.java
@@ -38,7 +38,7 @@ public class HyalopterousLemure extends mage.sets.iceage.HyalopterousLemure {
 
     public HyalopterousLemure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Hydroblast.java b/Mage.Sets/src/mage/sets/mastersedition/Hydroblast.java
index 5f934546cb..bfcf82529a 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Hydroblast.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Hydroblast.java
@@ -38,7 +38,7 @@ public class Hydroblast extends mage.sets.fifthedition.Hydroblast {
 
     public Hydroblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java b/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java
index 4ae9da0894..a0b0544982 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java
@@ -38,7 +38,7 @@ public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IcatianLieutenant.java b/Mage.Sets/src/mage/sets/mastersedition/IcatianLieutenant.java
index 262c207bb8..7464f4cb95 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/IcatianLieutenant.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/IcatianLieutenant.java
@@ -38,7 +38,7 @@ public class IcatianLieutenant extends mage.sets.fallenempires.IcatianLieutenant
 
     public IcatianLieutenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IcatianTown.java b/Mage.Sets/src/mage/sets/mastersedition/IcatianTown.java
index 8923d277ef..c681ddfe10 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/IcatianTown.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/IcatianTown.java
@@ -38,7 +38,7 @@ public class IcatianTown extends mage.sets.fallenempires.IcatianTown {
 
     public IcatianTown(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IceStorm.java b/Mage.Sets/src/mage/sets/mastersedition/IceStorm.java
index 2abbef6fbf..4b492d472e 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/IceStorm.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/IceStorm.java
@@ -37,7 +37,7 @@ public class IceStorm extends mage.sets.limitedalpha.IceStorm {
 
     public IceStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IllusionsOfGrandeur.java b/Mage.Sets/src/mage/sets/mastersedition/IllusionsOfGrandeur.java
index 39f24d78da..2226454a1c 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/IllusionsOfGrandeur.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/IllusionsOfGrandeur.java
@@ -37,7 +37,7 @@ public class IllusionsOfGrandeur extends mage.sets.iceage.IllusionsOfGrandeur {
 
     public IllusionsOfGrandeur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IslandOfWakWak.java b/Mage.Sets/src/mage/sets/mastersedition/IslandOfWakWak.java
index 68b4898e3f..d8046012af 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/IslandOfWakWak.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/IslandOfWakWak.java
@@ -37,7 +37,7 @@ public class IslandOfWakWak extends mage.sets.arabiannights.IslandOfWakWak {
 
     public IslandOfWakWak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java b/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java
index 5c51f44bed..be1a1ecd69 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java
@@ -39,7 +39,7 @@ public class IvoryTower extends mage.sets.antiquities.IvoryTower {
 
     public IvoryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/JacquesLeVert.java b/Mage.Sets/src/mage/sets/mastersedition/JacquesLeVert.java
index 90cf6240ac..9e3d61e465 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/JacquesLeVert.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/JacquesLeVert.java
@@ -37,7 +37,7 @@ public class JacquesLeVert extends mage.sets.legends.JacquesLeVert {
 
     public JacquesLeVert(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Jokulhaups.java b/Mage.Sets/src/mage/sets/mastersedition/Jokulhaups.java
index 2d977ee097..7fa096b7c9 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Jokulhaups.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Jokulhaups.java
@@ -37,7 +37,7 @@ public class Jokulhaups extends mage.sets.iceage.Jokulhaups {
 
     public Jokulhaups(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Juxtapose.java b/Mage.Sets/src/mage/sets/mastersedition/Juxtapose.java
index 65f3d1c281..d8c3bd23cc 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Juxtapose.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Juxtapose.java
@@ -38,7 +38,7 @@ public class Juxtapose extends mage.sets.fifthedition.Juxtapose {
 
     public Juxtapose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/JuzamDjinn.java b/Mage.Sets/src/mage/sets/mastersedition/JuzamDjinn.java
index 37e4839dcd..3dc4066c35 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/JuzamDjinn.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/JuzamDjinn.java
@@ -37,7 +37,7 @@ public class JuzamDjinn extends mage.sets.arabiannights.JuzamDjinn {
 
     public JuzamDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/KeldonWarlord.java b/Mage.Sets/src/mage/sets/mastersedition/KeldonWarlord.java
index 88ee470b2b..f342a0de49 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/KeldonWarlord.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/KeldonWarlord.java
@@ -37,7 +37,7 @@ public class KeldonWarlord extends mage.sets.unlimitededition.KeldonWarlord {
 
     public KeldonWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/LakeOfTheDead.java b/Mage.Sets/src/mage/sets/mastersedition/LakeOfTheDead.java
index 310643b5d7..9e08b7af2a 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/LakeOfTheDead.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/LakeOfTheDead.java
@@ -37,7 +37,7 @@ public class LakeOfTheDead extends mage.sets.vintagemasters.LakeOfTheDead {
 
     public LakeOfTheDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/LightningBolt.java b/Mage.Sets/src/mage/sets/mastersedition/LightningBolt.java
index 350e3c3c4f..1dff652654 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/LimDulsVault.java b/Mage.Sets/src/mage/sets/mastersedition/LimDulsVault.java
index 6b71db24e9..6acae27123 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/LimDulsVault.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/LimDulsVault.java
@@ -37,7 +37,7 @@ public class LimDulsVault extends mage.sets.commander2013.LimDulsVault {
 
     public LimDulsVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/LordOfTresserhorn.java b/Mage.Sets/src/mage/sets/mastersedition/LordOfTresserhorn.java
index 24e2170108..b097b7b85b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/LordOfTresserhorn.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/LordOfTresserhorn.java
@@ -37,7 +37,7 @@ public class LordOfTresserhorn extends mage.sets.alliances.LordOfTresserhorn {
 
     public LordOfTresserhorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ManaFlare.java b/Mage.Sets/src/mage/sets/mastersedition/ManaFlare.java
index 21d5094050..e1422292d3 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ManaFlare.java
@@ -37,7 +37,7 @@ public class ManaFlare extends mage.sets.fourthedition.ManaFlare {
 
     public ManaFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/MishrasFactory.java b/Mage.Sets/src/mage/sets/mastersedition/MishrasFactory.java
index d2aec85451..fb012bd952 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/MishrasFactory.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/MishrasFactory.java
@@ -37,7 +37,7 @@ public class MishrasFactory extends mage.sets.elspethvstezzeret.MishrasFactory {
 
     public MishrasFactory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Moat.java b/Mage.Sets/src/mage/sets/mastersedition/Moat.java
index 61f23f34b2..5a7c914edc 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Moat.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Moat.java
@@ -37,7 +37,7 @@ public class Moat extends mage.sets.legends.Moat {
 
     public Moat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/MountainYeti.java b/Mage.Sets/src/mage/sets/mastersedition/MountainYeti.java
index 7307218077..2740bd7768 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/MountainYeti.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/MountainYeti.java
@@ -39,7 +39,7 @@ public class MountainYeti extends mage.sets.legends.MountainYeti {
 
     public MountainYeti(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/MysticRemora.java b/Mage.Sets/src/mage/sets/mastersedition/MysticRemora.java
index 8d8ecb153f..88cc8e9491 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/MysticRemora.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/MysticRemora.java
@@ -38,7 +38,7 @@ public class MysticRemora extends mage.sets.iceage.MysticRemora {
 
     public MysticRemora(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/NaturesLore.java b/Mage.Sets/src/mage/sets/mastersedition/NaturesLore.java
index 8ef67b2b4a..3d141d7b3b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/NetherShadow.java b/Mage.Sets/src/mage/sets/mastersedition/NetherShadow.java
index 5b8b7fe159..a83a1af427 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/NetherShadow.java
@@ -38,7 +38,7 @@ public class NetherShadow extends mage.sets.limitedalpha.NetherShadow {
 
     public NetherShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/mastersedition/NevinyrralsDisk.java
index edc1e9bef8..b04684e265 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/OrcishMechanics.java b/Mage.Sets/src/mage/sets/mastersedition/OrcishMechanics.java
index e6c4c209df..9fffb5af3a 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/OrcishMechanics.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/OrcishMechanics.java
@@ -38,7 +38,7 @@ public class OrcishMechanics extends mage.sets.antiquities.OrcishMechanics {
 
     public OrcishMechanics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java b/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java
index 11b6fa1d94..f2a53236e9 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java
@@ -37,7 +37,7 @@ public class Oubliette extends mage.sets.arabiannights.Oubliette1 {
 
     public Oubliette(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Paralyze.java b/Mage.Sets/src/mage/sets/mastersedition/Paralyze.java
index e13169bac1..778f91724f 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/PhantomMonster.java b/Mage.Sets/src/mage/sets/mastersedition/PhantomMonster.java
index 5086041b1b..e817570b71 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/PhantomMonster.java
@@ -38,7 +38,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Phelddagrif.java b/Mage.Sets/src/mage/sets/mastersedition/Phelddagrif.java
index 8a5ae4fbe3..0a2b06f660 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Phelddagrif.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Phelddagrif.java
@@ -37,7 +37,7 @@ public class Phelddagrif extends mage.sets.alliances.Phelddagrif {
 
     public Phelddagrif(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java b/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java
index cfc764e03a..6a8c5844ee 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java
@@ -38,7 +38,7 @@ public class PhyrexianWarBeast extends mage.sets.alliances.PhyrexianWarBeast1 {
 
     public PhyrexianWarBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/PolarKraken.java b/Mage.Sets/src/mage/sets/mastersedition/PolarKraken.java
index 42e72c75a4..2861bbe267 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/PolarKraken.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/PolarKraken.java
@@ -37,7 +37,7 @@ public class PolarKraken extends mage.sets.iceage.PolarKraken {
 
     public PolarKraken(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Pox.java b/Mage.Sets/src/mage/sets/mastersedition/Pox.java
index 25b698a690..481300e244 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Pox.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Pox.java
@@ -37,7 +37,7 @@ public class Pox extends mage.sets.fifthedition.Pox {
 
     public Pox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/PrimalOrder.java b/Mage.Sets/src/mage/sets/mastersedition/PrimalOrder.java
index 08eb5e7973..40cc997bb6 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/PrimalOrder.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/PrimalOrder.java
@@ -37,7 +37,7 @@ public class PrimalOrder extends mage.sets.homelands.PrimalOrder {
 
     public PrimalOrder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/PsychicVenom.java b/Mage.Sets/src/mage/sets/mastersedition/PsychicVenom.java
index 434370c02c..0c85bd1de2 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/PsychicVenom.java
@@ -37,7 +37,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Pyroblast.java b/Mage.Sets/src/mage/sets/mastersedition/Pyroblast.java
index d75e8e31c1..480a3cc6a4 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Pyroblast.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Pyroblast.java
@@ -37,7 +37,7 @@ public class Pyroblast extends mage.sets.iceage.Pyroblast {
 
     public Pyroblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/RighteousAvengers.java b/Mage.Sets/src/mage/sets/mastersedition/RighteousAvengers.java
index 8174513d1c..acfa2c8897 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/RighteousAvengers.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/RighteousAvengers.java
@@ -38,7 +38,7 @@ public class RighteousAvengers extends mage.sets.legends.RighteousAvengers {
 
     public RighteousAvengers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Roots.java b/Mage.Sets/src/mage/sets/mastersedition/Roots.java
index d94b49d315..a65ed1e786 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Roots.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Roots.java
@@ -38,7 +38,7 @@ public class Roots extends mage.sets.homelands.Roots {
 
     public Roots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ScrybSprites.java b/Mage.Sets/src/mage/sets/mastersedition/ScrybSprites.java
index eb904984f0..ecb38970e5 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SeaSprite.java b/Mage.Sets/src/mage/sets/mastersedition/SeaSprite.java
index 6ddecb8154..5d52f52a57 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SeaSprite.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SeaSprite.java
@@ -38,7 +38,7 @@ public class SeaSprite extends mage.sets.homelands.SeaSprite {
 
     public SeaSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Seasinger.java b/Mage.Sets/src/mage/sets/mastersedition/Seasinger.java
index 1037f62ee7..b7d051d230 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Seasinger.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Seasinger.java
@@ -37,7 +37,7 @@ public class Seasinger extends mage.sets.fallenempires.Seasinger {
 
     public Seasinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SerendibEfreet.java b/Mage.Sets/src/mage/sets/mastersedition/SerendibEfreet.java
index b8f1df4cee..6741c9e60a 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SerendibEfreet.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SerendibEfreet.java
@@ -38,7 +38,7 @@ public class SerendibEfreet extends mage.sets.vintagemasters.SerendibEfreet {
 
     public SerendibEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SerpentGenerator.java b/Mage.Sets/src/mage/sets/mastersedition/SerpentGenerator.java
index ce00826bee..820cb53a6b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SerpentGenerator.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SerpentGenerator.java
@@ -37,7 +37,7 @@ public class SerpentGenerator extends mage.sets.fifthedition.SerpentGenerator {
 
     public SerpentGenerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ShieldSphere.java b/Mage.Sets/src/mage/sets/mastersedition/ShieldSphere.java
index 5af726263f..7a6257d944 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ShieldSphere.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ShieldSphere.java
@@ -38,7 +38,7 @@ public class ShieldSphere extends mage.sets.alliances.ShieldSphere {
 
     public ShieldSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SingingTree.java b/Mage.Sets/src/mage/sets/mastersedition/SingingTree.java
index c0da985d95..04d511ff58 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SingingTree.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SingingTree.java
@@ -38,7 +38,7 @@ public class SingingTree extends mage.sets.arabiannights.SingingTree {
 
     public SingingTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SpinalVillain.java b/Mage.Sets/src/mage/sets/mastersedition/SpinalVillain.java
index 950bf746ff..0ea005ac82 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SpinalVillain.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SpinalVillain.java
@@ -38,7 +38,7 @@ public class SpinalVillain extends mage.sets.legends.SpinalVillain {
 
     public SpinalVillain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/StoneGiant.java b/Mage.Sets/src/mage/sets/mastersedition/StoneGiant.java
index 2886cdc953..ced8ff67a5 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SuChi.java b/Mage.Sets/src/mage/sets/mastersedition/SuChi.java
index 13e7dee355..f00b07125b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SuChi.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SuChi.java
@@ -39,7 +39,7 @@ public class SuChi extends mage.sets.vintagemasters.SuChi {
 
     public SuChi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SylvanLibrary.java b/Mage.Sets/src/mage/sets/mastersedition/SylvanLibrary.java
index 65b5dc0221..24a86e852a 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/SylvanLibrary.java
@@ -37,7 +37,7 @@ public class SylvanLibrary extends mage.sets.fifthedition.SylvanLibrary {
 
     public SylvanLibrary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/TawnossCoffin.java b/Mage.Sets/src/mage/sets/mastersedition/TawnossCoffin.java
index 76b30c919d..584434f7bc 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/TawnossCoffin.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/TawnossCoffin.java
@@ -37,7 +37,7 @@ public class TawnossCoffin extends mage.sets.antiquities.TawnossCoffin {
 
     public TawnossCoffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ThawingGlaciers.java b/Mage.Sets/src/mage/sets/mastersedition/ThawingGlaciers.java
index e32f2b5ab5..7a89a09bf3 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ThawingGlaciers.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ThawingGlaciers.java
@@ -37,7 +37,7 @@ public class ThawingGlaciers extends mage.sets.vintagemasters.ThawingGlaciers {
 
     public ThawingGlaciers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/mastersedition/ThicketBasilisk.java
index 213d211367..61eada9d33 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ThornThallid.java b/Mage.Sets/src/mage/sets/mastersedition/ThornThallid.java
index c22ae218b9..a947c290a1 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ThornThallid.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ThornThallid.java
@@ -37,7 +37,7 @@ public class ThornThallid extends mage.sets.fallenempires.ThornThallid1 {
 
     public ThornThallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ThrullRetainer.java b/Mage.Sets/src/mage/sets/mastersedition/ThrullRetainer.java
index 62a5229b98..a32952049e 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ThrullRetainer.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ThrullRetainer.java
@@ -38,7 +38,7 @@ public class ThrullRetainer extends mage.sets.fifthedition.ThrullRetainer {
 
     public ThrullRetainer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ThunderSpirit.java b/Mage.Sets/src/mage/sets/mastersedition/ThunderSpirit.java
index b04f33d41f..f9de985339 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ThunderSpirit.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ThunderSpirit.java
@@ -38,7 +38,7 @@ public class ThunderSpirit extends mage.sets.legends.ThunderSpirit {
 
     public ThunderSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/TivadarsCrusade.java b/Mage.Sets/src/mage/sets/mastersedition/TivadarsCrusade.java
index 77e48bdfab..116b87ebbe 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/TivadarsCrusade.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/TivadarsCrusade.java
@@ -37,7 +37,7 @@ public class TivadarsCrusade extends mage.sets.thedark.TivadarsCrusade {
 
     public TivadarsCrusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Tornado.java b/Mage.Sets/src/mage/sets/mastersedition/Tornado.java
index a569b629b1..62a114181b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Tornado.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Tornado.java
@@ -37,7 +37,7 @@ public class Tornado extends mage.sets.alliances.Tornado {
 
     public Tornado(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/UrzasChalice.java b/Mage.Sets/src/mage/sets/mastersedition/UrzasChalice.java
index 62815a0f94..aa2f6017fd 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/UrzasChalice.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/UrzasChalice.java
@@ -37,7 +37,7 @@ public class UrzasChalice extends mage.sets.antiquities.UrzasChalice {
 
     public UrzasChalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/VesuvanDoppelganger.java b/Mage.Sets/src/mage/sets/mastersedition/VesuvanDoppelganger.java
index 4a5c157656..4b50aa9bc4 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/VesuvanDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/VesuvanDoppelganger.java
@@ -37,7 +37,7 @@ public class VesuvanDoppelganger extends mage.sets.unlimitededition.VesuvanDoppe
 
     public VesuvanDoppelganger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/VodalianKnights.java b/Mage.Sets/src/mage/sets/mastersedition/VodalianKnights.java
index 7fc270f075..3c8c5a771a 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/VodalianKnights.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/VodalianKnights.java
@@ -38,7 +38,7 @@ public class VodalianKnights extends mage.sets.fallenempires.VodalianKnights {
 
     public VodalianKnights(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Wanderlust.java b/Mage.Sets/src/mage/sets/mastersedition/Wanderlust.java
index 5ba481384e..f30506d756 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Wanderlust.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Wanderlust.java
@@ -38,7 +38,7 @@ public class Wanderlust extends mage.sets.unlimitededition.Wanderlust {
 
     public Wanderlust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/WindsOfChange.java b/Mage.Sets/src/mage/sets/mastersedition/WindsOfChange.java
index 83db07df0a..d40460c0bc 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/WindsOfChange.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/WindsOfChange.java
@@ -38,7 +38,7 @@ public class WindsOfChange extends mage.sets.fifthedition.WindsOfChange {
 
     public WindsOfChange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/WinterOrb.java b/Mage.Sets/src/mage/sets/mastersedition/WinterOrb.java
index b4582665e9..804a3571c9 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/WinterOrb.java
@@ -37,7 +37,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/WyluliWolf.java b/Mage.Sets/src/mage/sets/mastersedition/WyluliWolf.java
index c4f934d141..339b726d8b 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/WyluliWolf.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/WyluliWolf.java
@@ -38,7 +38,7 @@ public class WyluliWolf extends mage.sets.fifthedition.WyluliWolf {
 
     public WyluliWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "MED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mastersedition/YavimayaAnts.java b/Mage.Sets/src/mage/sets/mastersedition/YavimayaAnts.java
index d91f842e16..4ac3e7dfb2 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/YavimayaAnts.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/YavimayaAnts.java
@@ -38,7 +38,7 @@ public class YavimayaAnts extends mage.sets.alliances.YavimayaAnts {
 
     public YavimayaAnts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ZuranOrb.java b/Mage.Sets/src/mage/sets/mastersedition/ZuranOrb.java
index 343ec6f557..b7c6f55933 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/ZuranOrb.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/ZuranOrb.java
@@ -37,7 +37,7 @@ public class ZuranOrb extends mage.sets.iceage.ZuranOrb {
 
     public ZuranOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "MED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/AbbeyGargoyles.java b/Mage.Sets/src/mage/sets/masterseditionii/AbbeyGargoyles.java
index 2e8ee607a1..441a9f4a9f 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/AbbeyGargoyles.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/AbbeyGargoyles.java
@@ -37,7 +37,7 @@ public class AbbeyGargoyles extends mage.sets.fifthedition.AbbeyGargoyles {
 
     public AbbeyGargoyles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/AdarkarSentinel.java b/Mage.Sets/src/mage/sets/masterseditionii/AdarkarSentinel.java
index 01c4a9deb4..39541c96af 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/AdarkarSentinel.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/AdarkarSentinel.java
@@ -38,7 +38,7 @@ public class AdarkarSentinel extends mage.sets.iceage.AdarkarSentinel {
 
     public AdarkarSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/AmbushParty.java b/Mage.Sets/src/mage/sets/masterseditionii/AmbushParty.java
index 90e8216085..d087b78104 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/AmbushParty.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/AmbushParty.java
@@ -37,7 +37,7 @@ public class AmbushParty extends mage.sets.fifthedition.AmbushParty {
 
     public AmbushParty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Anarchy.java b/Mage.Sets/src/mage/sets/masterseditionii/Anarchy.java
index ab99ad7f8a..bd9b047633 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Anarchy.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Anarchy.java
@@ -38,7 +38,7 @@ public class Anarchy extends mage.sets.iceage.Anarchy {
 
     public Anarchy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/AngelOfFury.java b/Mage.Sets/src/mage/sets/masterseditionii/AngelOfFury.java
index 4c1eb398a7..8beda738ea 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/AngelOfFury.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/AngelOfFury.java
@@ -37,7 +37,7 @@ public class AngelOfFury extends mage.sets.portalsecondage.AngelOfFury {
 
     public AngelOfFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/AngelOfLight.java b/Mage.Sets/src/mage/sets/masterseditionii/AngelOfLight.java
index aa2b67e963..c361362a61 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/AngelOfLight.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/AngelOfLight.java
@@ -37,7 +37,7 @@ public class AngelOfLight extends mage.sets.starter1999.AngelOfLight {
 
     public AngelOfLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ArmoredGriffin.java b/Mage.Sets/src/mage/sets/masterseditionii/ArmoredGriffin.java
index 81b582f252..5b393acdb6 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ArmoredGriffin.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ArmoredGriffin.java
@@ -38,7 +38,7 @@ public class ArmoredGriffin extends mage.sets.planechase2012.ArmoredGriffin {
 
     public ArmoredGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Aurochs.java b/Mage.Sets/src/mage/sets/masterseditionii/Aurochs.java
index 708d674be8..7966258ab9 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Aurochs.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Aurochs.java
@@ -37,7 +37,7 @@ public class Aurochs extends mage.sets.iceage.Aurochs {
 
     public Aurochs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Badlands.java b/Mage.Sets/src/mage/sets/masterseditionii/Badlands.java
index e2aab969d0..b0bc5ec900 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Badlands.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Badlands.java
@@ -37,7 +37,7 @@ public class Badlands extends mage.sets.limitedalpha.Badlands {
 
     public Badlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/BalduvianTradingPost.java b/Mage.Sets/src/mage/sets/masterseditionii/BalduvianTradingPost.java
index 1fb5745f9c..8512bce2da 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/BalduvianTradingPost.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/BalduvianTradingPost.java
@@ -37,7 +37,7 @@ public class BalduvianTradingPost extends mage.sets.alliances.BalduvianTradingPo
 
     public BalduvianTradingPost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/BarbedSextant.java b/Mage.Sets/src/mage/sets/masterseditionii/BarbedSextant.java
index 64eb1ca5d7..470879c9e0 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/BarbedSextant.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/BarbedSextant.java
@@ -37,7 +37,7 @@ public class BarbedSextant extends mage.sets.iceage.BarbedSextant {
 
     public BarbedSextant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Brainstorm.java b/Mage.Sets/src/mage/sets/masterseditionii/Brainstorm.java
index ff08fe6a3d..b382a3356a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/BrassclawOrcs.java b/Mage.Sets/src/mage/sets/masterseditionii/BrassclawOrcs.java
index 3fedeef134..6a0ce058f2 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/BrassclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/BrassclawOrcs.java
@@ -37,7 +37,7 @@ public class BrassclawOrcs extends mage.sets.fallenempires.BrassclawOrcs1 {
 
     public BrassclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/BrimstoneDragon.java b/Mage.Sets/src/mage/sets/masterseditionii/BrimstoneDragon.java
index 33ad4bb792..1a6463c733 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/BrimstoneDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/BrimstoneDragon.java
@@ -37,7 +37,7 @@ public class BrimstoneDragon extends mage.sets.portalsecondage.BrimstoneDragon {
 
     public BrimstoneDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Browse.java b/Mage.Sets/src/mage/sets/masterseditionii/Browse.java
index 3b2b49c160..18c313d119 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Browse.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Browse.java
@@ -37,7 +37,7 @@ public class Browse extends mage.sets.alliances.Browse {
 
     public Browse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Burnout.java b/Mage.Sets/src/mage/sets/masterseditionii/Burnout.java
index 523442c030..157e0e62b9 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Burnout.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Burnout.java
@@ -37,7 +37,7 @@ public class Burnout extends mage.sets.alliances.Burnout {
 
     public Burnout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/CaribouRange.java b/Mage.Sets/src/mage/sets/masterseditionii/CaribouRange.java
index 62e0e66201..1c7f981e04 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/CaribouRange.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/CaribouRange.java
@@ -37,7 +37,7 @@ public class CaribouRange extends mage.sets.fifthedition.CaribouRange {
 
     public CaribouRange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Conquer.java b/Mage.Sets/src/mage/sets/masterseditionii/Conquer.java
index ba63c2cbcb..0cdcbcdaba 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Conquer.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Conquer.java
@@ -37,7 +37,7 @@ public class Conquer extends mage.sets.iceage.Conquer {
 
     public Conquer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Counterspell.java b/Mage.Sets/src/mage/sets/masterseditionii/Counterspell.java
index dc1a452cb2..91d61fa736 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/DanceOfTheDead.java b/Mage.Sets/src/mage/sets/masterseditionii/DanceOfTheDead.java
index ad12aa901f..9ac67ff989 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/DanceOfTheDead.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/DanceOfTheDead.java
@@ -37,7 +37,7 @@ public class DanceOfTheDead extends mage.sets.iceage.DanceOfTheDead {
 
     public DanceOfTheDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/DarkBanishing.java b/Mage.Sets/src/mage/sets/masterseditionii/DarkBanishing.java
index 74ba4e7146..a9c35559fd 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/DeepSpawn.java b/Mage.Sets/src/mage/sets/masterseditionii/DeepSpawn.java
index 3d17bcbb88..cf3bfe2c8b 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/DeepSpawn.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/DeepSpawn.java
@@ -38,7 +38,7 @@ public class DeepSpawn extends mage.sets.fallenempires.DeepSpawn {
 
     public DeepSpawn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/DemonicConsultation.java b/Mage.Sets/src/mage/sets/masterseditionii/DemonicConsultation.java
index 7e0a6fbbf6..4da6e97cbe 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/DemonicConsultation.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/DemonicConsultation.java
@@ -37,7 +37,7 @@ public class DemonicConsultation extends mage.sets.iceage.DemonicConsultation {
 
     public DemonicConsultation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Disenchant.java b/Mage.Sets/src/mage/sets/masterseditionii/Disenchant.java
index 983665c965..0a27e0cfee 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/DwarvenRuins.java b/Mage.Sets/src/mage/sets/masterseditionii/DwarvenRuins.java
index 934adc769c..f5e8fa3e01 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/DwarvenRuins.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/DwarvenRuins.java
@@ -37,7 +37,7 @@ public class DwarvenRuins extends mage.sets.fallenempires.DwarvenRuins {
 
     public DwarvenRuins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Dystopia.java b/Mage.Sets/src/mage/sets/masterseditionii/Dystopia.java
index df03039811..af9ab1bef8 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Dystopia.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Dystopia.java
@@ -37,7 +37,7 @@ public class Dystopia extends mage.sets.alliances.Dystopia {
 
     public Dystopia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/EbonStronghold.java b/Mage.Sets/src/mage/sets/masterseditionii/EbonStronghold.java
index 07e912e55c..fb9e41497f 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/EbonStronghold.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/EbonStronghold.java
@@ -37,7 +37,7 @@ public class EbonStronghold extends mage.sets.fallenempires.EbonStronghold {
 
     public EbonStronghold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ElvishRanger.java b/Mage.Sets/src/mage/sets/masterseditionii/ElvishRanger.java
index 6b322ba3a4..7e4523afaa 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ElvishRanger.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ElvishRanger.java
@@ -37,7 +37,7 @@ public class ElvishRanger extends mage.sets.portal.ElvishRanger {
 
     public ElvishRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ElvishSpiritGuide.java b/Mage.Sets/src/mage/sets/masterseditionii/ElvishSpiritGuide.java
index 5c7862d7ec..f59033f60a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ElvishSpiritGuide.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ElvishSpiritGuide.java
@@ -37,7 +37,7 @@ public class ElvishSpiritGuide extends mage.sets.alliances.ElvishSpiritGuide {
 
     public ElvishSpiritGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/FarrelsMantle.java b/Mage.Sets/src/mage/sets/masterseditionii/FarrelsMantle.java
index b0a4c76d7f..234d70f041 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/FarrelsMantle.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/FarrelsMantle.java
@@ -37,7 +37,7 @@ public class FarrelsMantle extends mage.sets.fallenempires.FarrelsMantle {
 
     public FarrelsMantle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/FarrelsZealot.java b/Mage.Sets/src/mage/sets/masterseditionii/FarrelsZealot.java
index f3dbcb9a01..b97b938a31 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/FarrelsZealot.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/FarrelsZealot.java
@@ -38,7 +38,7 @@ public class FarrelsZealot extends mage.sets.fallenempires.FarrelsZealot1 {
 
     public FarrelsZealot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/FeralThallid.java b/Mage.Sets/src/mage/sets/masterseditionii/FeralThallid.java
index d7f428e6dc..c7c3000b73 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/FeralThallid.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/FeralThallid.java
@@ -38,7 +38,7 @@ public class FeralThallid extends mage.sets.fallenempires.FeralThallid {
 
     public FeralThallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/FireDragon.java b/Mage.Sets/src/mage/sets/masterseditionii/FireDragon.java
index 520c2fe590..209e4f9442 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/FireDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/FireDragon.java
@@ -37,7 +37,7 @@ public class FireDragon extends mage.sets.portal.FireDragon {
 
     public FireDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/FlameSpirit.java b/Mage.Sets/src/mage/sets/masterseditionii/FlameSpirit.java
index e71596491f..3effe99c92 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/FlameSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/FlameSpirit.java
@@ -37,7 +37,7 @@ public class FlameSpirit extends mage.sets.iceage.FlameSpirit {
 
     public FlameSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ForbiddenLore.java b/Mage.Sets/src/mage/sets/masterseditionii/ForbiddenLore.java
index 4ddb94f1a5..822f2e23f5 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ForbiddenLore.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ForbiddenLore.java
@@ -38,7 +38,7 @@ public class ForbiddenLore extends mage.sets.iceage.ForbiddenLore {
 
     public ForbiddenLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/FungalBloom.java b/Mage.Sets/src/mage/sets/masterseditionii/FungalBloom.java
index 9bde0a88d3..3c731cff65 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/FungalBloom.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/FungalBloom.java
@@ -37,7 +37,7 @@ public class FungalBloom extends mage.sets.fallenempires.FungalBloom {
 
     public FungalBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/GiantGrowth.java b/Mage.Sets/src/mage/sets/masterseditionii/GiantGrowth.java
index ea8e25103a..541c8fd782 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/GlacialChasm.java b/Mage.Sets/src/mage/sets/masterseditionii/GlacialChasm.java
index 8c0e9e42cf..2bb519bfea 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/GlacialChasm.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/GlacialChasm.java
@@ -38,7 +38,7 @@ public class GlacialChasm extends mage.sets.iceage.GlacialChasm {
 
     public GlacialChasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/GlacialCrevasses.java b/Mage.Sets/src/mage/sets/masterseditionii/GlacialCrevasses.java
index 466f568328..511b847d72 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/GlacialCrevasses.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/GlacialCrevasses.java
@@ -37,7 +37,7 @@ public class GlacialCrevasses extends mage.sets.iceage.GlacialCrevasses {
 
     public GlacialCrevasses(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java b/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java
index e9d1bdf4bb..7f15030c87 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java
@@ -38,7 +38,7 @@ public class GorillaShaman extends mage.sets.alliances.GorillaShaman1 {
 
     public GorillaShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/HavenwoodBattleground.java b/Mage.Sets/src/mage/sets/masterseditionii/HavenwoodBattleground.java
index a70f394eab..e239e8644a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/HavenwoodBattleground.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/HavenwoodBattleground.java
@@ -37,7 +37,7 @@ public class HavenwoodBattleground extends mage.sets.fallenempires.HavenwoodBatt
 
     public HavenwoodBattleground(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/HeartOfYavimaya.java b/Mage.Sets/src/mage/sets/masterseditionii/HeartOfYavimaya.java
index 751dbdcba1..796c67036a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/HeartOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/HeartOfYavimaya.java
@@ -37,7 +37,7 @@ public class HeartOfYavimaya extends mage.sets.alliances.HeartOfYavimaya {
 
     public HeartOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/HelmOfObedience.java b/Mage.Sets/src/mage/sets/masterseditionii/HelmOfObedience.java
index f2f4a8c681..a44880f613 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/HelmOfObedience.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/HelmOfObedience.java
@@ -37,7 +37,7 @@ public class HelmOfObedience extends mage.sets.alliances.HelmOfObedience {
 
     public HelmOfObedience(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java
index 4322c0884c..a86c70070a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java
@@ -37,7 +37,7 @@ public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelinee
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Icequake.java b/Mage.Sets/src/mage/sets/masterseditionii/Icequake.java
index c963fa25c3..e9fa4fffbc 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Icequake.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Icequake.java
@@ -38,7 +38,7 @@ public class Icequake extends mage.sets.iceage.Icequake {
 
     public Icequake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/IcyPrison.java b/Mage.Sets/src/mage/sets/masterseditionii/IcyPrison.java
index d31b1d133f..eb06141986 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/IcyPrison.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/IcyPrison.java
@@ -38,7 +38,7 @@ public class IcyPrison extends mage.sets.iceage.IcyPrison {
 
     public IcyPrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/IhsansShade.java b/Mage.Sets/src/mage/sets/masterseditionii/IhsansShade.java
index 5593ad0202..25cd9182b1 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/IhsansShade.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/IhsansShade.java
@@ -39,7 +39,7 @@ public class IhsansShade extends mage.sets.homelands.IhsansShade {
 
     public IhsansShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ImperialRecruiter.java b/Mage.Sets/src/mage/sets/masterseditionii/ImperialRecruiter.java
index d0150f08b8..b5cc370402 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ImperialRecruiter.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ImperialRecruiter.java
@@ -38,7 +38,7 @@ public class ImperialRecruiter extends mage.sets.portalthreekingdoms.ImperialRec
 
     public ImperialRecruiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ImperialSeal.java b/Mage.Sets/src/mage/sets/masterseditionii/ImperialSeal.java
index e888aec599..7b4681dd8f 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ImperialSeal.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ImperialSeal.java
@@ -37,7 +37,7 @@ public class ImperialSeal extends mage.sets.portalthreekingdoms.ImperialSeal {
 
     public ImperialSeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Incinerate.java b/Mage.Sets/src/mage/sets/masterseditionii/Incinerate.java
index 1885f30276..5109f49078 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Inheritance.java b/Mage.Sets/src/mage/sets/masterseditionii/Inheritance.java
index e0c2911e51..cec88131a4 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Inheritance.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Inheritance.java
@@ -37,7 +37,7 @@ public class Inheritance extends mage.sets.alliances.Inheritance {
 
     public Inheritance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/IronclawOrcs.java b/Mage.Sets/src/mage/sets/masterseditionii/IronclawOrcs.java
index 7e0b31dd10..9e8fc5280a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/IronclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/IronclawOrcs.java
@@ -37,7 +37,7 @@ public class IronclawOrcs extends mage.sets.limitedalpha.IronclawOrcs {
 
     public IronclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/JohtullWurm.java b/Mage.Sets/src/mage/sets/masterseditionii/JohtullWurm.java
index 83618c0db6..4ec729bb5e 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/JohtullWurm.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/JohtullWurm.java
@@ -37,7 +37,7 @@ public class JohtullWurm extends mage.sets.iceage.JohtullWurm {
 
     public JohtullWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/JuniperOrderAdvocate.java b/Mage.Sets/src/mage/sets/masterseditionii/JuniperOrderAdvocate.java
index 2f69b9ee14..297ebbe330 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/JuniperOrderAdvocate.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/JuniperOrderAdvocate.java
@@ -37,7 +37,7 @@ public class JuniperOrderAdvocate extends mage.sets.alliances.JuniperOrderAdvoca
 
     public JuniperOrderAdvocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Kaysa.java b/Mage.Sets/src/mage/sets/masterseditionii/Kaysa.java
index 5f4c5bbff9..11d385e4cf 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Kaysa.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Kaysa.java
@@ -37,7 +37,7 @@ public class Kaysa extends mage.sets.alliances.Kaysa {
 
     public Kaysa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranDead.java b/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranDead.java
index 3332a17dc8..a2b42d0ba1 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranDead.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranDead.java
@@ -37,7 +37,7 @@ public class KjeldoranDead extends mage.sets.iceage.KjeldoranDead {
 
     public KjeldoranDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranOutpost.java b/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranOutpost.java
index 1e5170ac11..2a5bd88f9f 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranOutpost.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/KjeldoranOutpost.java
@@ -37,7 +37,7 @@ public class KjeldoranOutpost extends mage.sets.vintagemasters.KjeldoranOutpost
 
     public KjeldoranOutpost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/KnightOfStromgald.java b/Mage.Sets/src/mage/sets/masterseditionii/KnightOfStromgald.java
index 221d23aee7..ad60e8ab00 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/KnightOfStromgald.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/KnightOfStromgald.java
@@ -38,7 +38,7 @@ public class KnightOfStromgald extends mage.sets.iceage.KnightOfStromgald {
 
     public KnightOfStromgald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/KrovikanFetish.java b/Mage.Sets/src/mage/sets/masterseditionii/KrovikanFetish.java
index dd4f06c1a9..8b3640ba68 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/KrovikanFetish.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/KrovikanFetish.java
@@ -37,7 +37,7 @@ public class KrovikanFetish extends mage.sets.fifthedition.KrovikanFetish {
 
     public KrovikanFetish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/KrovikanSorcerer.java b/Mage.Sets/src/mage/sets/masterseditionii/KrovikanSorcerer.java
index 03d136fcee..0caee91137 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/KrovikanSorcerer.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/KrovikanSorcerer.java
@@ -37,7 +37,7 @@ public class KrovikanSorcerer extends mage.sets.vintagemasters.KrovikanSorcerer
 
     public KrovikanSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/LeapingLizard.java b/Mage.Sets/src/mage/sets/masterseditionii/LeapingLizard.java
index c75dcbc729..5bcea6cb66 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/LeapingLizard.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/LeapingLizard.java
@@ -37,7 +37,7 @@ public class LeapingLizard extends mage.sets.homelands.LeapingLizard {
 
     public LeapingLizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/LimDulsHighGuard.java b/Mage.Sets/src/mage/sets/masterseditionii/LimDulsHighGuard.java
index 5fa1e9b10f..55a3a67120 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/LimDulsHighGuard.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/LimDulsHighGuard.java
@@ -38,7 +38,7 @@ public class LimDulsHighGuard extends mage.sets.alliances.LimDulsHighGuard1 {
 
     public LimDulsHighGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/MagusOfTheUnseen.java b/Mage.Sets/src/mage/sets/masterseditionii/MagusOfTheUnseen.java
index 24d81e5fa0..d2c2d39902 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/MagusOfTheUnseen.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/MagusOfTheUnseen.java
@@ -37,7 +37,7 @@ public class MagusOfTheUnseen extends mage.sets.iceage.MagusOfTheUnseen {
 
     public MagusOfTheUnseen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ManaCrypt.java b/Mage.Sets/src/mage/sets/masterseditionii/ManaCrypt.java
index dd1a116b5a..3ab25d8248 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ManaCrypt.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ManaCrypt.java
@@ -38,7 +38,7 @@ public class ManaCrypt extends mage.sets.vintagemasters.ManaCrypt {
 
     public ManaCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Narwhal.java b/Mage.Sets/src/mage/sets/masterseditionii/Narwhal.java
index 886e5b9e28..3f345efb52 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Narwhal.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Narwhal.java
@@ -38,7 +38,7 @@ public class Narwhal extends mage.sets.homelands.Narwhal {
 
     public Narwhal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Necrite.java b/Mage.Sets/src/mage/sets/masterseditionii/Necrite.java
index 2fc7e4fd14..5bb0b1afe6 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Necrite.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Necrite.java
@@ -37,7 +37,7 @@ public class Necrite extends mage.sets.fallenempires.Necrite1 {
 
     public Necrite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Necropotence.java b/Mage.Sets/src/mage/sets/masterseditionii/Necropotence.java
index 0a9b96345b..99c0431fd1 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Necropotence.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Necropotence.java
@@ -37,7 +37,7 @@ public class Necropotence extends mage.sets.iceage.Necropotence {
 
     public Necropotence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java b/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java
index 6b11ebf417..7aefeae3d6 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java
@@ -38,7 +38,7 @@ public class NightSoil extends mage.sets.fallenempires.NightSoil1 {
 
     public NightSoil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/OrcGeneral.java b/Mage.Sets/src/mage/sets/masterseditionii/OrcGeneral.java
index a764d465bf..d44f0b2ffc 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/OrcGeneral.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/OrcGeneral.java
@@ -37,7 +37,7 @@ public class OrcGeneral extends mage.sets.thedark.OrcGeneral {
 
     public OrcGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/OrcishCannoneers.java b/Mage.Sets/src/mage/sets/masterseditionii/OrcishCannoneers.java
index ad2ace68f8..a4aa2caf24 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/OrcishCannoneers.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/OrcishCannoneers.java
@@ -38,7 +38,7 @@ public class OrcishCannoneers extends mage.sets.iceage.OrcishCannoneers {
 
     public OrcishCannoneers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/OrcishLumberjack.java b/Mage.Sets/src/mage/sets/masterseditionii/OrcishLumberjack.java
index ec21b65d39..5df4837b08 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/OrcishLumberjack.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/OrcishLumberjack.java
@@ -37,7 +37,7 @@ public class OrcishLumberjack extends mage.sets.heroesvsmonsters.OrcishLumberjac
 
     public OrcishLumberjack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheSacredTorch.java
index cfd17f5e37..460f997596 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheSacredTorch.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheSacredTorch.java
@@ -37,7 +37,7 @@ public class OrderOfTheSacredTorch extends mage.sets.iceage.OrderOfTheSacredTorc
 
     public OrderOfTheSacredTorch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheWhiteShield.java b/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheWhiteShield.java
index 0f056198a8..c9b39ab918 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheWhiteShield.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/OrderOfTheWhiteShield.java
@@ -38,7 +38,7 @@ public class OrderOfTheWhiteShield extends mage.sets.iceage.OrderOfTheWhiteShiel
 
     public OrderOfTheWhiteShield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/PersonalTutor.java b/Mage.Sets/src/mage/sets/masterseditionii/PersonalTutor.java
index 919100155c..ceaeae23e5 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/PersonalTutor.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/PersonalTutor.java
@@ -37,7 +37,7 @@ public class PersonalTutor extends mage.sets.portal.PersonalTutor {
 
     public PersonalTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/PhyrexianDevourer.java b/Mage.Sets/src/mage/sets/masterseditionii/PhyrexianDevourer.java
index f657351694..52cca3e5e1 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/PhyrexianDevourer.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/PhyrexianDevourer.java
@@ -38,7 +38,7 @@ public class PhyrexianDevourer extends mage.sets.alliances.PhyrexianDevourer {
 
     public PhyrexianDevourer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Pillage.java b/Mage.Sets/src/mage/sets/masterseditionii/Pillage.java
index e7b8c6918f..62118a06a6 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Pillage.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Pillage.java
@@ -37,7 +37,7 @@ public class Pillage extends mage.sets.seventhedition.Pillage {
 
     public Pillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Portent.java b/Mage.Sets/src/mage/sets/masterseditionii/Portent.java
index 1043b05b2e..c24a634942 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Portent.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Portent.java
@@ -37,7 +37,7 @@ public class Portent extends mage.sets.fifthedition.Portent {
 
     public Portent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Pyrokinesis.java b/Mage.Sets/src/mage/sets/masterseditionii/Pyrokinesis.java
index 9d1bba9025..ae10f36b1a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Pyrokinesis.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Pyrokinesis.java
@@ -38,7 +38,7 @@ public class Pyrokinesis extends mage.sets.alliances.Pyrokinesis {
 
     public Pyrokinesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/RavagesOfWar.java b/Mage.Sets/src/mage/sets/masterseditionii/RavagesOfWar.java
index 8ca99e671a..575a37f791 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/RavagesOfWar.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/RavagesOfWar.java
@@ -37,7 +37,7 @@ public class RavagesOfWar extends mage.sets.portalthreekingdoms.RavagesOfWar {
 
     public RavagesOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/RayOfCommand.java b/Mage.Sets/src/mage/sets/masterseditionii/RayOfCommand.java
index 6f335214e8..2580b6fa7b 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/RayOfCommand.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/RayOfCommand.java
@@ -38,7 +38,7 @@ public class RayOfCommand extends mage.sets.iceage.RayOfCommand {
 
     public RayOfCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Reprisal.java b/Mage.Sets/src/mage/sets/masterseditionii/Reprisal.java
index f169c8a66f..b25407dddf 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Reprisal.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Reprisal.java
@@ -38,7 +38,7 @@ public class Reprisal extends mage.sets.seventhedition.Reprisal {
 
     public Reprisal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/RighteousFury.java b/Mage.Sets/src/mage/sets/masterseditionii/RighteousFury.java
index 974a88ff66..7f9379fd49 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/RighteousFury.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/RighteousFury.java
@@ -37,7 +37,7 @@ public class RighteousFury extends mage.sets.starter1999.RighteousFury {
 
     public RighteousFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Roterothopter.java b/Mage.Sets/src/mage/sets/masterseditionii/Roterothopter.java
index 74f2932bf3..856b7a95fe 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Roterothopter.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Roterothopter.java
@@ -37,7 +37,7 @@ public class Roterothopter extends mage.sets.homelands.Roterothopter {
 
     public Roterothopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/RoyalTrooper.java b/Mage.Sets/src/mage/sets/masterseditionii/RoyalTrooper.java
index 4378fa74d2..5ce2a6c72c 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/RoyalTrooper.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/RoyalTrooper.java
@@ -38,7 +38,7 @@ public class RoyalTrooper extends mage.sets.starter1999.RoyalTrooper {
 
     public RoyalTrooper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/RuinsOfTrokair.java b/Mage.Sets/src/mage/sets/masterseditionii/RuinsOfTrokair.java
index a4a71a24a0..fb5972f13a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/RuinsOfTrokair.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/RuinsOfTrokair.java
@@ -37,7 +37,7 @@ public class RuinsOfTrokair extends mage.sets.fallenempires.RuinsOfTrokair {
 
     public RuinsOfTrokair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Savannah.java b/Mage.Sets/src/mage/sets/masterseditionii/Savannah.java
index 01c806195d..25c3cb94ef 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Savannah.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Savannah.java
@@ -37,7 +37,7 @@ public class Savannah extends mage.sets.limitedalpha.Savannah {
 
     public Savannah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SibilantSpirit.java b/Mage.Sets/src/mage/sets/masterseditionii/SibilantSpirit.java
index 1abe08de8f..78cb415c2a 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SibilantSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SibilantSpirit.java
@@ -37,7 +37,7 @@ public class SibilantSpirit extends mage.sets.iceage.SibilantSpirit {
 
     public SibilantSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SkeletonShip.java b/Mage.Sets/src/mage/sets/masterseditionii/SkeletonShip.java
index 96b1af5b4e..6c2adeccf7 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SkeletonShip.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SkeletonShip.java
@@ -37,7 +37,7 @@ public class SkeletonShip extends mage.sets.iceage.SkeletonShip {
 
     public SkeletonShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SkullCatapult.java b/Mage.Sets/src/mage/sets/masterseditionii/SkullCatapult.java
index e458276866..3800913c93 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SkullCatapult.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SkullCatapult.java
@@ -37,7 +37,7 @@ public class SkullCatapult extends mage.sets.iceage.SkullCatapult {
 
     public SkullCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredForest.java b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredForest.java
index c0efc10526..e62f7ce751 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredForest.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredForest.java
@@ -39,7 +39,7 @@ public class SnowCoveredForest extends mage.sets.iceage.SnowCoveredForest {
 
     public SnowCoveredForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredIsland.java b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredIsland.java
index 6d9344178d..7d782f2d0c 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredIsland.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredIsland.java
@@ -39,7 +39,7 @@ public class SnowCoveredIsland extends mage.sets.iceage.SnowCoveredIsland {
 
     public SnowCoveredIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredMountain.java b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredMountain.java
index e85239f654..fc0cce4086 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredMountain.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredMountain.java
@@ -39,7 +39,7 @@ public class SnowCoveredMountain extends mage.sets.iceage.SnowCoveredMountain {
 
     public SnowCoveredMountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredPlains.java b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredPlains.java
index e360dd35fc..71473c47f0 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredPlains.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredPlains.java
@@ -39,7 +39,7 @@ public class SnowCoveredPlains extends mage.sets.iceage.SnowCoveredPlains {
 
     public SnowCoveredPlains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredSwamp.java b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredSwamp.java
index b6971954d4..7cd39e4edb 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredSwamp.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SnowCoveredSwamp.java
@@ -39,7 +39,7 @@ public class SnowCoveredSwamp extends mage.sets.iceage.SnowCoveredSwamp {
 
     public SnowCoveredSwamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SoldeviDigger.java b/Mage.Sets/src/mage/sets/masterseditionii/SoldeviDigger.java
index bc4d929132..6922f7eee4 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SoldeviDigger.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SoldeviDigger.java
@@ -38,7 +38,7 @@ public class SoldeviDigger extends mage.sets.alliances.SoldeviDigger {
 
     public SoldeviDigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SoldeviExcavations.java b/Mage.Sets/src/mage/sets/masterseditionii/SoldeviExcavations.java
index 3def0f4861..0f4c544573 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SoldeviExcavations.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SoldeviExcavations.java
@@ -37,7 +37,7 @@ public class SoldeviExcavations extends mage.sets.alliances.SoldeviExcavations {
 
     public SoldeviExcavations(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SongsOfTheDamned.java b/Mage.Sets/src/mage/sets/masterseditionii/SongsOfTheDamned.java
index 6b3ad030a2..06310466b2 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SongsOfTheDamned.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SongsOfTheDamned.java
@@ -37,7 +37,7 @@ public class SongsOfTheDamned extends mage.sets.iceage.SongsOfTheDamned {
 
     public SongsOfTheDamned(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SporeFlower.java b/Mage.Sets/src/mage/sets/masterseditionii/SporeFlower.java
index e31dcc7dec..308ceb7e02 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SporeFlower.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SporeFlower.java
@@ -37,7 +37,7 @@ public class SporeFlower extends mage.sets.fallenempires.SporeFlower {
 
     public SporeFlower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Stampede.java b/Mage.Sets/src/mage/sets/masterseditionii/Stampede.java
index 55d8109c24..529c675bc4 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Stampede.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Stampede.java
@@ -38,7 +38,7 @@ public class Stampede extends mage.sets.iceage.Stampede {
 
     public Stampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/StoneSpirit.java b/Mage.Sets/src/mage/sets/masterseditionii/StoneSpirit.java
index 17418414e2..82963c6683 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/StoneSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/StoneSpirit.java
@@ -37,7 +37,7 @@ public class StoneSpirit extends mage.sets.iceage.StoneSpirit {
 
     public StoneSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Stonehands.java b/Mage.Sets/src/mage/sets/masterseditionii/Stonehands.java
index 6e666840ff..6cea27baac 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Stonehands.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Stonehands.java
@@ -37,7 +37,7 @@ public class Stonehands extends mage.sets.iceage.Stonehands {
 
     public Stonehands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/StromgaldCabal.java b/Mage.Sets/src/mage/sets/masterseditionii/StromgaldCabal.java
index e4b72f9c93..20bd6577de 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/StromgaldCabal.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/StromgaldCabal.java
@@ -37,7 +37,7 @@ public class StromgaldCabal extends mage.sets.iceage.StromgaldCabal {
 
     public StromgaldCabal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/StuntedGrowth.java b/Mage.Sets/src/mage/sets/masterseditionii/StuntedGrowth.java
index aaf61bb67e..23ad0c6ad0 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/StuntedGrowth.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/StuntedGrowth.java
@@ -37,7 +37,7 @@ public class StuntedGrowth extends mage.sets.iceage.StuntedGrowth {
 
     public StuntedGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SustainingSpirit.java b/Mage.Sets/src/mage/sets/masterseditionii/SustainingSpirit.java
index 3ffcdfa1da..c9b5b6efe8 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SustainingSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SustainingSpirit.java
@@ -37,7 +37,7 @@ public class SustainingSpirit extends mage.sets.alliances.SustainingSpirit {
 
     public SustainingSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SvyeluniteTemple.java b/Mage.Sets/src/mage/sets/masterseditionii/SvyeluniteTemple.java
index c3ed012428..746d649702 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SvyeluniteTemple.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SvyeluniteTemple.java
@@ -37,7 +37,7 @@ public class SvyeluniteTemple extends mage.sets.fallenempires.SvyeluniteTemple {
 
     public SvyeluniteTemple(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/masterseditionii/SwordsToPlowshares.java
index 5d2ba00560..c3f6400a8e 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Taiga.java b/Mage.Sets/src/mage/sets/masterseditionii/Taiga.java
index aaaad86292..bc73094c3c 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Taiga.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Taiga.java
@@ -37,7 +37,7 @@ public class Taiga extends mage.sets.limitedalpha.Taiga {
 
     public Taiga(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/TemporalManipulation.java b/Mage.Sets/src/mage/sets/masterseditionii/TemporalManipulation.java
index da4b346df7..6f6020c6f9 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/TemporalManipulation.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/TemporalManipulation.java
@@ -37,7 +37,7 @@ public class TemporalManipulation extends mage.sets.portalsecondage.TemporalMani
 
     public TemporalManipulation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Thallid.java b/Mage.Sets/src/mage/sets/masterseditionii/Thallid.java
index 17e992a317..cb66245b9b 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Thallid.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Thallid.java
@@ -38,7 +38,7 @@ public class Thallid extends mage.sets.timeshifted.Thallid {
 
     public Thallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ThallidDevourer.java b/Mage.Sets/src/mage/sets/masterseditionii/ThallidDevourer.java
index ed6970a921..ef924f1398 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ThallidDevourer.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ThallidDevourer.java
@@ -38,7 +38,7 @@ public class ThallidDevourer extends mage.sets.fallenempires.ThallidDevourer {
 
     public ThallidDevourer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ThunderWall.java b/Mage.Sets/src/mage/sets/masterseditionii/ThunderWall.java
index 36b86f40ae..65f8c552bc 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ThunderWall.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ThunderWall.java
@@ -37,7 +37,7 @@ public class ThunderWall extends mage.sets.iceage.ThunderWall {
 
     public ThunderWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/TinderWall.java b/Mage.Sets/src/mage/sets/masterseditionii/TinderWall.java
index dbbc40ac94..23e0f45aa2 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/TinderWall.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/TinderWall.java
@@ -37,7 +37,7 @@ public class TinderWall extends mage.sets.iceage.TinderWall {
 
     public TinderWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Tundra.java b/Mage.Sets/src/mage/sets/masterseditionii/Tundra.java
index 779f8d0795..00a38d3f60 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Tundra.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Tundra.java
@@ -37,7 +37,7 @@ public class Tundra extends mage.sets.limitedalpha.Tundra {
 
     public Tundra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/UndergroundSea.java b/Mage.Sets/src/mage/sets/masterseditionii/UndergroundSea.java
index a4a87653a2..06b4e13ae1 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/UndergroundSea.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/UndergroundSea.java
@@ -37,7 +37,7 @@ public class UndergroundSea extends mage.sets.limitedalpha.UndergroundSea {
 
     public UndergroundSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/WallOfKelp.java b/Mage.Sets/src/mage/sets/masterseditionii/WallOfKelp.java
index 46ee334444..4d41ce9e33 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/WallOfKelp.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/WallOfKelp.java
@@ -38,7 +38,7 @@ public class WallOfKelp extends mage.sets.homelands.WallOfKelp {
 
     public WallOfKelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/Whiteout.java b/Mage.Sets/src/mage/sets/masterseditionii/Whiteout.java
index 6881b85549..f9ab0da046 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/Whiteout.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/Whiteout.java
@@ -38,7 +38,7 @@ public class Whiteout extends mage.sets.iceage.Whiteout {
 
     public Whiteout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "ME2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/WindSpirit.java b/Mage.Sets/src/mage/sets/masterseditionii/WindSpirit.java
index 65adb3ce3c..672ed709e0 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/WindSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/WindSpirit.java
@@ -37,7 +37,7 @@ public class WindSpirit extends mage.sets.iceage.WindSpirit {
 
     public WindSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ZuranSpellcaster.java b/Mage.Sets/src/mage/sets/masterseditionii/ZuranSpellcaster.java
index adcfb3d9ff..1f77ad8e4b 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/ZuranSpellcaster.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ZuranSpellcaster.java
@@ -37,7 +37,7 @@ public class ZuranSpellcaster extends mage.sets.iceage.ZuranSpellcaster {
 
     public ZuranSpellcaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "ME2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ActiveVolcano.java b/Mage.Sets/src/mage/sets/masterseditioniii/ActiveVolcano.java
index 6a68b4b5b6..0b12829e27 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ActiveVolcano.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ActiveVolcano.java
@@ -38,7 +38,7 @@ public class ActiveVolcano extends mage.sets.legends.ActiveVolcano {
 
     public ActiveVolcano(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/AkronLegionnaire.java b/Mage.Sets/src/mage/sets/masterseditioniii/AkronLegionnaire.java
index 5bb81617df..3c5c6ca425 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/AkronLegionnaire.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/AkronLegionnaire.java
@@ -37,7 +37,7 @@ public class AkronLegionnaire extends mage.sets.legends.AkronLegionnaire {
 
     public AkronLegionnaire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/AmrouKithkin.java b/Mage.Sets/src/mage/sets/masterseditioniii/AmrouKithkin.java
index 4faa50a497..cf50ba7c35 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/AmrouKithkin.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/AmrouKithkin.java
@@ -37,7 +37,7 @@ public class AmrouKithkin extends mage.sets.legends.AmrouKithkin {
 
     public AmrouKithkin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/AnabaAncestor.java b/Mage.Sets/src/mage/sets/masterseditioniii/AnabaAncestor.java
index 8d59472a31..cf6522c338 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/AnabaAncestor.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/AnabaAncestor.java
@@ -38,7 +38,7 @@ public class AnabaAncestor extends mage.sets.homelands.AnabaAncestor {
 
     public AnabaAncestor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/AnabaSpiritCrafter.java b/Mage.Sets/src/mage/sets/masterseditioniii/AnabaSpiritCrafter.java
index d960361a52..72847b74ca 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/AnabaSpiritCrafter.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/AnabaSpiritCrafter.java
@@ -38,7 +38,7 @@ public class AnabaSpiritCrafter extends mage.sets.homelands.AnabaSpiritCrafter {
 
     public AnabaSpiritCrafter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/AngusMackenzie.java b/Mage.Sets/src/mage/sets/masterseditioniii/AngusMackenzie.java
index bdec98c1cf..cfbee7a12f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/AngusMackenzie.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/AngusMackenzie.java
@@ -37,7 +37,7 @@ public class AngusMackenzie extends mage.sets.legends.AngusMackenzie {
 
     public AngusMackenzie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ArenaOfTheAncients.java b/Mage.Sets/src/mage/sets/masterseditioniii/ArenaOfTheAncients.java
index eedcbb7d30..5126fdbb6c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ArenaOfTheAncients.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ArenaOfTheAncients.java
@@ -37,7 +37,7 @@ public class ArenaOfTheAncients extends mage.sets.legends.ArenaOfTheAncients {
 
     public ArenaOfTheAncients(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/AshesToAshes.java b/Mage.Sets/src/mage/sets/masterseditioniii/AshesToAshes.java
index 3e1a45cce6..4121098072 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/AshesToAshes.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/AshesToAshes.java
@@ -37,7 +37,7 @@ public class AshesToAshes extends mage.sets.fifthedition.AshesToAshes {
 
     public AshesToAshes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BarktoothWarbeard.java b/Mage.Sets/src/mage/sets/masterseditioniii/BarktoothWarbeard.java
index ba990caaf4..7cb9cec58b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BarktoothWarbeard.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BarktoothWarbeard.java
@@ -38,7 +38,7 @@ public class BarktoothWarbeard extends mage.sets.legends.BarktoothWarbeard {
 
     public BarktoothWarbeard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BarlsCage.java b/Mage.Sets/src/mage/sets/masterseditioniii/BarlsCage.java
index 35d41b5da4..ecbfb5088b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BarlsCage.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BarlsCage.java
@@ -37,7 +37,7 @@ public class BarlsCage extends mage.sets.thedark.BarlsCage {
 
     public BarlsCage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BartelRuneaxe.java b/Mage.Sets/src/mage/sets/masterseditioniii/BartelRuneaxe.java
index 7ec093f93e..d203a4f745 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BartelRuneaxe.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BartelRuneaxe.java
@@ -38,7 +38,7 @@ public class BartelRuneaxe extends mage.sets.legends.BartelRuneaxe {
 
     public BartelRuneaxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Bayou.java b/Mage.Sets/src/mage/sets/masterseditioniii/Bayou.java
index 1274576bde..8d164eb381 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Bayou.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Bayou.java
@@ -37,7 +37,7 @@ public class Bayou extends mage.sets.limitedalpha.Bayou {
 
     public Bayou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BazaarOfBaghdad.java b/Mage.Sets/src/mage/sets/masterseditioniii/BazaarOfBaghdad.java
index 439b06ed97..8f39323114 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BazaarOfBaghdad.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BazaarOfBaghdad.java
@@ -38,7 +38,7 @@ public class BazaarOfBaghdad extends mage.sets.arabiannights.BazaarOfBaghdad {
 
     public BazaarOfBaghdad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BlackVise.java b/Mage.Sets/src/mage/sets/masterseditioniii/BlackVise.java
index d0352c5ff2..29808cbb87 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BlackVise.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BlackVise.java
@@ -38,7 +38,7 @@ public class BlackVise extends mage.sets.limitedalpha.BlackVise {
 
     public BlackVise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BloodLust.java b/Mage.Sets/src/mage/sets/masterseditioniii/BloodLust.java
index 557710dffc..28e346299f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BloodLust.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BloodLust.java
@@ -37,7 +37,7 @@ public class BloodLust extends mage.sets.fourthedition.BloodLust {
 
     public BloodLust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Boomerang.java b/Mage.Sets/src/mage/sets/masterseditioniii/Boomerang.java
index 021b2f3068..e167ac8f36 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BorisDevilboon.java b/Mage.Sets/src/mage/sets/masterseditioniii/BorisDevilboon.java
index 8cfef4b8f0..270e737c80 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BorisDevilboon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BorisDevilboon.java
@@ -38,7 +38,7 @@ public class BorisDevilboon extends mage.sets.legends.BorisDevilboon {
 
     public BorisDevilboon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Borrowing100000Arrows.java b/Mage.Sets/src/mage/sets/masterseditioniii/Borrowing100000Arrows.java
index 8e12a1e308..30bda13e07 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Borrowing100000Arrows.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Borrowing100000Arrows.java
@@ -37,7 +37,7 @@ public class Borrowing100000Arrows extends mage.sets.commander2013.Borrowing1000
 
     public Borrowing100000Arrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BrilliantPlan.java b/Mage.Sets/src/mage/sets/masterseditioniii/BrilliantPlan.java
index bcae5b2eda..ae3ed4c883 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BrilliantPlan.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BrilliantPlan.java
@@ -38,7 +38,7 @@ public class BrilliantPlan extends mage.sets.commander2013.BrilliantPlan {
 
     public BrilliantPlan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/BurningOfXinye.java b/Mage.Sets/src/mage/sets/masterseditioniii/BurningOfXinye.java
index ee31854a8e..1d730715e5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/BurningOfXinye.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/BurningOfXinye.java
@@ -37,7 +37,7 @@ public class BurningOfXinye extends mage.sets.portalthreekingdoms.BurningOfXinye
 
     public BurningOfXinye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CaptureOfJingzhou.java b/Mage.Sets/src/mage/sets/masterseditioniii/CaptureOfJingzhou.java
index f9ab2a2359..602920bbd2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CaptureOfJingzhou.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CaptureOfJingzhou.java
@@ -37,7 +37,7 @@ public class CaptureOfJingzhou extends mage.sets.portalthreekingdoms.CaptureOfJi
 
     public CaptureOfJingzhou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CarrionAnts.java b/Mage.Sets/src/mage/sets/masterseditioniii/CarrionAnts.java
index 6582c74faa..246edb995a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CarrionAnts.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CarrionAnts.java
@@ -37,7 +37,7 @@ public class CarrionAnts extends mage.sets.fifthedition.CarrionAnts {
 
     public CarrionAnts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ChainLightning.java b/Mage.Sets/src/mage/sets/masterseditioniii/ChainLightning.java
index 6abcdb40cf..9053640602 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ChainLightning.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ChainLightning.java
@@ -37,7 +37,7 @@ public class ChainLightning extends mage.sets.legends.ChainLightning {
 
     public ChainLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CinderStorm.java b/Mage.Sets/src/mage/sets/masterseditioniii/CinderStorm.java
index a5a7aedac9..d6934fd8ac 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CinderStorm.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CinderStorm.java
@@ -37,7 +37,7 @@ public class CinderStorm extends mage.sets.starter1999.CinderStorm {
 
     public CinderStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CityOfShadows.java b/Mage.Sets/src/mage/sets/masterseditioniii/CityOfShadows.java
index e22c114e82..52b4e8d465 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CityOfShadows.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CityOfShadows.java
@@ -37,7 +37,7 @@ public class CityOfShadows extends mage.sets.thedark.CityOfShadows {
 
     public CityOfShadows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Cleanse.java b/Mage.Sets/src/mage/sets/masterseditioniii/Cleanse.java
index ca562ef474..edd828bf89 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Cleanse.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Cleanse.java
@@ -37,7 +37,7 @@ public class Cleanse extends mage.sets.legends.Cleanse {
 
     public Cleanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CosmicHorror.java b/Mage.Sets/src/mage/sets/masterseditioniii/CosmicHorror.java
index 85715cf8bc..960b442287 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CosmicHorror.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CosmicHorror.java
@@ -37,7 +37,7 @@ public class CosmicHorror extends mage.sets.legends.CosmicHorror {
 
     public CosmicHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonKobolds.java b/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonKobolds.java
index c2e5451ac4..c80d1ade02 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonKobolds.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonKobolds.java
@@ -37,7 +37,7 @@ public class CrimsonKobolds extends mage.sets.legends.CrimsonKobolds {
 
     public CrimsonKobolds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonManticore.java b/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonManticore.java
index 2704aadb74..ad8ea37e9d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonManticore.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/CrimsonManticore.java
@@ -38,7 +38,7 @@ public class CrimsonManticore extends mage.sets.legends.CrimsonManticore {
 
     public CrimsonManticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DAvenantArcher.java b/Mage.Sets/src/mage/sets/masterseditioniii/DAvenantArcher.java
index 0c47d87993..16bb968e2c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/DAvenantArcher.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/DAvenantArcher.java
@@ -37,7 +37,7 @@ public class DAvenantArcher extends mage.sets.fifthedition.DAvenantArcher {
 
     public DAvenantArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DanceOfMany.java b/Mage.Sets/src/mage/sets/masterseditioniii/DanceOfMany.java
index d884e8da31..dbaa297ede 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/DanceOfMany.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/DanceOfMany.java
@@ -38,7 +38,7 @@ public class DanceOfMany extends mage.sets.thedark.DanceOfMany {
 
     public DanceOfMany(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DemonicTorment.java b/Mage.Sets/src/mage/sets/masterseditioniii/DemonicTorment.java
index d9bef9bc3e..d9b4f24726 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/DemonicTorment.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/DemonicTorment.java
@@ -38,7 +38,7 @@ public class DemonicTorment extends mage.sets.legends.DemonicTorment {
 
     public DemonicTorment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DesertTwister.java b/Mage.Sets/src/mage/sets/masterseditioniii/DesertTwister.java
index f3c293adcf..a154719e1b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DesperateCharge.java b/Mage.Sets/src/mage/sets/masterseditioniii/DesperateCharge.java
index 9d280a85b1..443b10a1f3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/DesperateCharge.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/DesperateCharge.java
@@ -38,7 +38,7 @@ public class DesperateCharge extends mage.sets.portalthreekingdoms.DesperateChar
 
     public DesperateCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Didgeridoo.java b/Mage.Sets/src/mage/sets/masterseditioniii/Didgeridoo.java
index 1fc910df5e..79ad5de327 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Didgeridoo.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Didgeridoo.java
@@ -38,7 +38,7 @@ public class Didgeridoo extends mage.sets.homelands.Didgeridoo {
 
     public Didgeridoo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Disenchant.java b/Mage.Sets/src/mage/sets/masterseditioniii/Disenchant.java
index f61fc3ba5a..7ab7a53876 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DongZhouTheTyrant.java b/Mage.Sets/src/mage/sets/masterseditioniii/DongZhouTheTyrant.java
index 979841a4a1..88e9a91f6f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/DongZhouTheTyrant.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/DongZhouTheTyrant.java
@@ -37,7 +37,7 @@ public class DongZhouTheTyrant extends mage.sets.portalthreekingdoms.DongZhouThe
 
     public DongZhouTheTyrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/masterseditioniii/ElvesOfDeepShadow.java
index 91da6514cc..cbfde95af1 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ElvesOfDeepShadow.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ElvesOfDeepShadow.java
@@ -37,7 +37,7 @@ public class ElvesOfDeepShadow extends mage.sets.ravnica.ElvesOfDeepShadow {
 
     public ElvesOfDeepShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/EvilPresence.java b/Mage.Sets/src/mage/sets/masterseditioniii/EvilPresence.java
index 72c6b2396a..e565404ab3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/EvilPresence.java
@@ -37,7 +37,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Famine.java b/Mage.Sets/src/mage/sets/masterseditioniii/Famine.java
index 960c9333bd..b60e24c1d3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Famine.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Famine.java
@@ -37,7 +37,7 @@ public class Famine extends mage.sets.commander2013.Famine {
 
     public Famine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/FellwarStone.java b/Mage.Sets/src/mage/sets/masterseditioniii/FellwarStone.java
index 02a9f84be6..102f681d81 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/FellwarStone.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/FellwarStone.java
@@ -38,7 +38,7 @@ public class FellwarStone extends mage.sets.ninthedition.FellwarStone {
 
     public FellwarStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/FeveredStrength.java b/Mage.Sets/src/mage/sets/masterseditioniii/FeveredStrength.java
index 47fd69436c..8048c506be 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/FeveredStrength.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/FeveredStrength.java
@@ -37,7 +37,7 @@ public class FeveredStrength extends mage.sets.alliances.FeveredStrength1 {
 
     public FeveredStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/FireAmbush.java b/Mage.Sets/src/mage/sets/masterseditioniii/FireAmbush.java
index 20a2913cdb..0e79939e49 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/FireAmbush.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/FireAmbush.java
@@ -38,7 +38,7 @@ public class FireAmbush extends mage.sets.portalthreekingdoms.FireAmbush {
 
     public FireAmbush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/FireDrake.java b/Mage.Sets/src/mage/sets/masterseditioniii/FireDrake.java
index 5b666528c6..18f1f0eb65 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/FireDrake.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/FireDrake.java
@@ -38,7 +38,7 @@ public class FireDrake extends mage.sets.fifthedition.FireDrake {
 
     public FireDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/FlashFlood.java b/Mage.Sets/src/mage/sets/masterseditioniii/FlashFlood.java
index cc1492092c..0ed8ebeda9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/FlashFlood.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/FlashFlood.java
@@ -38,7 +38,7 @@ public class FlashFlood extends mage.sets.legends.FlashFlood {
 
     public FlashFlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ForceSpike.java b/Mage.Sets/src/mage/sets/masterseditioniii/ForceSpike.java
index 373bafbdf3..62eba60aec 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ForceSpike.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ForceSpike.java
@@ -37,7 +37,7 @@ public class ForceSpike extends mage.sets.seventhedition.ForceSpike {
 
     public ForceSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/FrostGiant.java b/Mage.Sets/src/mage/sets/masterseditioniii/FrostGiant.java
index 1168d85379..99454759dc 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/FrostGiant.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/FrostGiant.java
@@ -37,7 +37,7 @@ public class FrostGiant extends mage.sets.legends.FrostGiant {
 
     public FrostGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/GaeasTouch.java b/Mage.Sets/src/mage/sets/masterseditioniii/GaeasTouch.java
index 01fee30e1a..37c05780f5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/GaeasTouch.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/GaeasTouch.java
@@ -38,7 +38,7 @@ public class GaeasTouch extends mage.sets.thedark.GaeasTouch {
 
     public GaeasTouch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/GhostlyVisit.java b/Mage.Sets/src/mage/sets/masterseditioniii/GhostlyVisit.java
index 38b835704b..a0633fdcb0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/GhostlyVisit.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/GhostlyVisit.java
@@ -37,7 +37,7 @@ public class GhostlyVisit extends mage.sets.portalthreekingdoms.GhostlyVisit {
 
     public GhostlyVisit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/GiantGrowth.java b/Mage.Sets/src/mage/sets/masterseditioniii/GiantGrowth.java
index 4a0bbc78a5..ec2c5aba94 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/GrimTutor.java b/Mage.Sets/src/mage/sets/masterseditioniii/GrimTutor.java
index ce8263a548..bc60ba7d5e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/GrimTutor.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/GrimTutor.java
@@ -37,7 +37,7 @@ public class GrimTutor extends mage.sets.starter1999.GrimTutor {
 
     public GrimTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/GwendlynDiCorci.java b/Mage.Sets/src/mage/sets/masterseditioniii/GwendlynDiCorci.java
index 3fd8584248..47f91d3f79 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/GwendlynDiCorci.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/GwendlynDiCorci.java
@@ -37,7 +37,7 @@ public class GwendlynDiCorci extends mage.sets.legends.GwendlynDiCorci {
 
     public GwendlynDiCorci(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/HazezonTamar.java b/Mage.Sets/src/mage/sets/masterseditioniii/HazezonTamar.java
index 5fa257ebc0..3674fc69f1 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/HazezonTamar.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/HazezonTamar.java
@@ -37,7 +37,7 @@ public class HazezonTamar extends mage.sets.legends.HazezonTamar {
 
     public HazezonTamar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Heal.java b/Mage.Sets/src/mage/sets/masterseditioniii/Heal.java
index 050ebf5181..cce7d5d315 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Heal.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Heal.java
@@ -37,7 +37,7 @@ public class Heal extends mage.sets.iceage.Heal {
 
     public Heal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/HuaTuoHonoredPhysician.java b/Mage.Sets/src/mage/sets/masterseditioniii/HuaTuoHonoredPhysician.java
index 04a5c13f7e..22ccdbed7a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/HuaTuoHonoredPhysician.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/HuaTuoHonoredPhysician.java
@@ -37,7 +37,7 @@ public class HuaTuoHonoredPhysician extends mage.sets.commander2013.HuaTuoHonore
 
     public HuaTuoHonoredPhysician(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/HundingGjornersen.java b/Mage.Sets/src/mage/sets/masterseditioniii/HundingGjornersen.java
index 8cb63820a3..4dfc5738bb 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/HundingGjornersen.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/HundingGjornersen.java
@@ -37,7 +37,7 @@ public class HundingGjornersen extends mage.sets.legends.HundingGjornersen {
 
     public HundingGjornersen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/HuntingCheetah.java b/Mage.Sets/src/mage/sets/masterseditioniii/HuntingCheetah.java
index 75405ca014..ec79cda71d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/HuntingCheetah.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/HuntingCheetah.java
@@ -38,7 +38,7 @@ public class HuntingCheetah extends mage.sets.portalthreekingdoms.HuntingCheetah
 
     public HuntingCheetah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/masterseditioniii/HurloonMinotaur.java
index e9d8303839..727a7d6b57 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/HurloonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/HurloonMinotaur.java
@@ -37,7 +37,7 @@ public class HurloonMinotaur extends mage.sets.fifthedition.HurloonMinotaur {
 
     public HurloonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Immolation.java b/Mage.Sets/src/mage/sets/masterseditioniii/Immolation.java
index 5f3f42a876..183da18bfa 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Immolation.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Immolation.java
@@ -37,7 +37,7 @@ public class Immolation extends mage.sets.fourthedition.Immolation {
 
     public Immolation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Infuse.java b/Mage.Sets/src/mage/sets/masterseditioniii/Infuse.java
index a67a3b3f18..b30fe7baf7 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Infuse.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Infuse.java
@@ -37,7 +37,7 @@ public class Infuse extends mage.sets.iceage.Infuse {
 
     public Infuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/IvoryGuardians.java b/Mage.Sets/src/mage/sets/masterseditioniii/IvoryGuardians.java
index 02fea53675..d0c0f7efa9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/IvoryGuardians.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/IvoryGuardians.java
@@ -37,7 +37,7 @@ public class IvoryGuardians extends mage.sets.legends.IvoryGuardians {
 
     public IvoryGuardians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/JeditOjanen.java b/Mage.Sets/src/mage/sets/masterseditioniii/JeditOjanen.java
index 1bdbafef23..498ac8e11f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/JeditOjanen.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/JeditOjanen.java
@@ -38,7 +38,7 @@ public class JeditOjanen extends mage.sets.legends.JeditOjanen {
 
     public JeditOjanen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/JerrardOfTheClosedFist.java b/Mage.Sets/src/mage/sets/masterseditioniii/JerrardOfTheClosedFist.java
index a9761f3f93..1cbab306eb 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/JerrardOfTheClosedFist.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/JerrardOfTheClosedFist.java
@@ -38,7 +38,7 @@ public class JerrardOfTheClosedFist extends mage.sets.legends.JerrardOfTheClosed
 
     public JerrardOfTheClosedFist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/JungleLion.java b/Mage.Sets/src/mage/sets/masterseditioniii/JungleLion.java
index 3dee958c18..31475a9c94 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/JungleLion.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/JungleLion.java
@@ -38,7 +38,7 @@ public class JungleLion extends mage.sets.portal.JungleLion {
 
     public JungleLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Karakas.java b/Mage.Sets/src/mage/sets/masterseditioniii/Karakas.java
index 380bb2b7a5..27abf5093a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Karakas.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Karakas.java
@@ -38,7 +38,7 @@ public class Karakas extends mage.sets.legends.Karakas {
 
     public Karakas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/KillerBees.java b/Mage.Sets/src/mage/sets/masterseditioniii/KillerBees.java
index 2bf418b9bb..cec46c0297 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/KillerBees.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/KillerBees.java
@@ -37,7 +37,7 @@ public class KillerBees extends mage.sets.fifthedition.KillerBees {
 
     public KillerBees(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldOverlord.java b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldOverlord.java
index c642a81f79..1b26f4c77c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldOverlord.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldOverlord.java
@@ -38,7 +38,7 @@ public class KoboldOverlord extends mage.sets.legends.KoboldOverlord {
 
     public KoboldOverlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldTaskmaster.java b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldTaskmaster.java
index cb84871232..e9715180f8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldTaskmaster.java
@@ -38,7 +38,7 @@ public class KoboldTaskmaster extends mage.sets.timeshifted.KoboldTaskmaster {
 
     public KoboldTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldsOfKherKeep.java b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldsOfKherKeep.java
index 05a01f76e1..e6453a0404 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldsOfKherKeep.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldsOfKherKeep.java
@@ -37,7 +37,7 @@ public class KoboldsOfKherKeep extends mage.sets.legends.KoboldsOfKherKeep {
 
     public KoboldsOfKherKeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/KongmingSleepingDragon.java b/Mage.Sets/src/mage/sets/masterseditioniii/KongmingSleepingDragon.java
index 01c93ff129..4e1a9e7bd2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/KongmingSleepingDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/KongmingSleepingDragon.java
@@ -37,7 +37,7 @@ public class KongmingSleepingDragon extends mage.sets.commander2013.KongmingSlee
 
     public KongmingSleepingDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LadyEvangela.java b/Mage.Sets/src/mage/sets/masterseditioniii/LadyEvangela.java
index dea3fa5611..85578ef71a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LadyEvangela.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LadyEvangela.java
@@ -38,7 +38,7 @@ public class LadyEvangela extends mage.sets.legends.LadyEvangela {
 
     public LadyEvangela(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LadyOrca.java b/Mage.Sets/src/mage/sets/masterseditioniii/LadyOrca.java
index 8d618d29f7..7057ad3611 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LadyOrca.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LadyOrca.java
@@ -38,7 +38,7 @@ public class LadyOrca extends mage.sets.legends.LadyOrca {
 
     public LadyOrca(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LandTax.java b/Mage.Sets/src/mage/sets/masterseditioniii/LandTax.java
index 85a176d15d..0064be6fc3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LandTax.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LandTax.java
@@ -38,7 +38,7 @@ public class LandTax extends mage.sets.legends.LandTax {
 
     public LandTax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LightningBlow.java b/Mage.Sets/src/mage/sets/masterseditioniii/LightningBlow.java
index b536eee6dd..e5086a1906 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LightningBlow.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LightningBlow.java
@@ -38,7 +38,7 @@ public class LightningBlow extends mage.sets.iceage.LightningBlow {
 
     public LightningBlow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LiuBeiLordOfShu.java b/Mage.Sets/src/mage/sets/masterseditioniii/LiuBeiLordOfShu.java
index bb65ce63d2..6c0d068f2d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LiuBeiLordOfShu.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LiuBeiLordOfShu.java
@@ -37,7 +37,7 @@ public class LiuBeiLordOfShu extends mage.sets.portalthreekingdoms.LiuBeiLordOfS
 
     public LiuBeiLordOfShu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LivingPlane.java b/Mage.Sets/src/mage/sets/masterseditioniii/LivingPlane.java
index 65120905f4..9aa6965fae 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LivingPlane.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LivingPlane.java
@@ -37,7 +37,7 @@ public class LivingPlane extends mage.sets.legends.LivingPlane {
 
     public LivingPlane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LoyalRetainers.java b/Mage.Sets/src/mage/sets/masterseditioniii/LoyalRetainers.java
index 570af1cf2c..d05d4bc9f3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LoyalRetainers.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LoyalRetainers.java
@@ -37,7 +37,7 @@ public class LoyalRetainers extends mage.sets.portalthreekingdoms.LoyalRetainers
 
     public LoyalRetainers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LuMengWuGeneral.java b/Mage.Sets/src/mage/sets/masterseditioniii/LuMengWuGeneral.java
index d130f7d81f..bf3fe3c7f8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LuMengWuGeneral.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LuMengWuGeneral.java
@@ -38,7 +38,7 @@ public class LuMengWuGeneral extends mage.sets.portalthreekingdoms.LuMengWuGener
 
     public LuMengWuGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/LuXunScholarGeneral.java b/Mage.Sets/src/mage/sets/masterseditioniii/LuXunScholarGeneral.java
index b4dbba28d4..6b58ceed67 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/LuXunScholarGeneral.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/LuXunScholarGeneral.java
@@ -38,7 +38,7 @@ public class LuXunScholarGeneral extends mage.sets.commander2013.LuXunScholarGen
 
     public LuXunScholarGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ManaDrain.java b/Mage.Sets/src/mage/sets/masterseditioniii/ManaDrain.java
index 33d5d359c0..8aa0d149e0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ManaDrain.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ManaDrain.java
@@ -38,7 +38,7 @@ public class ManaDrain extends mage.sets.vintagemasters.ManaDrain {
 
     public ManaDrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/MarhaultElsdragon.java b/Mage.Sets/src/mage/sets/masterseditioniii/MarhaultElsdragon.java
index 45cbe988b4..d49c719b83 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/MarhaultElsdragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/MarhaultElsdragon.java
@@ -37,7 +37,7 @@ public class MarhaultElsdragon extends mage.sets.legends.MarhaultElsdragon {
 
     public MarhaultElsdragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/MengHuoBarbarianKing.java b/Mage.Sets/src/mage/sets/masterseditioniii/MengHuoBarbarianKing.java
index 7b63861351..a705d96279 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/MengHuoBarbarianKing.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/MengHuoBarbarianKing.java
@@ -37,7 +37,7 @@ public class MengHuoBarbarianKing extends mage.sets.portalthreekingdoms.MengHuoB
 
     public MengHuoBarbarianKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/MengHuosHorde.java b/Mage.Sets/src/mage/sets/masterseditioniii/MengHuosHorde.java
index 147c3c0b93..a51d2d5e05 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/MengHuosHorde.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/MengHuosHorde.java
@@ -37,7 +37,7 @@ public class MengHuosHorde extends mage.sets.portalthreekingdoms.MengHuosHorde {
 
     public MengHuosHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/MindTwist.java b/Mage.Sets/src/mage/sets/masterseditioniii/MindTwist.java
index 8f70a39c79..9744234fca 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/MindTwist.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/MindTwist.java
@@ -37,7 +37,7 @@ public class MindTwist extends mage.sets.limitedalpha.MindTwist {
 
     public MindTwist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/NetherVoid.java b/Mage.Sets/src/mage/sets/masterseditioniii/NetherVoid.java
index 78219f240a..0dba065a62 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/NetherVoid.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/NetherVoid.java
@@ -37,7 +37,7 @@ public class NetherVoid extends mage.sets.legends.NetherVoid {
 
     public NetherVoid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/NicolBolas.java b/Mage.Sets/src/mage/sets/masterseditioniii/NicolBolas.java
index 346b848328..c4b6f2770a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/NicolBolas.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/NicolBolas.java
@@ -37,7 +37,7 @@ public class NicolBolas extends mage.sets.legends.NicolBolas {
 
     public NicolBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/OldManOfTheSea.java b/Mage.Sets/src/mage/sets/masterseditioniii/OldManOfTheSea.java
index ae5e55b187..e0863fa991 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/OldManOfTheSea.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/OldManOfTheSea.java
@@ -37,7 +37,7 @@ public class OldManOfTheSea extends mage.sets.arabiannights.OldManOfTheSea {
 
     public OldManOfTheSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/PavelMaliki.java b/Mage.Sets/src/mage/sets/masterseditioniii/PavelMaliki.java
index d34bad9508..2def0dd2cc 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/PavelMaliki.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/PavelMaliki.java
@@ -37,7 +37,7 @@ public class PavelMaliki extends mage.sets.legends.PavelMaliki {
 
     public PavelMaliki(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/PeachGardenOath.java b/Mage.Sets/src/mage/sets/masterseditioniii/PeachGardenOath.java
index b83c0bc126..d106eafefb 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/PeachGardenOath.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/PeachGardenOath.java
@@ -38,7 +38,7 @@ public class PeachGardenOath extends mage.sets.eighthedition.PeachGardenOath {
 
     public PeachGardenOath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Plateau.java b/Mage.Sets/src/mage/sets/masterseditioniii/Plateau.java
index f381b9d3b4..81e9dd8e5a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Plateau.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Plateau.java
@@ -37,7 +37,7 @@ public class Plateau extends mage.sets.limitedalpha.Plateau {
 
     public Plateau(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RagingMinotaur.java b/Mage.Sets/src/mage/sets/masterseditioniii/RagingMinotaur.java
index 898a4fe4aa..ca15386a30 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/RagingMinotaur.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/RagingMinotaur.java
@@ -37,7 +37,7 @@ public class RagingMinotaur extends mage.sets.portal.RagingMinotaur {
 
     public RagingMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Ragnar.java b/Mage.Sets/src/mage/sets/masterseditioniii/Ragnar.java
index 977c100c33..da16908cec 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Ragnar.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Ragnar.java
@@ -38,7 +38,7 @@ public class Ragnar extends mage.sets.legends.Ragnar {
 
     public Ragnar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RamirezDePietro.java b/Mage.Sets/src/mage/sets/masterseditioniii/RamirezDePietro.java
index 0ce772cd98..772477bd11 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/RamirezDePietro.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/RamirezDePietro.java
@@ -38,7 +38,7 @@ public class RamirezDePietro extends mage.sets.legends.RamirezDePietro {
 
     public RamirezDePietro(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Recall.java b/Mage.Sets/src/mage/sets/masterseditioniii/Recall.java
index f147377993..976dba4f24 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Recall.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Recall.java
@@ -38,7 +38,7 @@ public class Recall extends mage.sets.fifthedition.Recall {
 
     public Recall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Reincarnation.java b/Mage.Sets/src/mage/sets/masterseditioniii/Reincarnation.java
index c3cc9839c7..4b09a46e1a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Reincarnation.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Reincarnation.java
@@ -37,7 +37,7 @@ public class Reincarnation extends mage.sets.commander2013.Reincarnation {
 
     public Reincarnation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RemoveSoul.java b/Mage.Sets/src/mage/sets/masterseditioniii/RemoveSoul.java
index 3b67b31649..f695dc9de3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Reset.java b/Mage.Sets/src/mage/sets/masterseditioniii/Reset.java
index 37739b39c6..546834ef9b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Reset.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Reset.java
@@ -38,7 +38,7 @@ public class Reset extends mage.sets.legends.Reset {
 
     public Reset(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RivenTurnbull.java b/Mage.Sets/src/mage/sets/masterseditioniii/RivenTurnbull.java
index b5eaadb320..89b73c8c5d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/RivenTurnbull.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/RivenTurnbull.java
@@ -37,7 +37,7 @@ public class RivenTurnbull extends mage.sets.legends.RivenTurnbull {
 
     public RivenTurnbull(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RollingEarthquake.java b/Mage.Sets/src/mage/sets/masterseditioniii/RollingEarthquake.java
index d1f339801f..932bd0bf0a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/RollingEarthquake.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/RollingEarthquake.java
@@ -37,7 +37,7 @@ public class RollingEarthquake extends mage.sets.portalthreekingdoms.RollingEart
 
     public RollingEarthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RubiniaSoulsinger.java b/Mage.Sets/src/mage/sets/masterseditioniii/RubiniaSoulsinger.java
index aab3520ac4..32b543b848 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/RubiniaSoulsinger.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/RubiniaSoulsinger.java
@@ -37,7 +37,7 @@ public class RubiniaSoulsinger extends mage.sets.commander2013.RubiniaSoulsinger
 
     public RubiniaSoulsinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Scrubland.java b/Mage.Sets/src/mage/sets/masterseditioniii/Scrubland.java
index 7c619fa72e..a89b8bd8f1 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Scrubland.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Scrubland.java
@@ -37,7 +37,7 @@ public class Scrubland extends mage.sets.limitedalpha.Scrubland {
 
     public Scrubland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ScrybSprites.java b/Mage.Sets/src/mage/sets/masterseditioniii/ScrybSprites.java
index 54cdda2377..7fc293aa3a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ShuGeneral.java b/Mage.Sets/src/mage/sets/masterseditioniii/ShuGeneral.java
index b95a9dd462..40965b81f7 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ShuGeneral.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ShuGeneral.java
@@ -38,7 +38,7 @@ public class ShuGeneral extends mage.sets.portalthreekingdoms.ShuGeneral {
 
     public ShuGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ShuSoldierFarmers.java b/Mage.Sets/src/mage/sets/masterseditioniii/ShuSoldierFarmers.java
index 80ece72789..35aa89d3f5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ShuSoldierFarmers.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ShuSoldierFarmers.java
@@ -38,7 +38,7 @@ public class ShuSoldierFarmers extends mage.sets.portalthreekingdoms.ShuSoldierF
 
     public ShuSoldierFarmers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SirShandlarOfEberyn.java b/Mage.Sets/src/mage/sets/masterseditioniii/SirShandlarOfEberyn.java
index d63e00ef0c..8b9fc4d295 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SirShandlarOfEberyn.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SirShandlarOfEberyn.java
@@ -38,7 +38,7 @@ public class SirShandlarOfEberyn extends mage.sets.legends.SirShandlarOfEberyn {
 
     public SirShandlarOfEberyn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SivitriScarzam.java b/Mage.Sets/src/mage/sets/masterseditioniii/SivitriScarzam.java
index f5726d11f9..9c730694ca 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SivitriScarzam.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SivitriScarzam.java
@@ -38,7 +38,7 @@ public class SivitriScarzam extends mage.sets.legends.SivitriScarzam {
 
     public SivitriScarzam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SlashingTiger.java b/Mage.Sets/src/mage/sets/masterseditioniii/SlashingTiger.java
index 05e3d87798..4268214039 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SlashingTiger.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SlashingTiger.java
@@ -38,7 +38,7 @@ public class SlashingTiger extends mage.sets.portalthreekingdoms.SlashingTiger {
 
     public SlashingTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SolGrail.java b/Mage.Sets/src/mage/sets/masterseditioniii/SolGrail.java
index 5c41347718..a7e43f896d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SolGrail.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SolGrail.java
@@ -38,7 +38,7 @@ public class SolGrail extends mage.sets.alliances.SolGrail {
 
     public SolGrail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SpoilsOfVictory.java b/Mage.Sets/src/mage/sets/masterseditioniii/SpoilsOfVictory.java
index 1bccaf5b0c..6d6445492b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SpoilsOfVictory.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SpoilsOfVictory.java
@@ -38,7 +38,7 @@ public class SpoilsOfVictory extends mage.sets.commander2013.SpoilsOfVictory {
 
     public SpoilsOfVictory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/StrategicPlanning.java b/Mage.Sets/src/mage/sets/masterseditioniii/StrategicPlanning.java
index 6dbed889a2..7ed1f85ff9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/StrategicPlanning.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/StrategicPlanning.java
@@ -38,7 +38,7 @@ public class StrategicPlanning extends mage.sets.commander2013.StrategicPlanning
 
     public StrategicPlanning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SunQuanLordOfWu.java b/Mage.Sets/src/mage/sets/masterseditioniii/SunQuanLordOfWu.java
index c139d770d7..3baabf0c8f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SunQuanLordOfWu.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SunQuanLordOfWu.java
@@ -37,7 +37,7 @@ public class SunQuanLordOfWu extends mage.sets.portalthreekingdoms.SunQuanLordOf
 
     public SunQuanLordOfWu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/SunastianFalconer.java b/Mage.Sets/src/mage/sets/masterseditioniii/SunastianFalconer.java
index ef32613552..a4fa4313bc 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/SunastianFalconer.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/SunastianFalconer.java
@@ -37,7 +37,7 @@ public class SunastianFalconer extends mage.sets.legends.SunastianFalconer {
 
     public SunastianFalconer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TetsuoUmezawa.java b/Mage.Sets/src/mage/sets/masterseditioniii/TetsuoUmezawa.java
index 337804404c..8896ccde1b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TetsuoUmezawa.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TetsuoUmezawa.java
@@ -37,7 +37,7 @@ public class TetsuoUmezawa extends mage.sets.legends.TetsuoUmezawa {
 
     public TetsuoUmezawa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TheAbyss.java b/Mage.Sets/src/mage/sets/masterseditioniii/TheAbyss.java
index 71035b770d..aa53d69c00 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TheAbyss.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TheAbyss.java
@@ -37,7 +37,7 @@ public class TheAbyss extends mage.sets.legends.TheAbyss {
 
     public TheAbyss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TheLadyOfTheMountain.java b/Mage.Sets/src/mage/sets/masterseditioniii/TheLadyOfTheMountain.java
index 5270abbb24..585df29186 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TheLadyOfTheMountain.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TheLadyOfTheMountain.java
@@ -38,7 +38,7 @@ public class TheLadyOfTheMountain extends mage.sets.legends.TheLadyOfTheMountain
 
     public TheLadyOfTheMountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TheTabernacleAtPendrellVale.java b/Mage.Sets/src/mage/sets/masterseditioniii/TheTabernacleAtPendrellVale.java
index d7ee47c735..adfd1a7564 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TheTabernacleAtPendrellVale.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TheTabernacleAtPendrellVale.java
@@ -37,7 +37,7 @@ public class TheTabernacleAtPendrellVale extends mage.sets.legends.TheTabernacle
 
     public TheTabernacleAtPendrellVale(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TheWretched.java b/Mage.Sets/src/mage/sets/masterseditioniii/TheWretched.java
index f0765e5892..b3b99c70b0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TheWretched.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TheWretched.java
@@ -38,7 +38,7 @@ public class TheWretched extends mage.sets.fifthedition.TheWretched {
 
     public TheWretched(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ThreeVisits.java b/Mage.Sets/src/mage/sets/masterseditioniii/ThreeVisits.java
index 00a7504ea6..cbdadceba2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ThreeVisits.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ThreeVisits.java
@@ -37,7 +37,7 @@ public class ThreeVisits extends mage.sets.portalthreekingdoms.ThreeVisits {
 
     public ThreeVisits(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TobiasAndrion.java b/Mage.Sets/src/mage/sets/masterseditioniii/TobiasAndrion.java
index 22aa2e94de..3418c1fbf3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TobiasAndrion.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TobiasAndrion.java
@@ -38,7 +38,7 @@ public class TobiasAndrion extends mage.sets.legends.TobiasAndrion {
 
     public TobiasAndrion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TorWauki.java b/Mage.Sets/src/mage/sets/masterseditioniii/TorWauki.java
index a47dfd9f58..45d4eabbc4 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TorWauki.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TorWauki.java
@@ -37,7 +37,7 @@ public class TorWauki extends mage.sets.legends.TorWauki {
 
     public TorWauki(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TorstenVonUrsus.java b/Mage.Sets/src/mage/sets/masterseditioniii/TorstenVonUrsus.java
index d3e9b3a985..1e760f867e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TorstenVonUrsus.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TorstenVonUrsus.java
@@ -38,7 +38,7 @@ public class TorstenVonUrsus extends mage.sets.legends.TorstenVonUrsus {
 
     public TorstenVonUrsus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/TropicalIsland.java b/Mage.Sets/src/mage/sets/masterseditioniii/TropicalIsland.java
index 5c84eadc9b..2331770e9e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/TropicalIsland.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/TropicalIsland.java
@@ -37,7 +37,7 @@ public class TropicalIsland extends mage.sets.limitedalpha.TropicalIsland {
 
     public TropicalIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/Urborg.java b/Mage.Sets/src/mage/sets/masterseditioniii/Urborg.java
index 115558fcf7..474f52c967 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/Urborg.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/Urborg.java
@@ -37,7 +37,7 @@ public class Urborg extends mage.sets.legends.Urborg {
 
     public Urborg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/VolcanicIsland.java b/Mage.Sets/src/mage/sets/masterseditioniii/VolcanicIsland.java
index e54c4b4456..8ef434c4d2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/VolcanicIsland.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/VolcanicIsland.java
@@ -37,7 +37,7 @@ public class VolcanicIsland extends mage.sets.unlimitededition.VolcanicIsland {
 
     public VolcanicIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WeiInfantry.java b/Mage.Sets/src/mage/sets/masterseditioniii/WeiInfantry.java
index 1b83e0cd88..6a03511a53 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WeiInfantry.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WeiInfantry.java
@@ -37,7 +37,7 @@ public class WeiInfantry extends mage.sets.portalthreekingdoms.WeiInfantry {
 
     public WeiInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WeiNightRaiders.java b/Mage.Sets/src/mage/sets/masterseditioniii/WeiNightRaiders.java
index 394969ded4..9e6ddf8e38 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WeiNightRaiders.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WeiNightRaiders.java
@@ -37,7 +37,7 @@ public class WeiNightRaiders extends mage.sets.portalthreekingdoms.WeiNightRaide
 
     public WeiNightRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WeiStrikeForce.java b/Mage.Sets/src/mage/sets/masterseditioniii/WeiStrikeForce.java
index 12dad872cb..ef1206a1d7 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WeiStrikeForce.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WeiStrikeForce.java
@@ -37,7 +37,7 @@ public class WeiStrikeForce extends mage.sets.portalthreekingdoms.WeiStrikeForce
 
     public WeiStrikeForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WillowPriestess.java b/Mage.Sets/src/mage/sets/masterseditioniii/WillowPriestess.java
index 3a48c9c48d..45c9a69a88 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WillowPriestess.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WillowPriestess.java
@@ -38,7 +38,7 @@ public class WillowPriestess extends mage.sets.homelands.WillowPriestess {
 
     public WillowPriestess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WillowSatyr.java b/Mage.Sets/src/mage/sets/masterseditioniii/WillowSatyr.java
index 93f2e58e9e..b0a853cc3e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WillowSatyr.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WillowSatyr.java
@@ -37,7 +37,7 @@ public class WillowSatyr extends mage.sets.legends.WillowSatyr {
 
     public WillowSatyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WormwoodTreefolk.java b/Mage.Sets/src/mage/sets/masterseditioniii/WormwoodTreefolk.java
index 4e6beb8c3f..7bd76384d2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WormwoodTreefolk.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WormwoodTreefolk.java
@@ -38,7 +38,7 @@ public class WormwoodTreefolk extends mage.sets.thedark.WormwoodTreefolk {
 
     public WormwoodTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WuEliteCavalry.java b/Mage.Sets/src/mage/sets/masterseditioniii/WuEliteCavalry.java
index f015e840b5..a76a83a9a4 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WuEliteCavalry.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WuEliteCavalry.java
@@ -37,7 +37,7 @@ public class WuEliteCavalry extends mage.sets.portalthreekingdoms.WuEliteCavalry
 
     public WuEliteCavalry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/WuLongbowman.java b/Mage.Sets/src/mage/sets/masterseditioniii/WuLongbowman.java
index 8cfa29f73f..d7c5fa8391 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/WuLongbowman.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/WuLongbowman.java
@@ -38,7 +38,7 @@ public class WuLongbowman extends mage.sets.portalthreekingdoms.WuLongbowman {
 
     public WuLongbowman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/XiahouDunTheOneEyed.java b/Mage.Sets/src/mage/sets/masterseditioniii/XiahouDunTheOneEyed.java
index 007bf7677f..4bd6f8fc35 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/XiahouDunTheOneEyed.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/XiahouDunTheOneEyed.java
@@ -38,7 +38,7 @@ public class XiahouDunTheOneEyed extends mage.sets.portalthreekingdoms.XiahouDun
 
     public XiahouDunTheOneEyed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ME3";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/XiraArien.java b/Mage.Sets/src/mage/sets/masterseditioniii/XiraArien.java
index 9cd5a70edc..77250fff48 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/XiraArien.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/XiraArien.java
@@ -37,7 +37,7 @@ public class XiraArien extends mage.sets.legends.XiraArien {
 
     public XiraArien(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ZodiacDragon.java b/Mage.Sets/src/mage/sets/masterseditioniii/ZodiacDragon.java
index df547bb4bd..8c236cc784 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniii/ZodiacDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ZodiacDragon.java
@@ -37,7 +37,7 @@ public class ZodiacDragon extends mage.sets.portalthreekingdoms.ZodiacDragon {
 
     public ZodiacDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "ME3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java b/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java
index 7a67797042..f0f31be53a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java
@@ -37,7 +37,7 @@ public class AcidRain extends mage.sets.legends.AcidRain {
 
     public AcidRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java b/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java
index f3788fd493..20d1eb4582 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java
@@ -37,7 +37,7 @@ public class AesthirGlider extends mage.sets.alliances.AesthirGlider1 {
 
     public AesthirGlider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AirElemental.java b/Mage.Sets/src/mage/sets/masterseditioniv/AirElemental.java
index e4f2665f23..f7e8fd4900 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AlabornMusketeer.java b/Mage.Sets/src/mage/sets/masterseditioniv/AlabornMusketeer.java
index 32ce85889d..57edf946b3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AlabornMusketeer.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AlabornMusketeer.java
@@ -37,7 +37,7 @@ public class AlabornMusketeer extends mage.sets.portalsecondage.AlabornMusketeer
 
     public AlabornMusketeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AlabornTrooper.java b/Mage.Sets/src/mage/sets/masterseditioniv/AlabornTrooper.java
index 23060d2bf0..0205348313 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AlabornTrooper.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AlabornTrooper.java
@@ -37,7 +37,7 @@ public class AlabornTrooper extends mage.sets.portalsecondage.AlabornTrooper {
 
     public AlabornTrooper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AliFromCairo.java b/Mage.Sets/src/mage/sets/masterseditioniv/AliFromCairo.java
index b8f97f9751..342612528c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AliFromCairo.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AliFromCairo.java
@@ -37,7 +37,7 @@ public class AliFromCairo extends mage.sets.arabiannights.AliFromCairo {
 
     public AliFromCairo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java b/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java
index 2053b9ea44..b919dec589 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java
@@ -38,7 +38,7 @@ public class AlluringScent extends mage.sets.portal.AlluringScent {
 
     public AlluringScent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AmuletOfKroog.java b/Mage.Sets/src/mage/sets/masterseditioniv/AmuletOfKroog.java
index 5ff606dfb3..9558a2f3e3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AmuletOfKroog.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AmuletOfKroog.java
@@ -37,7 +37,7 @@ public class AmuletOfKroog extends mage.sets.fifthedition.AmuletOfKroog {
 
     public AmuletOfKroog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ArgivianBlacksmith.java b/Mage.Sets/src/mage/sets/masterseditioniv/ArgivianBlacksmith.java
index 39f60c163a..a34176c101 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ArgivianBlacksmith.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ArgivianBlacksmith.java
@@ -38,7 +38,7 @@ public class ArgivianBlacksmith extends mage.sets.antiquities.ArgivianBlacksmith
 
     public ArgivianBlacksmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianPixies.java b/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianPixies.java
index cbe1cb7bf8..c9fffcec36 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianPixies.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianPixies.java
@@ -37,7 +37,7 @@ public class ArgothianPixies extends mage.sets.antiquities.ArgothianPixies {
 
     public ArgothianPixies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianTreefolk.java b/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianTreefolk.java
index 354b4ef142..2f8376d177 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianTreefolk.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ArgothianTreefolk.java
@@ -38,7 +38,7 @@ public class ArgothianTreefolk extends mage.sets.antiquities.ArgothianTreefolk {
 
     public ArgothianTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Armageddon.java b/Mage.Sets/src/mage/sets/masterseditioniv/Armageddon.java
index ee9b1dbaa4..9bd62efb76 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ArtifactBlast.java b/Mage.Sets/src/mage/sets/masterseditioniv/ArtifactBlast.java
index 25771cbf34..803208c518 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ArtifactBlast.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ArtifactBlast.java
@@ -37,7 +37,7 @@ public class ArtifactBlast extends mage.sets.antiquities.ArtifactBlast {
 
     public ArtifactBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AshnodsAltar.java b/Mage.Sets/src/mage/sets/masterseditioniv/AshnodsAltar.java
index c5dfe75214..13e81c0092 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AshnodsAltar.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AshnodsAltar.java
@@ -38,7 +38,7 @@ public class AshnodsAltar extends mage.sets.fifthedition.AshnodsAltar {
 
     public AshnodsAltar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Atog.java b/Mage.Sets/src/mage/sets/masterseditioniv/Atog.java
index 718f44154b..f8784c11e3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Atog.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Atog.java
@@ -38,7 +38,7 @@ public class Atog extends mage.sets.mirrodin.Atog {
 
     public Atog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Badlands.java b/Mage.Sets/src/mage/sets/masterseditioniv/Badlands.java
index 2ad410f4bc..0a56cbd7be 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Badlands.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Badlands.java
@@ -37,7 +37,7 @@ public class Badlands extends mage.sets.limitedalpha.Badlands {
 
     public Badlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Balance.java b/Mage.Sets/src/mage/sets/masterseditioniv/Balance.java
index 4d6f34de1c..7b2665470d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Balance.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Balance.java
@@ -37,7 +37,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BasaltMonolith.java b/Mage.Sets/src/mage/sets/masterseditioniv/BasaltMonolith.java
index 2c25a76f66..0cd9840058 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BasaltMonolith.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BasaltMonolith.java
@@ -37,7 +37,7 @@ public class BasaltMonolith extends mage.sets.limitedalpha.BasaltMonolith {
 
     public BasaltMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Bayou.java b/Mage.Sets/src/mage/sets/masterseditioniv/Bayou.java
index ed21cdccba..9a743d1a98 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Bayou.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Bayou.java
@@ -37,7 +37,7 @@ public class Bayou extends mage.sets.limitedalpha.Bayou {
 
     public Bayou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java b/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java
index 262aa8869d..dd0d9fa0d9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java
@@ -37,7 +37,7 @@ public class BeeSting extends mage.sets.portal.BeeSting {
 
     public BeeSting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BirdMaiden.java b/Mage.Sets/src/mage/sets/masterseditioniv/BirdMaiden.java
index 54590ea4ea..f32251490d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BirdMaiden.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BirdMaiden.java
@@ -37,7 +37,7 @@ public class BirdMaiden extends mage.sets.fifthedition.BirdMaiden {
 
     public BirdMaiden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BlackKnight.java b/Mage.Sets/src/mage/sets/masterseditioniv/BlackKnight.java
index 7397a483be..8d99dc5115 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/masterseditioniv/BlueElementalBlast.java
index c1e2e6e077..747ae8328b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BlueElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BlueElementalBlast.java
@@ -38,7 +38,7 @@ public class BlueElementalBlast extends mage.sets.limitedalpha.BlueElementalBlas
 
     public BlueElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BookOfRass.java b/Mage.Sets/src/mage/sets/masterseditioniv/BookOfRass.java
index dee10ce131..effa50a7a9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BookOfRass.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BookOfRass.java
@@ -37,7 +37,7 @@ public class BookOfRass extends mage.sets.thedark.BookOfRass {
 
     public BookOfRass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BottleOfSuleiman.java b/Mage.Sets/src/mage/sets/masterseditioniv/BottleOfSuleiman.java
index 322ac2d75d..c5226fa15b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BottleOfSuleiman.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BottleOfSuleiman.java
@@ -37,7 +37,7 @@ public class BottleOfSuleiman extends mage.sets.fifthedition.BottleOfSuleiman {
 
     public BottleOfSuleiman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Braingeyser.java b/Mage.Sets/src/mage/sets/masterseditioniv/Braingeyser.java
index 67f9ef652d..3bf3b89398 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Braingeyser.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Braingeyser.java
@@ -37,7 +37,7 @@ public class Braingeyser extends mage.sets.limitedalpha.Braingeyser {
 
     public Braingeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BrassMan.java b/Mage.Sets/src/mage/sets/masterseditioniv/BrassMan.java
index 80b1aee685..66e5edef7b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/BrassMan.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BrassMan.java
@@ -38,7 +38,7 @@ public class BrassMan extends mage.sets.fourthedition.BrassMan {
 
     public BrassMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CandelabraOfTawnos.java b/Mage.Sets/src/mage/sets/masterseditioniv/CandelabraOfTawnos.java
index 76e0190cc0..f67f4cd29f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/CandelabraOfTawnos.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CandelabraOfTawnos.java
@@ -37,7 +37,7 @@ public class CandelabraOfTawnos extends mage.sets.antiquities.CandelabraOfTawnos
 
     public CandelabraOfTawnos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Channel.java b/Mage.Sets/src/mage/sets/masterseditioniv/Channel.java
index ed74133401..e5be942e0e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Channel.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Channel.java
@@ -38,7 +38,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java b/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java
index 8db6b13cd7..d65bf85535 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java
@@ -38,7 +38,7 @@ public class CitanulDruid extends mage.sets.antiquities.CitanulDruid {
 
     public CitanulDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CityOfBrass.java b/Mage.Sets/src/mage/sets/masterseditioniv/CityOfBrass.java
index 5ca9864f66..69fe82a8ac 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CityOfBrass.java
@@ -37,7 +37,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ClayStatue.java b/Mage.Sets/src/mage/sets/masterseditioniv/ClayStatue.java
index 2c375fcd81..6be90b1f4d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ClayStatue.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ClayStatue.java
@@ -38,7 +38,7 @@ public class ClayStatue extends mage.sets.fourthedition.ClayStatue {
 
     public ClayStatue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkAvian.java b/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkAvian.java
index d17ab5e2d1..fb1cb10c9d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkAvian.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkAvian.java
@@ -38,7 +38,7 @@ public class ClockworkAvian extends mage.sets.fourthedition.ClockworkAvian {
 
     public ClockworkAvian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CloudSpirit.java b/Mage.Sets/src/mage/sets/masterseditioniv/CloudSpirit.java
index 94b61fe887..537c2fc690 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/CloudSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CloudSpirit.java
@@ -37,7 +37,7 @@ public class CloudSpirit extends mage.sets.stronghold.CloudSpirit {
 
     public CloudSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ColossusOfSardia.java b/Mage.Sets/src/mage/sets/masterseditioniv/ColossusOfSardia.java
index fcffbb93f8..c46378ee04 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ColossusOfSardia.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ColossusOfSardia.java
@@ -37,7 +37,7 @@ public class ColossusOfSardia extends mage.sets.fifthedition.ColossusOfSardia {
 
     public ColossusOfSardia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ControlMagic.java b/Mage.Sets/src/mage/sets/masterseditioniv/ControlMagic.java
index 54e112a479..0d756daec0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Conversion.java b/Mage.Sets/src/mage/sets/masterseditioniv/Conversion.java
index 5bbe0cea4c..37e042fb45 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Conversion.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Conversion.java
@@ -38,7 +38,7 @@ public class Conversion extends mage.sets.limitedalpha.Conversion {
 
     public Conversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CopyArtifact.java b/Mage.Sets/src/mage/sets/masterseditioniv/CopyArtifact.java
index b4a4c8530f..5653f2bfd5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/CopyArtifact.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CopyArtifact.java
@@ -37,7 +37,7 @@ public class CopyArtifact extends mage.sets.limitedalpha.CopyArtifact {
 
     public CopyArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Counterspell.java b/Mage.Sets/src/mage/sets/masterseditioniv/Counterspell.java
index 602030a12d..ac918b6af2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DakmorPlague.java b/Mage.Sets/src/mage/sets/masterseditioniv/DakmorPlague.java
index 27b3e2d2a1..98fd82ecd8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DakmorPlague.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DakmorPlague.java
@@ -37,7 +37,7 @@ public class DakmorPlague extends mage.sets.starter1999.DakmorPlague {
 
     public DakmorPlague(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DarkRitual.java b/Mage.Sets/src/mage/sets/masterseditioniv/DarkRitual.java
index b1c10dc7db..45fa45f6a7 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DeathcoilWurm.java b/Mage.Sets/src/mage/sets/masterseditioniv/DeathcoilWurm.java
index ba2489bf26..53d9aecde1 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DeathcoilWurm.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DeathcoilWurm.java
@@ -37,7 +37,7 @@ public class DeathcoilWurm extends mage.sets.portalsecondage.DeathcoilWurm {
 
     public DeathcoilWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Deathgrip.java b/Mage.Sets/src/mage/sets/masterseditioniv/Deathgrip.java
index c7ba9ea33e..c2c1ee4d46 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Deathgrip.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Deathgrip.java
@@ -38,7 +38,7 @@ public class Deathgrip extends mage.sets.limitedbeta.Deathgrip {
 
     public Deathgrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DemonicHordes.java b/Mage.Sets/src/mage/sets/masterseditioniv/DemonicHordes.java
index 6ae27553e0..926b9c9606 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DemonicHordes.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DemonicHordes.java
@@ -37,7 +37,7 @@ public class DemonicHordes extends mage.sets.limitedalpha.DemonicHordes {
 
     public DemonicHordes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DemonicTutor.java b/Mage.Sets/src/mage/sets/masterseditioniv/DemonicTutor.java
index cc1d83d3e5..0481a29fb5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DemonicTutor.java
@@ -38,7 +38,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Detonate.java b/Mage.Sets/src/mage/sets/masterseditioniv/Detonate.java
index 9c4ef7148e..eb545a74b3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Detonate.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Detonate.java
@@ -37,7 +37,7 @@ public class Detonate extends mage.sets.fifthedition.Detonate {
 
     public Detonate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Devastation.java b/Mage.Sets/src/mage/sets/masterseditioniv/Devastation.java
index f7ffd5144e..0238501db4 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Devastation.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Devastation.java
@@ -37,7 +37,7 @@ public class Devastation extends mage.sets.portal.Devastation {
 
     public Devastation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DiabolicMachine.java b/Mage.Sets/src/mage/sets/masterseditioniv/DiabolicMachine.java
index 2978f689ab..4f1d087c53 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DiabolicMachine.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DiabolicMachine.java
@@ -37,7 +37,7 @@ public class DiabolicMachine extends mage.sets.fourthedition.DiabolicMachine {
 
     public DiabolicMachine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DivineOffering.java b/Mage.Sets/src/mage/sets/masterseditioniv/DivineOffering.java
index 454804cae4..3adbf75d11 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DivineOffering.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DivineOffering.java
@@ -37,7 +37,7 @@ public class DivineOffering extends mage.sets.mirrodinbesieged.DivineOffering {
 
     public DivineOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DragonEngine.java b/Mage.Sets/src/mage/sets/masterseditioniv/DragonEngine.java
index 74e00202f8..09e914b9bd 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DragonEngine.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DragonEngine.java
@@ -38,7 +38,7 @@ public class DragonEngine extends mage.sets.fifthedition.DragonEngine {
 
     public DragonEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DreadReaper.java b/Mage.Sets/src/mage/sets/masterseditioniv/DreadReaper.java
index 8802183add..cc3f83cd16 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DreadReaper.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DreadReaper.java
@@ -37,7 +37,7 @@ public class DreadReaper extends mage.sets.starter1999.DreadReaper {
 
     public DreadReaper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DropOfHoney.java b/Mage.Sets/src/mage/sets/masterseditioniv/DropOfHoney.java
index 2e62fd3e7c..b19a821007 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DropOfHoney.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DropOfHoney.java
@@ -37,7 +37,7 @@ public class DropOfHoney extends mage.sets.arabiannights.DropOfHoney {
 
     public DropOfHoney(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Drowned.java b/Mage.Sets/src/mage/sets/masterseditioniv/Drowned.java
index d06fa20817..4fbde5810a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Drowned.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Drowned.java
@@ -37,7 +37,7 @@ public class Drowned extends mage.sets.thedark.Drowned {
 
     public Drowned(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/DustToDust.java b/Mage.Sets/src/mage/sets/masterseditioniv/DustToDust.java
index c2d7146c13..7bf7b1e267 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/DustToDust.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/DustToDust.java
@@ -38,7 +38,7 @@ public class DustToDust extends mage.sets.thedark.DustToDust {
 
     public DustToDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/EbonDragon.java b/Mage.Sets/src/mage/sets/masterseditioniv/EbonDragon.java
index 9836e47c57..ec31c5d6ac 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/EbonDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/EbonDragon.java
@@ -37,7 +37,7 @@ public class EbonDragon extends mage.sets.ftvdragons.EbonDragon {
 
     public EbonDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/EbonyHorse.java b/Mage.Sets/src/mage/sets/masterseditioniv/EbonyHorse.java
index 7ddb0a3cc1..b2611ad610 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/EbonyHorse.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/EbonyHorse.java
@@ -38,7 +38,7 @@ public class EbonyHorse extends mage.sets.fourthedition.EbonyHorse {
 
     public EbonyHorse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/EbonyRhino.java b/Mage.Sets/src/mage/sets/masterseditioniv/EbonyRhino.java
index adad9f1914..4fcc16cecd 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/EbonyRhino.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/EbonyRhino.java
@@ -37,7 +37,7 @@ public class EbonyRhino extends mage.sets.homelands.EbonyRhino {
 
     public EbonyRhino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/EliteCatWarrior.java b/Mage.Sets/src/mage/sets/masterseditioniv/EliteCatWarrior.java
index 44097685a2..d486d98570 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/EliteCatWarrior.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/EliteCatWarrior.java
@@ -37,7 +37,7 @@ public class EliteCatWarrior extends mage.sets.portal.EliteCatWarrior1 {
 
     public EliteCatWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/EnergyFlux.java b/Mage.Sets/src/mage/sets/masterseditioniv/EnergyFlux.java
index da2a69a1a0..c30742f3bb 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/EnergyFlux.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/EnergyFlux.java
@@ -37,7 +37,7 @@ public class EnergyFlux extends mage.sets.antiquities.EnergyFlux {
 
     public EnergyFlux(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/EyeForAnEye.java b/Mage.Sets/src/mage/sets/masterseditioniv/EyeForAnEye.java
index ffdea1c3e1..9bf9068da3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/EyeForAnEye.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/EyeForAnEye.java
@@ -38,7 +38,7 @@ public class EyeForAnEye extends mage.sets.arabiannights.EyeForAnEye {
 
     public EyeForAnEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/FalseSummoning.java b/Mage.Sets/src/mage/sets/masterseditioniv/FalseSummoning.java
index c830669c37..6e1f35f8e6 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/FalseSummoning.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/FalseSummoning.java
@@ -37,7 +37,7 @@ public class FalseSummoning extends mage.sets.portalsecondage.FalseSummoning {
 
     public FalseSummoning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Fastbond.java b/Mage.Sets/src/mage/sets/masterseditioniv/Fastbond.java
index d7c793d143..f25abc3e44 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Fastbond.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Fastbond.java
@@ -37,7 +37,7 @@ public class Fastbond extends mage.sets.limitedalpha.Fastbond {
 
     public Fastbond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/FireImp.java b/Mage.Sets/src/mage/sets/masterseditioniv/FireImp.java
index 5a61e3c463..3baa9dfb2f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/FireImp.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/FireImp.java
@@ -38,7 +38,7 @@ public class FireImp extends mage.sets.portal.FireImp {
 
     public FireImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java b/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java
index 8e2e2697e5..d5570d61b8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java
@@ -37,7 +37,7 @@ public class FireTempest extends mage.sets.portal.FireTempest {
 
     public FireTempest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Fireball.java b/Mage.Sets/src/mage/sets/masterseditioniv/Fireball.java
index d32817802d..bd7ffde17f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Fireball.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/FlyingCarpet.java b/Mage.Sets/src/mage/sets/masterseditioniv/FlyingCarpet.java
index 9be3770721..196e5ff318 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/FlyingCarpet.java
@@ -38,7 +38,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Fog.java b/Mage.Sets/src/mage/sets/masterseditioniv/Fog.java
index 9c6d649a80..f96af41080 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Fog.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ForceOfNature.java b/Mage.Sets/src/mage/sets/masterseditioniv/ForceOfNature.java
index 43a330c1a4..8b4fcad381 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Fork.java b/Mage.Sets/src/mage/sets/masterseditioniv/Fork.java
index 7329b2dc2a..54627b8a24 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Fork.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Fork.java
@@ -37,7 +37,7 @@ public class Fork extends mage.sets.limitedbeta.Fork {
 
     public Fork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GateToPhyrexia.java b/Mage.Sets/src/mage/sets/masterseditioniv/GateToPhyrexia.java
index 0dcdf6b782..828fe054ad 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GateToPhyrexia.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GateToPhyrexia.java
@@ -37,7 +37,7 @@ public class GateToPhyrexia extends mage.sets.antiquities.GateToPhyrexia {
 
     public GateToPhyrexia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GauntletOfMight.java b/Mage.Sets/src/mage/sets/masterseditioniv/GauntletOfMight.java
index 1e4410728c..c59de2ea93 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GauntletOfMight.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GauntletOfMight.java
@@ -37,7 +37,7 @@ public class GauntletOfMight extends mage.sets.limitedalpha.GauntletOfMight {
 
     public GauntletOfMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GiantGrowth.java b/Mage.Sets/src/mage/sets/masterseditioniv/GiantGrowth.java
index dcaa339706..91297c9f53 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GiantTortoise.java b/Mage.Sets/src/mage/sets/masterseditioniv/GiantTortoise.java
index 1348bd2a9a..79d0681163 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GiantTortoise.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GiantTortoise.java
@@ -37,7 +37,7 @@ public class GiantTortoise extends mage.sets.fourthedition.GiantTortoise {
 
     public GiantTortoise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/masterseditioniv/GlassesOfUrza.java
index 2d48c06b1e..7c0e91c2be 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GlassesOfUrza.java
@@ -38,7 +38,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Gloom.java b/Mage.Sets/src/mage/sets/masterseditioniv/Gloom.java
index fdf6fe1c3b..c5ee6cd31a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Gloom.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Gloom.java
@@ -38,7 +38,7 @@ public class Gloom extends mage.sets.limitedalpha.Gloom {
 
     public Gloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinBully.java b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinBully.java
index b7956723d2..2c95b0f7e0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinBully.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinBully.java
@@ -37,7 +37,7 @@ public class GoblinBully extends mage.sets.portal.GoblinBully {
 
     public GoblinBully(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCavaliers.java b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCavaliers.java
index f5b6357765..4493bf6c60 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCavaliers.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCavaliers.java
@@ -37,7 +37,7 @@ public class GoblinCavaliers extends mage.sets.portalsecondage.GoblinCavaliers {
 
     public GoblinCavaliers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCaves.java b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCaves.java
index 909c490246..1eb10f81b9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCaves.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinCaves.java
@@ -37,7 +37,7 @@ public class GoblinCaves extends mage.sets.thedark.GoblinCaves {
 
     public GoblinCaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinFirestarter.java b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinFirestarter.java
index ce81834526..70f90f0fa0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinFirestarter.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinFirestarter.java
@@ -38,7 +38,7 @@ public class GoblinFirestarter extends mage.sets.portalsecondage.GoblinFirestart
 
     public GoblinFirestarter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinGeneral.java b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinGeneral.java
index eb29059203..4ca754b3f6 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinGeneral.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinGeneral.java
@@ -38,7 +38,7 @@ public class GoblinGeneral extends mage.sets.vintagemasters.GoblinGeneral {
 
     public GoblinGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinWarrens.java b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinWarrens.java
index dde6856b8f..2f967a0d51 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GoblinWarrens.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GoblinWarrens.java
@@ -38,7 +38,7 @@ public class GoblinWarrens extends mage.sets.fallenempires.GoblinWarrens {
 
     public GoblinWarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/GrapeshotCatapult.java b/Mage.Sets/src/mage/sets/masterseditioniv/GrapeshotCatapult.java
index da0b44e62c..6ee1040d21 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/GrapeshotCatapult.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/GrapeshotCatapult.java
@@ -37,7 +37,7 @@ public class GrapeshotCatapult extends mage.sets.seventhedition.GrapeshotCatapul
 
     public GrapeshotCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/HealingSalve.java b/Mage.Sets/src/mage/sets/masterseditioniv/HealingSalve.java
index 4d28f41b8d..7f2f7d6d90 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java b/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java
index 6b16f5612e..d72e269f4c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java
@@ -38,7 +38,7 @@ public class HornOfDeafening extends mage.sets.legends.HornOfDeafening {
 
     public HornOfDeafening(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/masterseditioniv/HowlFromBeyond.java
index 7cae8abfe5..e8642a76e5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/HowlFromBeyond.java
@@ -37,7 +37,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/IcyManipulator.java b/Mage.Sets/src/mage/sets/masterseditioniv/IcyManipulator.java
index c792f86207..0e8ab7fde8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/InTheEyeOfChaos.java b/Mage.Sets/src/mage/sets/masterseditioniv/InTheEyeOfChaos.java
index cafa31cfca..22a26620f6 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/InTheEyeOfChaos.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/InTheEyeOfChaos.java
@@ -37,7 +37,7 @@ public class InTheEyeOfChaos extends mage.sets.legends.InTheEyeOfChaos {
 
     public InTheEyeOfChaos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/InstillEnergy.java b/Mage.Sets/src/mage/sets/masterseditioniv/InstillEnergy.java
index c33c70f7b0..c6d03cfe22 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/InstillEnergy.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/InstillEnergy.java
@@ -37,7 +37,7 @@ public class InstillEnergy extends mage.sets.fifthedition.InstillEnergy {
 
     public InstillEnergy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java b/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java
index 29324fa3a0..80ccfb7197 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java
@@ -38,7 +38,7 @@ public class IronhoofOx extends mage.sets.portalsecondage.IronhoofOx {
 
     public IronhoofOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/IslandSanctuary.java b/Mage.Sets/src/mage/sets/masterseditioniv/IslandSanctuary.java
index b4df7a02ab..3c9cbf4295 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/IslandSanctuary.java
@@ -37,7 +37,7 @@ public class IslandSanctuary extends mage.sets.limitedalpha.IslandSanctuary {
 
     public IslandSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/JadeMonolith.java b/Mage.Sets/src/mage/sets/masterseditioniv/JadeMonolith.java
index e5ea0212af..f379b0021f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Juggernaut.java b/Mage.Sets/src/mage/sets/masterseditioniv/Juggernaut.java
index c697db671c..8f1e584d49 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/JununEfreet.java b/Mage.Sets/src/mage/sets/masterseditioniv/JununEfreet.java
index eff797ee42..18390e8f3a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/JununEfreet.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/JununEfreet.java
@@ -37,7 +37,7 @@ public class JununEfreet extends mage.sets.fourthedition.JununEfreet {
 
     public JununEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Kismet.java b/Mage.Sets/src/mage/sets/masterseditioniv/Kismet.java
index 28eda13df4..5f9da2a974 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Kismet.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Kismet.java
@@ -38,7 +38,7 @@ public class Kismet extends mage.sets.fifthedition.Kismet {
 
     public Kismet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/KormusBell.java b/Mage.Sets/src/mage/sets/masterseditioniv/KormusBell.java
index f84a88c2b4..26ce36b634 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/KormusBell.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/KormusBell.java
@@ -37,7 +37,7 @@ public class KormusBell extends mage.sets.limitedalpha.KormusBell {
 
     public KormusBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java b/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java
index 031f2f567b..54b40a6f4f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java
@@ -38,7 +38,7 @@ public class LavaFlow extends mage.sets.portal.LavaFlow {
 
     public LavaFlow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Leeches.java b/Mage.Sets/src/mage/sets/masterseditioniv/Leeches.java
index bfeb687e2f..509b7657d2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Leeches.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Leeches.java
@@ -37,7 +37,7 @@ public class Leeches extends mage.sets.homelands.Leeches {
 
     public Leeches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfAlexandria.java b/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfAlexandria.java
index 1f2db1e2a2..6d1263a9c8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfAlexandria.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfAlexandria.java
@@ -38,7 +38,7 @@ public class LibraryOfAlexandria extends mage.sets.vintagemasters.LibraryOfAlexa
 
     public LibraryOfAlexandria(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfLeng.java b/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfLeng.java
index 7e394c1d91..24194c77f2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfLeng.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/LibraryOfLeng.java
@@ -38,7 +38,7 @@ public class LibraryOfLeng extends mage.sets.limitedbeta.LibraryOfLeng {
 
     public LibraryOfLeng(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LivingLands.java b/Mage.Sets/src/mage/sets/masterseditioniv/LivingLands.java
index 81aebea62e..33570feb7f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LivingWall.java b/Mage.Sets/src/mage/sets/masterseditioniv/LivingWall.java
index 14cedfe59a..b2db77ffa3 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/LivingWall.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/LivingWall.java
@@ -37,7 +37,7 @@ public class LivingWall extends mage.sets.unlimitededition.LivingWall {
 
     public LivingWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/masterseditioniv/MahamotiDjinn.java
index 471814b4a8..079c0c916c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ManaVault.java b/Mage.Sets/src/mage/sets/masterseditioniv/ManaVault.java
index 79c89a8ef6..ba695a2c2b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/MazeOfIth.java b/Mage.Sets/src/mage/sets/masterseditioniv/MazeOfIth.java
index f52f787eac..0537c30a97 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/MazeOfIth.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/MazeOfIth.java
@@ -38,7 +38,7 @@ public class MazeOfIth extends mage.sets.thedark.MazeOfIth {
 
     public MazeOfIth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Mightstone.java b/Mage.Sets/src/mage/sets/masterseditioniv/Mightstone.java
index c1bce02104..64a7faca4d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Mightstone.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Mightstone.java
@@ -38,7 +38,7 @@ public class Mightstone extends mage.sets.antiquities.Mightstone {
 
     public Mightstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/MishrasWorkshop.java b/Mage.Sets/src/mage/sets/masterseditioniv/MishrasWorkshop.java
index 601b91374b..6146d0e7d1 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/MishrasWorkshop.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/MishrasWorkshop.java
@@ -38,7 +38,7 @@ public class MishrasWorkshop extends mage.sets.vintagemasters.MishrasWorkshop {
 
     public MishrasWorkshop(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/MysticDecree.java b/Mage.Sets/src/mage/sets/masterseditioniv/MysticDecree.java
index ba2f77ca69..93af9b05fa 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/MysticDecree.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/MysticDecree.java
@@ -38,7 +38,7 @@ public class MysticDecree extends mage.sets.homelands.MysticDecree {
 
     public MysticDecree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/NakedSingularity.java b/Mage.Sets/src/mage/sets/masterseditioniv/NakedSingularity.java
index 11c2bd9c15..3e91a45b9c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/NakedSingularity.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/NakedSingularity.java
@@ -37,7 +37,7 @@ public class NakedSingularity extends mage.sets.iceage.NakedSingularity {
 
     public NakedSingularity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Oasis.java b/Mage.Sets/src/mage/sets/masterseditioniv/Oasis.java
index 4b4c07dd88..efd0387fae 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Oasis.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Oasis.java
@@ -38,7 +38,7 @@ public class Oasis extends mage.sets.fourthedition.Oasis {
 
     public Oasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ObeliskOfUndoing.java b/Mage.Sets/src/mage/sets/masterseditioniv/ObeliskOfUndoing.java
index 16b0e861cb..7b12467ede 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ObeliskOfUndoing.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ObeliskOfUndoing.java
@@ -37,7 +37,7 @@ public class ObeliskOfUndoing extends mage.sets.chronicles.ObeliskOfUndoing {
 
     public ObeliskOfUndoing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java b/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java
index ee9c898be7..3e36959a39 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java
@@ -38,7 +38,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/masterseditioniv/OgreTaskmaster.java
index 9fde1ade0c..d61c56038f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/OgreTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/OgreTaskmaster.java
@@ -38,7 +38,7 @@ public class OgreTaskmaster extends mage.sets.ninthedition.OgreTaskmaster {
 
     public OgreTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java b/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java
index 32b52d24d5..036f34bf8f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java
@@ -37,7 +37,7 @@ public class Onulet extends mage.sets.mastersedition.Onulet {
 
     public Onulet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/OrcishMechanics.java b/Mage.Sets/src/mage/sets/masterseditioniv/OrcishMechanics.java
index 9610cf6981..aac6456fdc 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/OrcishMechanics.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/OrcishMechanics.java
@@ -38,7 +38,7 @@ public class OrcishMechanics extends mage.sets.antiquities.OrcishMechanics {
 
     public OrcishMechanics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/OsaiVultures.java b/Mage.Sets/src/mage/sets/masterseditioniv/OsaiVultures.java
index 6896509f19..712595ca0d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/OsaiVultures.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/OsaiVultures.java
@@ -37,7 +37,7 @@ public class OsaiVultures extends mage.sets.legends.OsaiVultures {
 
     public OsaiVultures(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/OverwhelmingForces.java b/Mage.Sets/src/mage/sets/masterseditioniv/OverwhelmingForces.java
index e00fc91d3d..50c0ee06a8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/OverwhelmingForces.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/OverwhelmingForces.java
@@ -37,7 +37,7 @@ public class OverwhelmingForces extends mage.sets.portalthreekingdoms.Overwhelmi
 
     public OverwhelmingForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/OwlFamiliar.java b/Mage.Sets/src/mage/sets/masterseditioniv/OwlFamiliar.java
index 0dde5b4071..7eb0faf063 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/OwlFamiliar.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/OwlFamiliar.java
@@ -37,7 +37,7 @@ public class OwlFamiliar extends mage.sets.portal.OwlFamiliar {
 
     public OwlFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PentagramOfTheAges.java b/Mage.Sets/src/mage/sets/masterseditioniv/PentagramOfTheAges.java
index be42b2a5ce..451a406d1a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/PentagramOfTheAges.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/PentagramOfTheAges.java
@@ -38,7 +38,7 @@ public class PentagramOfTheAges extends mage.sets.iceage.PentagramOfTheAges {
 
     public PentagramOfTheAges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java
index 57aa8ede81..1fe0afe73f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java
@@ -38,7 +38,7 @@ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
 
     public PhantasmalForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalTerrain.java
index b684db7096..b4d3c1223a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Plateau.java b/Mage.Sets/src/mage/sets/masterseditioniv/Plateau.java
index b23bf24f9f..03792b2ef2 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Plateau.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Plateau.java
@@ -37,7 +37,7 @@ public class Plateau extends mage.sets.limitedalpha.Plateau {
 
     public Plateau(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PowerArtifact.java b/Mage.Sets/src/mage/sets/masterseditioniv/PowerArtifact.java
index 30a0f2a598..45308204fa 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/PowerArtifact.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/PowerArtifact.java
@@ -38,7 +38,7 @@ public class PowerArtifact extends mage.sets.antiquities.PowerArtifact {
 
     public PowerArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PrimalClay.java b/Mage.Sets/src/mage/sets/masterseditioniv/PrimalClay.java
index 2ccdc50240..1cc0fb9387 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/PrimalClay.java
@@ -38,7 +38,7 @@ public class PrimalClay extends mage.sets.fifthedition.PrimalClay {
 
     public PrimalClay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/masterseditioniv/ProdigalSorcerer.java
index 8f24245983..1cd507694e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/RadjanSpirit.java b/Mage.Sets/src/mage/sets/masterseditioniv/RadjanSpirit.java
index 4c6382a8e0..639ea77320 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/RadjanSpirit.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/RadjanSpirit.java
@@ -37,7 +37,7 @@ public class RadjanSpirit extends mage.sets.fifthedition.RadjanSpirit {
 
     public RadjanSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/RainOfDaggers.java b/Mage.Sets/src/mage/sets/masterseditioniv/RainOfDaggers.java
index ccb2a48837..6525728f0f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/RainOfDaggers.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/RainOfDaggers.java
@@ -37,7 +37,7 @@ public class RainOfDaggers extends mage.sets.portalsecondage.RainOfDaggers {
 
     public RainOfDaggers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Reconstruction.java b/Mage.Sets/src/mage/sets/masterseditioniv/Reconstruction.java
index c4658e255d..02952d74e5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Reconstruction.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Reconstruction.java
@@ -37,7 +37,7 @@ public class Reconstruction extends mage.sets.antiquities.Reconstruction {
 
     public Reconstruction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/RedElementalBlast.java b/Mage.Sets/src/mage/sets/masterseditioniv/RedElementalBlast.java
index cae9f7fcdb..95c2b2ae2f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/RedElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/RedElementalBlast.java
@@ -38,7 +38,7 @@ public class RedElementalBlast extends mage.sets.limitedalpha.RedElementalBlast
 
     public RedElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Regrowth.java b/Mage.Sets/src/mage/sets/masterseditioniv/Regrowth.java
index 8a48a31138..6328675bbc 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Regrowth.java
@@ -38,7 +38,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/RighteousCharge.java b/Mage.Sets/src/mage/sets/masterseditioniv/RighteousCharge.java
index fdd3fa4c57..a00244416e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/RighteousCharge.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/RighteousCharge.java
@@ -38,7 +38,7 @@ public class RighteousCharge extends mage.sets.gatecrash.RighteousCharge {
 
     public RighteousCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/RocOfKherRidges.java b/Mage.Sets/src/mage/sets/masterseditioniv/RocOfKherRidges.java
index 4b8987e0cb..559f7920ae 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/RocOfKherRidges.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/RocOfKherRidges.java
@@ -38,7 +38,7 @@ public class RocOfKherRidges extends mage.sets.limitedalpha.RocOfKherRidges {
 
     public RocOfKherRidges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/RockslideAmbush.java b/Mage.Sets/src/mage/sets/masterseditioniv/RockslideAmbush.java
index 04dbf11cca..5d291bcf0b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/RockslideAmbush.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/RockslideAmbush.java
@@ -38,7 +38,7 @@ public class RockslideAmbush extends mage.sets.portalthreekingdoms.RockslideAmbu
 
     public RockslideAmbush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Sandstorm.java b/Mage.Sets/src/mage/sets/masterseditioniv/Sandstorm.java
index 47c38a0a2c..ce7f060895 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Sandstorm.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Sandstorm.java
@@ -37,7 +37,7 @@ public class Sandstorm extends mage.sets.fourthedition.Sandstorm {
 
     public Sandstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Savannah.java b/Mage.Sets/src/mage/sets/masterseditioniv/Savannah.java
index 4b5abcd7f2..fe796102ae 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Savannah.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Savannah.java
@@ -37,7 +37,7 @@ public class Savannah extends mage.sets.limitedalpha.Savannah {
 
     public Savannah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SavannahLions.java b/Mage.Sets/src/mage/sets/masterseditioniv/SavannahLions.java
index 5757f6fce4..72973ff158 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SavannahLions.java
@@ -38,7 +38,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ScavengerFolk.java b/Mage.Sets/src/mage/sets/masterseditioniv/ScavengerFolk.java
index 2558f4781e..969acc6f0b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ScavengerFolk.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ScavengerFolk.java
@@ -38,7 +38,7 @@ public class ScavengerFolk extends mage.sets.fifthedition.ScavengerFolk {
 
     public ScavengerFolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ScavengingGhoul.java b/Mage.Sets/src/mage/sets/masterseditioniv/ScavengingGhoul.java
index b810b9d40f..03470f51ae 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ScavengingGhoul.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ScavengingGhoul.java
@@ -37,7 +37,7 @@ public class ScavengingGhoul extends mage.sets.limitedalpha.ScavengingGhoul {
 
     public ScavengingGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Scrubland.java b/Mage.Sets/src/mage/sets/masterseditioniv/Scrubland.java
index cb16f16f93..3952825e62 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Scrubland.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Scrubland.java
@@ -37,7 +37,7 @@ public class Scrubland extends mage.sets.limitedalpha.Scrubland {
 
     public Scrubland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SeaSerpent.java b/Mage.Sets/src/mage/sets/masterseditioniv/SeaSerpent.java
index 8402f07d52..f8a210c065 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SeaSerpent.java
@@ -37,7 +37,7 @@ public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
 
     public SeaSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SengirVampire.java b/Mage.Sets/src/mage/sets/masterseditioniv/SengirVampire.java
index d8cf0761c0..e00f367053 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAngel.java b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAngel.java
index dfb4150f6a..b7bd7744ef 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java
index 1822f4bd11..fcd738b194 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java
@@ -38,7 +38,7 @@ public class SerraAviary extends mage.sets.homelands.SerraAviary {
 
     public SerraAviary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Shapeshifter.java b/Mage.Sets/src/mage/sets/masterseditioniv/Shapeshifter.java
index 3f51ff922e..f340dd295c 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Shapeshifter.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Shapeshifter.java
@@ -38,7 +38,7 @@ public class Shapeshifter extends mage.sets.antiquities.Shapeshifter {
 
     public Shapeshifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ShivanDragon.java b/Mage.Sets/src/mage/sets/masterseditioniv/ShivanDragon.java
index 6e7d35dece..26508c8df8 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Sinkhole.java b/Mage.Sets/src/mage/sets/masterseditioniv/Sinkhole.java
index b8e043b445..be9cc33f74 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Sinkhole.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Sinkhole.java
@@ -38,7 +38,7 @@ public class Sinkhole extends mage.sets.limitedalpha.Sinkhole {
 
     public Sinkhole(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SleightOfHand.java b/Mage.Sets/src/mage/sets/masterseditioniv/SleightOfHand.java
index 742e4b931b..35ecf0c572 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SleightOfHand.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SleightOfHand.java
@@ -37,7 +37,7 @@ public class SleightOfHand extends mage.sets.ninthedition.SleightOfHand {
 
     public SleightOfHand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Smoke.java b/Mage.Sets/src/mage/sets/masterseditioniv/Smoke.java
index 0652c17ad6..48476444bf 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Smoke.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Smoke.java
@@ -37,7 +37,7 @@ public class Smoke extends mage.sets.limitedalpha.Smoke {
 
     public Smoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SolRing.java b/Mage.Sets/src/mage/sets/masterseditioniv/SolRing.java
index de7220aafe..4ff2c6711b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SolRing.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SolRing.java
@@ -38,7 +38,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SouthernElephant.java b/Mage.Sets/src/mage/sets/masterseditioniv/SouthernElephant.java
index 28cb070415..bd20a8519f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SouthernElephant.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SouthernElephant.java
@@ -37,7 +37,7 @@ public class SouthernElephant extends mage.sets.portalthreekingdoms.SouthernElep
 
     public SouthernElephant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SpottedGriffin.java b/Mage.Sets/src/mage/sets/masterseditioniv/SpottedGriffin.java
index 8da3169b42..e889598869 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SpottedGriffin.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SpottedGriffin.java
@@ -37,7 +37,7 @@ public class SpottedGriffin extends mage.sets.portal.SpottedGriffin {
 
     public SpottedGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Squall.java b/Mage.Sets/src/mage/sets/masterseditioniv/Squall.java
index 7e1ee50764..c0acce9dd1 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Squall.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Squall.java
@@ -39,7 +39,7 @@ public class Squall extends mage.sets.starter1999.Squall {
 
     public Squall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Stasis.java b/Mage.Sets/src/mage/sets/masterseditioniv/Stasis.java
index 2d93434ef4..526c5c5644 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Stasis.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Stasis.java
@@ -37,7 +37,7 @@ public class Stasis extends mage.sets.fifthedition.Stasis {
 
     public Stasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SteamCatapult.java b/Mage.Sets/src/mage/sets/masterseditioniv/SteamCatapult.java
index d73a8421fb..03ba88b045 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SteamCatapult.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SteamCatapult.java
@@ -37,7 +37,7 @@ public class SteamCatapult extends mage.sets.portalsecondage.SteamCatapult {
 
     public SteamCatapult(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/StripMine.java b/Mage.Sets/src/mage/sets/masterseditioniv/StripMine.java
index 68c8c4dc0b..489642e2ea 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/StripMine.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/StripMine.java
@@ -38,7 +38,7 @@ public class StripMine extends mage.sets.fourthedition.StripMine {
 
     public StripMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/masterseditioniv/SwordsToPlowshares.java
index a78162ab46..f130bc51ca 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SylvanTutor.java b/Mage.Sets/src/mage/sets/masterseditioniv/SylvanTutor.java
index 236b9f3cb0..1b56a483fe 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SylvanTutor.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SylvanTutor.java
@@ -38,7 +38,7 @@ public class SylvanTutor extends mage.sets.portal.SylvanTutor {
 
     public SylvanTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SymbolOfUnsummoning.java b/Mage.Sets/src/mage/sets/masterseditioniv/SymbolOfUnsummoning.java
index 8623042a52..eebe909913 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/SymbolOfUnsummoning.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SymbolOfUnsummoning.java
@@ -37,7 +37,7 @@ public class SymbolOfUnsummoning extends mage.sets.portal.SymbolOfUnsummoning {
 
     public SymbolOfUnsummoning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TabletOfEpityr.java b/Mage.Sets/src/mage/sets/masterseditioniv/TabletOfEpityr.java
index fce455c867..e60dd7c59e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TabletOfEpityr.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TabletOfEpityr.java
@@ -37,7 +37,7 @@ public class TabletOfEpityr extends mage.sets.antiquities.TabletOfEpityr {
 
     public TabletOfEpityr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Taiga.java b/Mage.Sets/src/mage/sets/masterseditioniv/Taiga.java
index ab7bf60143..ef25bf8f7a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Taiga.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Taiga.java
@@ -37,7 +37,7 @@ public class Taiga extends mage.sets.limitedalpha.Taiga {
 
     public Taiga(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TalasResearcher.java b/Mage.Sets/src/mage/sets/masterseditioniv/TalasResearcher.java
index 9aebac40c6..03828425b6 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TalasResearcher.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TalasResearcher.java
@@ -38,7 +38,7 @@ public class TalasResearcher extends mage.sets.portalsecondage.TalasResearcher {
 
     public TalasResearcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWand.java b/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWand.java
index 0e6ae39a76..39922ae419 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWand.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWand.java
@@ -38,7 +38,7 @@ public class TawnossWand extends mage.sets.antiquities.TawnossWand {
 
     public TawnossWand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWeaponry.java b/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWeaponry.java
index 9302c34739..8c38c5f4ec 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWeaponry.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TawnossWeaponry.java
@@ -37,7 +37,7 @@ public class TawnossWeaponry extends mage.sets.fifthedition.TawnossWeaponry {
 
     public TawnossWeaponry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TempleAcolyte.java b/Mage.Sets/src/mage/sets/masterseditioniv/TempleAcolyte.java
index 933026594b..c66048933a 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TempleAcolyte.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TempleAcolyte.java
@@ -37,7 +37,7 @@ public class TempleAcolyte extends mage.sets.elspethvstezzeret.TempleAcolyte {
 
     public TempleAcolyte(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Terror.java b/Mage.Sets/src/mage/sets/masterseditioniv/Terror.java
index 2613953ead..5d0c870128 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Terror.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Tetravus.java b/Mage.Sets/src/mage/sets/masterseditioniv/Tetravus.java
index c48a7bd00e..40cfa94fdf 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Tetravus.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Tetravus.java
@@ -37,7 +37,7 @@ public class Tetravus extends mage.sets.antiquities.Tetravus {
 
     public Tetravus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TheftOfDreams.java b/Mage.Sets/src/mage/sets/masterseditioniv/TheftOfDreams.java
index fa21c71af7..2b8f4a2699 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TheftOfDreams.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TheftOfDreams.java
@@ -38,7 +38,7 @@ public class TheftOfDreams extends mage.sets.exodus.TheftOfDreams {
 
     public TheftOfDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ThunderDragon.java b/Mage.Sets/src/mage/sets/masterseditioniv/ThunderDragon.java
index ba1d4d9aaa..ab72e9b077 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ThunderDragon.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ThunderDragon.java
@@ -37,7 +37,7 @@ public class ThunderDragon extends mage.sets.starter1999.ThunderDragon {
 
     public ThunderDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TimeVault.java b/Mage.Sets/src/mage/sets/masterseditioniv/TimeVault.java
index f159ec03b3..b4ec9fb8b5 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TimeVault.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TimeVault.java
@@ -37,7 +37,7 @@ public class TimeVault extends mage.sets.unlimitededition.TimeVault {
 
     public TimeVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TitaniasSong.java b/Mage.Sets/src/mage/sets/masterseditioniv/TitaniasSong.java
index b49176b982..67f9e77ec4 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TitaniasSong.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TitaniasSong.java
@@ -37,7 +37,7 @@ public class TitaniasSong extends mage.sets.fourthedition.TitaniasSong {
 
     public TitaniasSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TransmuteArtifact.java b/Mage.Sets/src/mage/sets/masterseditioniv/TransmuteArtifact.java
index 961783d73e..2a76bf58c0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TransmuteArtifact.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TransmuteArtifact.java
@@ -38,7 +38,7 @@ public class TransmuteArtifact extends mage.sets.antiquities.TransmuteArtifact {
 
     public TransmuteArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TriassicEgg.java b/Mage.Sets/src/mage/sets/masterseditioniv/TriassicEgg.java
index ff16671e17..f3cc6144fe 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TriassicEgg.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TriassicEgg.java
@@ -37,7 +37,7 @@ public class TriassicEgg extends mage.sets.legends.TriassicEgg {
 
     public TriassicEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/TropicalIsland.java b/Mage.Sets/src/mage/sets/masterseditioniv/TropicalIsland.java
index fcbd682497..e6f7665988 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/TropicalIsland.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/TropicalIsland.java
@@ -37,7 +37,7 @@ public class TropicalIsland extends mage.sets.limitedalpha.TropicalIsland {
 
     public TropicalIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Tsunami.java b/Mage.Sets/src/mage/sets/masterseditioniv/Tsunami.java
index 4ea667c5ba..42a2b1b6ad 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Tsunami.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Tsunami.java
@@ -38,7 +38,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
 
     public Tsunami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Tundra.java b/Mage.Sets/src/mage/sets/masterseditioniv/Tundra.java
index 1b7d30f336..9553ff4423 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Tundra.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Tundra.java
@@ -37,7 +37,7 @@ public class Tundra extends mage.sets.limitedalpha.Tundra {
 
     public Tundra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/UndergroundSea.java b/Mage.Sets/src/mage/sets/masterseditioniv/UndergroundSea.java
index 5a0d0f88f1..610879183e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/UndergroundSea.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/UndergroundSea.java
@@ -37,7 +37,7 @@ public class UndergroundSea extends mage.sets.limitedalpha.UndergroundSea {
 
     public UndergroundSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasChalice.java b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasChalice.java
index 9d184f36d9..235711db0b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasChalice.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasChalice.java
@@ -37,7 +37,7 @@ public class UrzasChalice extends mage.sets.antiquities.UrzasChalice {
 
     public UrzasChalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasMine.java b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasMine.java
index d46e2551be..055a4a9d14 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasMine.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasMine.java
@@ -40,7 +40,7 @@ public class UrzasMine extends mage.sets.fifthedition.UrzasMine {
     
     public UrzasMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasPowerPlant.java b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasPowerPlant.java
index a1f1db2fb8..c46d6b6711 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasPowerPlant.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasPowerPlant.java
@@ -40,7 +40,7 @@ public class UrzasPowerPlant extends mage.sets.fifthedition.UrzasPowerPlant {
     
     public UrzasPowerPlant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasTower.java b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasTower.java
index fac0799969..8375db0e17 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/UrzasTower.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/UrzasTower.java
@@ -39,7 +39,7 @@ public class UrzasTower extends mage.sets.fifthedition.UrzasTower {
     // TODO: Support the four different images that exist for this set
     public UrzasTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.LAND;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/VolcanicIsland.java b/Mage.Sets/src/mage/sets/masterseditioniv/VolcanicIsland.java
index 665948df2e..0aed69f6b0 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/VolcanicIsland.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/VolcanicIsland.java
@@ -37,7 +37,7 @@ public class VolcanicIsland extends mage.sets.unlimitededition.VolcanicIsland {
 
     public VolcanicIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WarMammoth.java b/Mage.Sets/src/mage/sets/masterseditioniv/WarMammoth.java
index f9377db2a3..ec3bfef073 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WarMammoth.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WarMammoth.java
@@ -37,7 +37,7 @@ public class WarMammoth extends mage.sets.fifthedition.WarMammoth {
 
     public WarMammoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WarpArtifact.java b/Mage.Sets/src/mage/sets/masterseditioniv/WarpArtifact.java
index 0c04ffb3d4..ac06aca599 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WarpArtifact.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WarpArtifact.java
@@ -38,7 +38,7 @@ public class WarpArtifact extends mage.sets.fifthedition.WarpArtifact {
 
     public WarpArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WaterElemental.java b/Mage.Sets/src/mage/sets/masterseditioniv/WaterElemental.java
index af6d4dd53d..faf448832e 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WaterElemental.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WaterElemental.java
@@ -37,7 +37,7 @@ public class WaterElemental extends mage.sets.fourthedition.WaterElemental {
 
     public WaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Weakness.java b/Mage.Sets/src/mage/sets/masterseditioniv/Weakness.java
index caeb30db60..fa80b34e53 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Weakness.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Weakstone.java b/Mage.Sets/src/mage/sets/masterseditioniv/Weakstone.java
index a225e5ea93..9692010797 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/Weakstone.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Weakstone.java
@@ -37,7 +37,7 @@ public class Weakstone extends mage.sets.antiquities.Weakstone {
 
     public Weakstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WheelOfFortune.java b/Mage.Sets/src/mage/sets/masterseditioniv/WheelOfFortune.java
index 679dba383f..ff0a045fef 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WheelOfFortune.java
@@ -37,7 +37,7 @@ public class WheelOfFortune extends mage.sets.limitedalpha.WheelOfFortune {
 
     public WheelOfFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WhiptailWurm.java b/Mage.Sets/src/mage/sets/masterseditioniv/WhiptailWurm.java
index a5b5fc8332..4d5b82f8fa 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WhiptailWurm.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WhiptailWurm.java
@@ -37,7 +37,7 @@ public class WhiptailWurm extends mage.sets.portal.WhiptailWurm {
 
     public WhiptailWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WhiteKnight.java b/Mage.Sets/src/mage/sets/masterseditioniv/WhiteKnight.java
index 03ec23d348..f808fee941 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WickedPact.java b/Mage.Sets/src/mage/sets/masterseditioniv/WickedPact.java
index 50d791d1f0..4d9137561d 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WickedPact.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WickedPact.java
@@ -38,7 +38,7 @@ public class WickedPact extends mage.sets.portal.WickedPact {
 
     public WickedPact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WildGriffin.java b/Mage.Sets/src/mage/sets/masterseditioniv/WildGriffin.java
index 81fb8ea869..a4ca880a90 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WildGriffin.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WildGriffin.java
@@ -37,7 +37,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin {
 
     public WildGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/WildOx.java b/Mage.Sets/src/mage/sets/masterseditioniv/WildOx.java
index 0c346df4ed..cf83c7e5d9 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/WildOx.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/WildOx.java
@@ -37,7 +37,7 @@ public class WildOx extends mage.sets.portalsecondage.WildOx {
 
     public WildOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/YotianSoldier.java b/Mage.Sets/src/mage/sets/masterseditioniv/YotianSoldier.java
index 4eb3eaa6b0..24af63b84f 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/YotianSoldier.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/YotianSoldier.java
@@ -37,7 +37,7 @@ public class YotianSoldier extends mage.sets.mirrodin.YotianSoldier {
 
     public YotianSoldier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "ME4";
     }
 
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ZombieMaster.java b/Mage.Sets/src/mage/sets/masterseditioniv/ZombieMaster.java
index 22f5c08060..a764a527e4 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "ME4";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Acquire.java b/Mage.Sets/src/mage/sets/mediainserts/Acquire.java
index eaa8683c4c..d7e76a3da5 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Acquire.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Acquire.java
@@ -6,7 +6,7 @@ public class Acquire extends mage.sets.fifthdawn.Acquire {
     
     public Acquire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AeronautTinkerer.java b/Mage.Sets/src/mage/sets/mediainserts/AeronautTinkerer.java
index 872d6eacf3..2355048d9e 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AeronautTinkerer.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AeronautTinkerer.java
@@ -37,7 +37,7 @@ public class AeronautTinkerer extends mage.sets.magic2015.AeronautTinkerer {
 
     public AeronautTinkerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/sets/mediainserts/AjaniCallerOfThePride.java
index c952c05b1c..ab74f75a09 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AjaniCallerOfThePride.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AjaniCallerOfThePride.java
@@ -6,7 +6,7 @@ public class AjaniCallerOfThePride extends mage.sets.magic2013.AjaniCallerOfTheP
     
     public AjaniCallerOfThePride(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AjaniSteadfast.java b/Mage.Sets/src/mage/sets/mediainserts/AjaniSteadfast.java
index 26e9c11121..d070fda498 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AjaniSteadfast.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AjaniSteadfast.java
@@ -6,7 +6,7 @@ public class AjaniSteadfast extends mage.sets.magic2015.AjaniSteadfast {
     
     public AjaniSteadfast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/sets/mediainserts/AlhammarretHighArbiter.java
index 3b35f7b081..7d42058f7f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AlhammarretHighArbiter.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AlhammarretHighArbiter.java
@@ -38,7 +38,7 @@ public class AlhammarretHighArbiter extends mage.sets.magicorigins.AlhammarretHi
 
     public AlhammarretHighArbiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AngelOfGlorysRise.java b/Mage.Sets/src/mage/sets/mediainserts/AngelOfGlorysRise.java
index 47c607c46c..2dfa319ea4 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AngelOfGlorysRise.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AngelOfGlorysRise.java
@@ -6,7 +6,7 @@ public class AngelOfGlorysRise extends mage.sets.avacynrestored.AngelOfGlorysRis
     
     public AngelOfGlorysRise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AngelicSkirmisher.java b/Mage.Sets/src/mage/sets/mediainserts/AngelicSkirmisher.java
index 6d8093f499..679e8bb95e 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AngelicSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AngelicSkirmisher.java
@@ -6,7 +6,7 @@ public class AngelicSkirmisher extends mage.sets.gatecrash.AngelicSkirmisher {
     
     public AngelicSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AnkleShanker.java b/Mage.Sets/src/mage/sets/mediainserts/AnkleShanker.java
index 54306dcc9f..09aeb37eab 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AnkleShanker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AnkleShanker.java
@@ -6,7 +6,7 @@ public class AnkleShanker extends mage.sets.khansoftarkir.AnkleShanker {
     
     public AnkleShanker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ArashinSovereign.java b/Mage.Sets/src/mage/sets/mediainserts/ArashinSovereign.java
index 58fb78efed..7304378489 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ArashinSovereign.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ArashinSovereign.java
@@ -38,7 +38,7 @@ public class ArashinSovereign extends mage.sets.dragonsoftarkir.ArashinSovereign
 
     public ArashinSovereign(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ArchfiendOfDepravity.java b/Mage.Sets/src/mage/sets/mediainserts/ArchfiendOfDepravity.java
index 0df29acf88..98ad63a225 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ArchfiendOfDepravity.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ArchfiendOfDepravity.java
@@ -38,7 +38,7 @@ public class ArchfiendOfDepravity extends mage.sets.fatereforged.ArchfiendOfDepr
 
     public ArchfiendOfDepravity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Arena.java b/Mage.Sets/src/mage/sets/mediainserts/Arena.java
index 43641d003c..66a417ede0 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Arena.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Arena.java
@@ -33,7 +33,7 @@ public class Arena extends mage.sets.timeshifted.Arena {
     
     public Arena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Arrest.java b/Mage.Sets/src/mage/sets/mediainserts/Arrest.java
index 8b788f55c7..d21edc7efc 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Arrest.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Arrest.java
@@ -6,7 +6,7 @@ public class Arrest extends mage.sets.mirrodin.Arrest {
     
     public Arrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AssembledAlphas.java b/Mage.Sets/src/mage/sets/mediainserts/AssembledAlphas.java
index 005a4de31f..91eb86d9ee 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AssembledAlphas.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AssembledAlphas.java
@@ -37,7 +37,7 @@ public class AssembledAlphas extends mage.sets.eldritchmoon.AssembledAlphas {
 
     public AssembledAlphas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/AvalancheTusker.java b/Mage.Sets/src/mage/sets/mediainserts/AvalancheTusker.java
index 995cba52d8..82de34d213 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/AvalancheTusker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/AvalancheTusker.java
@@ -6,7 +6,7 @@ public class AvalancheTusker extends mage.sets.khansoftarkir.AvalancheTusker {
     
     public AvalancheTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BarrageTyrant.java b/Mage.Sets/src/mage/sets/mediainserts/BarrageTyrant.java
index b00fc2f463..a4d2a546e4 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BarrageTyrant.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BarrageTyrant.java
@@ -38,7 +38,7 @@ public class BarrageTyrant extends mage.sets.battleforzendikar.BarrageTyrant {
 
     public BarrageTyrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/mediainserts/BirdsOfParadise.java
index 615c0c9e59..56d3a3aea7 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BirdsOfParadise.java
@@ -34,7 +34,7 @@ public class BirdsOfParadise extends mage.sets.ravnica.BirdsOfParadise {
     
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/mediainserts/BloodthroneVampire.java
index a29cf7aeba..b242d944a7 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BloodthroneVampire.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BloodthroneVampire.java
@@ -6,7 +6,7 @@ public class BloodthroneVampire extends mage.sets.riseoftheeldrazi.BloodthroneVa
     
     public BloodthroneVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/mediainserts/BlueElementalBlast.java
index a93e2a6968..35eb27daf5 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BlueElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BlueElementalBlast.java
@@ -6,7 +6,7 @@ public class BlueElementalBlast extends mage.sets.limitedalpha.BlueElementalBlas
     
     public BlueElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BoltwingMarauder.java b/Mage.Sets/src/mage/sets/mediainserts/BoltwingMarauder.java
index 575017da95..746818b00e 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BoltwingMarauder.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BoltwingMarauder.java
@@ -38,7 +38,7 @@ public class BoltwingMarauder extends mage.sets.dragonsoftarkir.BoltwingMarauder
 
     public BoltwingMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BonescytheSliver.java b/Mage.Sets/src/mage/sets/mediainserts/BonescytheSliver.java
index ad8fbbd85c..de097e1431 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BonescytheSliver.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BonescytheSliver.java
@@ -6,7 +6,7 @@ public class BonescytheSliver extends mage.sets.magic2014.BonescytheSliver {
     
     public BonescytheSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BreathOfMalfegor.java b/Mage.Sets/src/mage/sets/mediainserts/BreathOfMalfegor.java
index f492a42ac4..d899b88454 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BreathOfMalfegor.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BreathOfMalfegor.java
@@ -6,7 +6,7 @@ public class BreathOfMalfegor extends mage.sets.alarareborn.BreathOfMalfegor {
     
     public BreathOfMalfegor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BrionStoutarm.java b/Mage.Sets/src/mage/sets/mediainserts/BrionStoutarm.java
index d27246faf2..8ade05fd11 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BrionStoutarm.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BrionStoutarm.java
@@ -6,7 +6,7 @@ public class BrionStoutarm extends mage.sets.lorwyn.BrionStoutarm {
     
     public BrionStoutarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/BroodmateDragon.java b/Mage.Sets/src/mage/sets/mediainserts/BroodmateDragon.java
index ef5eb909e9..91178c79f7 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/BroodmateDragon.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/BroodmateDragon.java
@@ -6,7 +6,7 @@ public class BroodmateDragon extends mage.sets.shardsofalara.BroodmateDragon {
     
     public BroodmateDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/CathedralOfWar.java b/Mage.Sets/src/mage/sets/mediainserts/CathedralOfWar.java
index f49513bb93..c32f0c1097 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/CathedralOfWar.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/CathedralOfWar.java
@@ -6,7 +6,7 @@ public class CathedralOfWar extends mage.sets.magic2013.CathedralOfWar {
     
     public CathedralOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/CelestialColonnade.java b/Mage.Sets/src/mage/sets/mediainserts/CelestialColonnade.java
index 1dc1dfc468..c4b6bbbb30 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/CelestialColonnade.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/CelestialColonnade.java
@@ -38,7 +38,7 @@ public class CelestialColonnade extends mage.sets.worldwake.CelestialColonnade {
 
     public CelestialColonnade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ChandraFireOfKaladesh.java b/Mage.Sets/src/mage/sets/mediainserts/ChandraFireOfKaladesh.java
index 5b2a9a0968..d9dc48a97b 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ChandraFireOfKaladesh.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ChandraFireOfKaladesh.java
@@ -38,7 +38,7 @@ public class ChandraFireOfKaladesh extends mage.sets.magicorigins.ChandraFireOfK
 
     public ChandraFireOfKaladesh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 997;
+        this.cardNumber = "997";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster.java b/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster.java
index d88528d0ce..545652f0b1 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster.java
@@ -6,7 +6,7 @@ public class ChandraPyromaster extends mage.sets.magic2015.ChandraPyromaster {
     
     public ChandraPyromaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster2.java b/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster2.java
index e9169f2d3a..3276da5891 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster2.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ChandraPyromaster2.java
@@ -6,7 +6,7 @@ public class ChandraPyromaster2 extends mage.sets.magic2015.ChandraPyromaster {
     
     public ChandraPyromaster2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ChandraRoaringFlame.java b/Mage.Sets/src/mage/sets/mediainserts/ChandraRoaringFlame.java
index d4a9a0bafc..03fa133942 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ChandraRoaringFlame.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ChandraRoaringFlame.java
@@ -38,7 +38,7 @@ public class ChandraRoaringFlame extends mage.sets.magicorigins.ChandraRoaringFl
 
     public ChandraRoaringFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 997;
+        this.cardNumber = "997";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ChandrasFury.java b/Mage.Sets/src/mage/sets/mediainserts/ChandrasFury.java
index 7838ff4f95..6ee0dc1331 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ChandrasFury.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ChandrasFury.java
@@ -6,7 +6,7 @@ public class ChandrasFury extends mage.sets.magic2013.ChandrasFury {
     
     public ChandrasFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ChandrasPhoenix.java b/Mage.Sets/src/mage/sets/mediainserts/ChandrasPhoenix.java
index de01adcc57..2776f490a0 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ChandrasPhoenix.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ChandrasPhoenix.java
@@ -33,7 +33,7 @@ public class ChandrasPhoenix extends mage.sets.magic2012.ChandrasPhoenix {
 
     public ChandrasPhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/mediainserts/ConsumeSpirit.java
index 30ae875884..98abd8b1e2 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ConsumeSpirit.java
@@ -6,7 +6,7 @@ public class ConsumeSpirit extends mage.sets.planechase.ConsumeSpirit {
     
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Corrupt.java b/Mage.Sets/src/mage/sets/mediainserts/Corrupt.java
index f3719e81bd..cbc8988c0f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Corrupt.java
@@ -6,7 +6,7 @@ public class Corrupt extends mage.sets.magic2014.Corrupt {
     
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DayOfJudgment.java b/Mage.Sets/src/mage/sets/mediainserts/DayOfJudgment.java
index 14a87e3522..88f61375a1 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DayOfJudgment.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DayOfJudgment.java
@@ -6,7 +6,7 @@ public class DayOfJudgment extends mage.sets.zendikar.DayOfJudgment {
     
     public DayOfJudgment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DeepfathomSkulker.java b/Mage.Sets/src/mage/sets/mediainserts/DeepfathomSkulker.java
index 399f8a7a02..18f4f142a6 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DeepfathomSkulker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DeepfathomSkulker.java
@@ -37,7 +37,7 @@ public class DeepfathomSkulker extends mage.sets.oathofthegatewatch.DeepfathomSk
 
     public DeepfathomSkulker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DefiantBloodlord.java b/Mage.Sets/src/mage/sets/mediainserts/DefiantBloodlord.java
index 7db8c80f79..c9519a8cd8 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DefiantBloodlord.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DefiantBloodlord.java
@@ -38,7 +38,7 @@ public class DefiantBloodlord extends mage.sets.battleforzendikar.DefiantBloodlo
 
     public DefiantBloodlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DevilsPlay.java b/Mage.Sets/src/mage/sets/mediainserts/DevilsPlay.java
index 80f202c66a..ce46ce65a3 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DevilsPlay.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DevilsPlay.java
@@ -6,7 +6,7 @@ public class DevilsPlay extends mage.sets.innistrad.DevilsPlay {
     
     public DevilsPlay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DragonFodder.java b/Mage.Sets/src/mage/sets/mediainserts/DragonFodder.java
index c7dd1bcc48..04c93cf962 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DragonFodder.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DragonFodder.java
@@ -37,7 +37,7 @@ public class DragonFodder extends mage.sets.shardsofalara.DragonFodder {
 
     public DragonFodder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DragonlordsServant.java b/Mage.Sets/src/mage/sets/mediainserts/DragonlordsServant.java
index 2e017e7ab4..36c12f8b48 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DragonlordsServant.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DragonlordsServant.java
@@ -38,7 +38,7 @@ public class DragonlordsServant extends mage.sets.dragonsoftarkir.DragonlordsSer
 
     public DragonlordsServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DragonscaleGeneral.java b/Mage.Sets/src/mage/sets/mediainserts/DragonscaleGeneral.java
index fcdf0a9354..bb441a6992 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DragonscaleGeneral.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DragonscaleGeneral.java
@@ -38,7 +38,7 @@ public class DragonscaleGeneral extends mage.sets.fatereforged.DragonscaleGenera
 
     public DragonscaleGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DreadDefiler.java b/Mage.Sets/src/mage/sets/mediainserts/DreadDefiler.java
index 21684ed27c..9463a7bf7a 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DreadDefiler.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DreadDefiler.java
@@ -37,7 +37,7 @@ public class DreadDefiler extends mage.sets.oathofthegatewatch.DreadDefiler {
 
     public DreadDefiler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DregMangler.java b/Mage.Sets/src/mage/sets/mediainserts/DregMangler.java
index eec6b31f59..83866a1c00 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DregMangler.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DregMangler.java
@@ -6,7 +6,7 @@ public class DregMangler extends mage.sets.returntoravnica.DregMangler {
     
     public DregMangler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DrogskolCavalry.java b/Mage.Sets/src/mage/sets/mediainserts/DrogskolCavalry.java
index 6029df4e83..e554fed630 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DrogskolCavalry.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DrogskolCavalry.java
@@ -37,7 +37,7 @@ public class DrogskolCavalry extends mage.sets.shadowsoverinnistrad.DrogskolCava
 
     public DrogskolCavalry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DromokaTheEternal.java b/Mage.Sets/src/mage/sets/mediainserts/DromokaTheEternal.java
index 2bb283df8f..09d0c84c21 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DromokaTheEternal.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DromokaTheEternal.java
@@ -38,7 +38,7 @@ public class DromokaTheEternal extends mage.sets.fatereforged.DromokaTheEternal
 
     public DromokaTheEternal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DrownerOfHope.java b/Mage.Sets/src/mage/sets/mediainserts/DrownerOfHope.java
index 6823e536aa..6a49f81569 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DrownerOfHope.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DrownerOfHope.java
@@ -38,7 +38,7 @@ public class DrownerOfHope extends mage.sets.battleforzendikar.DrownerOfHope {
 
     public DrownerOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Duress.java b/Mage.Sets/src/mage/sets/mediainserts/Duress.java
index 68e16d0e6f..484077572f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Duress.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/DwynenGiltLeafDaen.java b/Mage.Sets/src/mage/sets/mediainserts/DwynenGiltLeafDaen.java
index 37ce993bad..fa39f041ab 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/DwynenGiltLeafDaen.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/DwynenGiltLeafDaen.java
@@ -38,7 +38,7 @@ public class DwynenGiltLeafDaen extends mage.sets.magicorigins.DwynenGiltLeafDae
 
     public DwynenGiltLeafDaen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/EidolonOfBlossoms.java b/Mage.Sets/src/mage/sets/mediainserts/EidolonOfBlossoms.java
index 0f5b67ee51..412e3e341d 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/EidolonOfBlossoms.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/EidolonOfBlossoms.java
@@ -6,7 +6,7 @@ public class EidolonOfBlossoms extends mage.sets.journeyintonyx.EidolonOfBlossom
     
     public EidolonOfBlossoms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Electrolyze.java b/Mage.Sets/src/mage/sets/mediainserts/Electrolyze.java
index cbf5c6940b..08cd12c64a 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Electrolyze.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Electrolyze.java
@@ -6,7 +6,7 @@ public class Electrolyze extends mage.sets.guildpact.Electrolyze {
     
     public Electrolyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ElusiveTormentor.java b/Mage.Sets/src/mage/sets/mediainserts/ElusiveTormentor.java
index fb3c606e42..dff8231d01 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ElusiveTormentor.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ElusiveTormentor.java
@@ -37,7 +37,7 @@ public class ElusiveTormentor extends mage.sets.shadowsoverinnistrad.ElusiveTorm
 
     public ElusiveTormentor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/EvolvingWilds.java b/Mage.Sets/src/mage/sets/mediainserts/EvolvingWilds.java
index d921ecdf4d..2271c22ee1 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FaithlessLooting.java b/Mage.Sets/src/mage/sets/mediainserts/FaithlessLooting.java
index 45f4ac1698..5cde01e04b 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FaithlessLooting.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FaithlessLooting.java
@@ -6,7 +6,7 @@ public class FaithlessLooting extends mage.sets.darkascension.FaithlessLooting {
     
     public FaithlessLooting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FatedConflagration.java b/Mage.Sets/src/mage/sets/mediainserts/FatedConflagration.java
index 6cdc3992f4..eb7ca98b1b 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FatedConflagration.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FatedConflagration.java
@@ -6,7 +6,7 @@ public class FatedConflagration extends mage.sets.bornofthegods.FatedConflagrati
     
     public FatedConflagration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FeastOfBlood.java b/Mage.Sets/src/mage/sets/mediainserts/FeastOfBlood.java
index 7f54d8997e..b2e82a7d80 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FeastOfBlood.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FeastOfBlood.java
@@ -6,7 +6,7 @@ public class FeastOfBlood extends mage.sets.zendikar.FeastOfBlood {
     
     public FeastOfBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Fireball.java b/Mage.Sets/src/mage/sets/mediainserts/Fireball.java
index 9133ded942..0424b1beb2 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Fireball.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Fireball.java
@@ -6,7 +6,7 @@ public class Fireball extends mage.sets.limitedalpha.Fireball {
     
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FlamebladeAngel.java b/Mage.Sets/src/mage/sets/mediainserts/FlamebladeAngel.java
index 7ad3f11b85..5936a42704 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FlamebladeAngel.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FlamebladeAngel.java
@@ -37,7 +37,7 @@ public class FlamebladeAngel extends mage.sets.shadowsoverinnistrad.FlamebladeAn
 
     public FlamebladeAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FlamerushRider.java b/Mage.Sets/src/mage/sets/mediainserts/FlamerushRider.java
index e005213db3..5c783faee6 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FlamerushRider.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FlamerushRider.java
@@ -38,7 +38,7 @@ public class FlamerushRider extends mage.sets.fatereforged.FlamerushRider {
 
     public FlamerushRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FoeRazerRegent.java b/Mage.Sets/src/mage/sets/mediainserts/FoeRazerRegent.java
index bde27d9ff5..24e1946ff3 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FoeRazerRegent.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FoeRazerRegent.java
@@ -38,7 +38,7 @@ public class FoeRazerRegent extends mage.sets.dragonsoftarkir.FoeRazerRegent {
 
     public FoeRazerRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/FrostTitan.java b/Mage.Sets/src/mage/sets/mediainserts/FrostTitan.java
index a642e3d7c8..588b906cfa 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/FrostTitan.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/FrostTitan.java
@@ -6,7 +6,7 @@ public class FrostTitan extends mage.sets.magic2011.FrostTitan {
     
     public FrostTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GarrukApexPredator.java b/Mage.Sets/src/mage/sets/mediainserts/GarrukApexPredator.java
index 43354f6370..3ecd10b8ea 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GarrukApexPredator.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GarrukApexPredator.java
@@ -6,7 +6,7 @@ public class GarrukApexPredator extends mage.sets.magic2015.GarrukApexPredator {
     
     public GarrukApexPredator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GarrukCallerOfBeasts.java b/Mage.Sets/src/mage/sets/mediainserts/GarrukCallerOfBeasts.java
index 8806032c61..dfa5c3024f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GarrukCallerOfBeasts.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GarrukCallerOfBeasts.java
@@ -6,7 +6,7 @@ public class GarrukCallerOfBeasts extends mage.sets.magic2014.GarrukCallerOfBeas
     
     public GarrukCallerOfBeasts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/mediainserts/GarrukWildspeaker.java
index f12d4e6965..1ce28650cf 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GarrukWildspeaker.java
@@ -6,7 +6,7 @@ public class GarrukWildspeaker extends mage.sets.lorwyn.GarrukWildspeaker {
     
     public GarrukWildspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GazeOfGranite.java b/Mage.Sets/src/mage/sets/mediainserts/GazeOfGranite.java
index 074559d299..c2874c12fd 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GazeOfGranite.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GazeOfGranite.java
@@ -6,7 +6,7 @@ public class GazeOfGranite extends mage.sets.dragonsmaze.GazeOfGranite {
     
     public GazeOfGranite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GenesisHydra.java b/Mage.Sets/src/mage/sets/mediainserts/GenesisHydra.java
index f4079f3715..fc085df377 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GenesisHydra.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GenesisHydra.java
@@ -38,7 +38,7 @@ public class GenesisHydra extends mage.sets.magic2015.GenesisHydra {
 
     public GenesisHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GiantBadger.java b/Mage.Sets/src/mage/sets/mediainserts/GiantBadger.java
index 7a982f435d..e71a9c7ce5 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GiantBadger.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GiantBadger.java
@@ -38,7 +38,7 @@ public class GiantBadger extends mage.sets.eighthedition.GiantBadger {
 
     public GiantBadger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GideonBattleForged.java b/Mage.Sets/src/mage/sets/mediainserts/GideonBattleForged.java
index 6c1e26540a..74e503b62d 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GideonBattleForged.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GideonBattleForged.java
@@ -38,7 +38,7 @@ public class GideonBattleForged extends mage.sets.magicorigins.GideonBattleForge
 
     public GideonBattleForged(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 994;
+        this.cardNumber = "994";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GladehartCavalry.java b/Mage.Sets/src/mage/sets/mediainserts/GladehartCavalry.java
index 22d527083d..2454fd71d1 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GladehartCavalry.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GladehartCavalry.java
@@ -37,7 +37,7 @@ public class GladehartCavalry extends mage.sets.oathofthegatewatch.GladehartCava
 
     public GladehartCavalry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GoblinDarkDwellers.java b/Mage.Sets/src/mage/sets/mediainserts/GoblinDarkDwellers.java
index 4848340019..f243bd3f56 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GoblinDarkDwellers.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GoblinDarkDwellers.java
@@ -37,7 +37,7 @@ public class GoblinDarkDwellers extends mage.sets.oathofthegatewatch.GoblinDarkD
 
     public GoblinDarkDwellers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GoblinRabblemaster.java b/Mage.Sets/src/mage/sets/mediainserts/GoblinRabblemaster.java
index cb8ab48e27..1477f150ea 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GoblinRabblemaster.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GoblinRabblemaster.java
@@ -6,7 +6,7 @@ public class GoblinRabblemaster extends mage.sets.magic2015.GoblinRabblemaster {
     
     public GoblinRabblemaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GraveTitan.java b/Mage.Sets/src/mage/sets/mediainserts/GraveTitan.java
index 1ef37b6db7..2bce9d583c 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GraveTitan.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GraveTitan.java
@@ -6,7 +6,7 @@ public class GraveTitan extends mage.sets.magic2011.GraveTitan {
     
     public GraveTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Gravecrawler.java b/Mage.Sets/src/mage/sets/mediainserts/Gravecrawler.java
index ba2b7a3668..9fd43b5268 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Gravecrawler.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Gravecrawler.java
@@ -6,7 +6,7 @@ public class Gravecrawler extends mage.sets.darkascension.Gravecrawler {
     
     public Gravecrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/GuulDrazAssassin.java b/Mage.Sets/src/mage/sets/mediainserts/GuulDrazAssassin.java
index ca15670474..d0ce6dbe11 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/GuulDrazAssassin.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/GuulDrazAssassin.java
@@ -6,7 +6,7 @@ public class GuulDrazAssassin extends mage.sets.riseoftheeldrazi.GuulDrazAssassi
     
     public GuulDrazAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/mediainserts/HamletbackGoliath.java
index 10bd35c97a..702b3b44e9 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HamletbackGoliath.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HamletbackGoliath.java
@@ -6,7 +6,7 @@ public class HamletbackGoliath extends mage.sets.lorwyn.HamletbackGoliath {
     
     public HamletbackGoliath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HarbingerOfTheHunt.java b/Mage.Sets/src/mage/sets/mediainserts/HarbingerOfTheHunt.java
index d084f6b9cc..afb24a4497 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HarbingerOfTheHunt.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HarbingerOfTheHunt.java
@@ -38,7 +38,7 @@ public class HarbingerOfTheHunt extends mage.sets.dragonsoftarkir.HarbingerOfThe
 
     public HarbingerOfTheHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HeroOfGomaFada.java b/Mage.Sets/src/mage/sets/mediainserts/HeroOfGomaFada.java
index 8267c9ccc2..5dc18abd34 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HeroOfGomaFada.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HeroOfGomaFada.java
@@ -38,7 +38,7 @@ public class HeroOfGomaFada extends mage.sets.battleforzendikar.HeroOfGomaFada {
 
     public HeroOfGomaFada(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HighTide.java b/Mage.Sets/src/mage/sets/mediainserts/HighTide.java
index cb043e3ce0..c6a6423d66 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HighTide.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HighTide.java
@@ -6,7 +6,7 @@ public class HighTide extends mage.sets.fallenempires.HighTide1 {
 
     public HighTide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HixusPrisonWarden.java b/Mage.Sets/src/mage/sets/mediainserts/HixusPrisonWarden.java
index ae16b80f25..297bf64738 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HixusPrisonWarden.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HixusPrisonWarden.java
@@ -38,7 +38,7 @@ public class HixusPrisonWarden extends mage.sets.magicorigins.HixusPrisonWarden
 
     public HixusPrisonWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HonorOfThePure.java b/Mage.Sets/src/mage/sets/mediainserts/HonorOfThePure.java
index 0e0cbfc173..2bbf9a0db9 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HonorOfThePure.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HonorOfThePure.java
@@ -6,7 +6,7 @@ public class HonorOfThePure extends mage.sets.magic2010.HonorOfThePure {
     
     public HonorOfThePure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/HonoredHierarch.java b/Mage.Sets/src/mage/sets/mediainserts/HonoredHierarch.java
index 72ff027ea5..66ddb28ed7 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/HonoredHierarch.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/HonoredHierarch.java
@@ -38,7 +38,7 @@ public class HonoredHierarch extends mage.sets.magicorigins.HonoredHierarch {
 
     public HonoredHierarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/InfernoTitan.java b/Mage.Sets/src/mage/sets/mediainserts/InfernoTitan.java
index 88507634eb..9249a974cd 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/InfernoTitan.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/InfernoTitan.java
@@ -6,7 +6,7 @@ public class InfernoTitan extends mage.sets.magic2011.InfernoTitan {
     
     public InfernoTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/InsidiousMist.java b/Mage.Sets/src/mage/sets/mediainserts/InsidiousMist.java
index 207d42f57c..7224244b1e 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/InsidiousMist.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/InsidiousMist.java
@@ -37,7 +37,7 @@ public class InsidiousMist extends mage.sets.shadowsoverinnistrad.InsidiousMist
 
     public InsidiousMist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/IvorytuskFortress.java b/Mage.Sets/src/mage/sets/mediainserts/IvorytuskFortress.java
index 09fb5cb0ac..db231d8565 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/IvorytuskFortress.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/IvorytuskFortress.java
@@ -6,7 +6,7 @@ public class IvorytuskFortress extends mage.sets.khansoftarkir.IvorytuskFortress
     
     public IvorytuskFortress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/JaceBeleren.java b/Mage.Sets/src/mage/sets/mediainserts/JaceBeleren.java
index 26f2ae2b4b..4616ca7918 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/JaceBeleren.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/JaceBeleren.java
@@ -6,7 +6,7 @@ public class JaceBeleren extends mage.sets.lorwyn.JaceBeleren {
     
     public JaceBeleren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/mediainserts/JaceMemoryAdept.java
index f0c828078a..e67c8f9093 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/JaceMemoryAdept.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/JaceMemoryAdept.java
@@ -6,7 +6,7 @@ public class JaceMemoryAdept extends mage.sets.magic2012.JaceMemoryAdept {
     
     public JaceMemoryAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/JaceTelepathUnbound.java b/Mage.Sets/src/mage/sets/mediainserts/JaceTelepathUnbound.java
index 548742cc8c..c7f559b474 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/JaceTelepathUnbound.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/JaceTelepathUnbound.java
@@ -38,7 +38,7 @@ public class JaceTelepathUnbound extends mage.sets.magicorigins.JaceTelepathUnbo
 
     public JaceTelepathUnbound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 995;
+        this.cardNumber = "995";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/sets/mediainserts/JaceTheLivingGuildpact.java
index 57e086c135..4079853215 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/JaceTheLivingGuildpact.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/JaceTheLivingGuildpact.java
@@ -6,7 +6,7 @@ public class JaceTheLivingGuildpact extends mage.sets.magic2015.JaceTheLivingGui
     
     public JaceTheLivingGuildpact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/JaceVrynsProdigy.java b/Mage.Sets/src/mage/sets/mediainserts/JaceVrynsProdigy.java
index a5db9fd636..5dac6a5dc1 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/JaceVrynsProdigy.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/JaceVrynsProdigy.java
@@ -38,7 +38,7 @@ public class JaceVrynsProdigy extends mage.sets.magicorigins.JaceVrynsProdigy {
 
     public JaceVrynsProdigy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 995;
+        this.cardNumber = "995";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/JayaBallardTaskMage.java b/Mage.Sets/src/mage/sets/mediainserts/JayaBallardTaskMage.java
index ebf792a1fe..987efccd4f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/JayaBallardTaskMage.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/JayaBallardTaskMage.java
@@ -6,7 +6,7 @@ public class JayaBallardTaskMage extends mage.sets.timespiral.JayaBallardTaskMag
     
     public JayaBallardTaskMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/KarametrasAcolyte.java b/Mage.Sets/src/mage/sets/mediainserts/KarametrasAcolyte.java
index ddc8da6b80..f232d2ba72 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/KarametrasAcolyte.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/KarametrasAcolyte.java
@@ -6,7 +6,7 @@ public class KarametrasAcolyte extends mage.sets.theros.KarametrasAcolyte {
     
     public KarametrasAcolyte(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/KnightExemplar.java b/Mage.Sets/src/mage/sets/mediainserts/KnightExemplar.java
index cc8f20192e..e15488f922 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/KnightExemplar.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/KnightExemplar.java
@@ -6,7 +6,7 @@ public class KnightExemplar extends mage.sets.magic2011.KnightExemplar {
     
     public KnightExemplar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/KorSkyfisher.java b/Mage.Sets/src/mage/sets/mediainserts/KorSkyfisher.java
index 76c1e6976a..e8119209fa 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/KorSkyfisher.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/KorSkyfisher.java
@@ -6,7 +6,7 @@ public class KorSkyfisher extends mage.sets.zendikar.KorSkyfisher {
     
     public KorSkyfisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/KothophedSoulHoarder.java b/Mage.Sets/src/mage/sets/mediainserts/KothophedSoulHoarder.java
index 19cb4a2bd5..bf092fe304 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/KothophedSoulHoarder.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/KothophedSoulHoarder.java
@@ -38,7 +38,7 @@ public class KothophedSoulHoarder extends mage.sets.magicorigins.KothophedSoulHo
 
     public KothophedSoulHoarder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/KytheonHeroOfAkros.java b/Mage.Sets/src/mage/sets/mediainserts/KytheonHeroOfAkros.java
index 6ecbbf91a5..b94e5d5d9a 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/KytheonHeroOfAkros.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/KytheonHeroOfAkros.java
@@ -38,7 +38,7 @@ public class KytheonHeroOfAkros extends mage.sets.magicorigins.KytheonHeroOfAkro
 
     public KytheonHeroOfAkros(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 994;
+        this.cardNumber = "994";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/LightningHounds.java b/Mage.Sets/src/mage/sets/mediainserts/LightningHounds.java
index 07082d209d..58f363267d 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/LightningHounds.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/LightningHounds.java
@@ -38,7 +38,7 @@ public class LightningHounds extends mage.sets.mercadianmasques.LightningHounds
 
     public LightningHounds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/LilianaDefiantNecromancer.java b/Mage.Sets/src/mage/sets/mediainserts/LilianaDefiantNecromancer.java
index 0c49da1546..4852a7f946 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/LilianaDefiantNecromancer.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/LilianaDefiantNecromancer.java
@@ -38,7 +38,7 @@ public class LilianaDefiantNecromancer extends mage.sets.magicorigins.LilianaDef
 
     public LilianaDefiantNecromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 996;
+        this.cardNumber = "996";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/LilianaHereticalHealer.java b/Mage.Sets/src/mage/sets/mediainserts/LilianaHereticalHealer.java
index 482e094c71..cae16e7ee8 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/LilianaHereticalHealer.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/LilianaHereticalHealer.java
@@ -38,7 +38,7 @@ public class LilianaHereticalHealer extends mage.sets.magicorigins.LilianaHereti
 
     public LilianaHereticalHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 996;
+        this.cardNumber = "996";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/mediainserts/LilianaOfTheDarkRealms.java
index bf89c98b7f..0dc9756f5b 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/LilianaOfTheDarkRealms.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/LilianaOfTheDarkRealms.java
@@ -6,7 +6,7 @@ public class LilianaOfTheDarkRealms extends mage.sets.magic2014.LilianaOfTheDark
     
     public LilianaOfTheDarkRealms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/LilianaVess.java b/Mage.Sets/src/mage/sets/mediainserts/LilianaVess.java
index da45fa15eb..5f1b2c539c 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/LilianaVess.java
@@ -6,7 +6,7 @@ public class LilianaVess extends mage.sets.lorwyn.LilianaVess {
     
     public LilianaVess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/LilianaVess2.java b/Mage.Sets/src/mage/sets/mediainserts/LilianaVess2.java
index 1de2561976..2cae376a3d 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/LilianaVess2.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/LilianaVess2.java
@@ -7,7 +7,7 @@ public class LilianaVess2 extends mage.sets.magic2011.LilianaVess {
     
     public LilianaVess2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ManaCrypt.java b/Mage.Sets/src/mage/sets/mediainserts/ManaCrypt.java
index 35589ab9e1..f2b6d9f2b8 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ManaCrypt.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ManaCrypt.java
@@ -6,7 +6,7 @@ public class ManaCrypt extends mage.sets.judgepromo.ManaCrypt {
     
     public ManaCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/MarkovDreadknight.java b/Mage.Sets/src/mage/sets/mediainserts/MarkovDreadknight.java
index 3d38a31e30..ab894ec05e 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/MarkovDreadknight.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/MarkovDreadknight.java
@@ -37,7 +37,7 @@ public class MarkovDreadknight extends mage.sets.shadowsoverinnistrad.MarkovDrea
 
     public MarkovDreadknight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Memoricide.java b/Mage.Sets/src/mage/sets/mediainserts/Memoricide.java
index 91deaaaaab..099469c5cb 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Memoricide.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Memoricide.java
@@ -6,7 +6,7 @@ public class Memoricide extends mage.sets.scarsofmirrodin.Memoricide {
     
     public Memoricide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/MerfolkMesmerist.java b/Mage.Sets/src/mage/sets/mediainserts/MerfolkMesmerist.java
index b69c716bc0..ea18652b3b 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/MerfolkMesmerist.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/MerfolkMesmerist.java
@@ -6,7 +6,7 @@ public class MerfolkMesmerist extends mage.sets.magic2012.MerfolkMesmerist {
     
     public MerfolkMesmerist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/MirranCrusader.java b/Mage.Sets/src/mage/sets/mediainserts/MirranCrusader.java
index 4244063133..fe132b9275 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/MirranCrusader.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/MirranCrusader.java
@@ -6,7 +6,7 @@ public class MirranCrusader extends mage.sets.mirrodinbesieged.MirranCrusader {
     
     public MirranCrusader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/MundasVanguard.java b/Mage.Sets/src/mage/sets/mediainserts/MundasVanguard.java
index 8ad9ea1ab9..928f8715f9 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/MundasVanguard.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/MundasVanguard.java
@@ -37,7 +37,7 @@ public class MundasVanguard extends mage.sets.oathofthegatewatch.MundasVanguard
 
     public MundasVanguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NecromasterDragon.java b/Mage.Sets/src/mage/sets/mediainserts/NecromasterDragon.java
index 919494239c..5a3b0b38c9 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NecromasterDragon.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NecromasterDragon.java
@@ -38,7 +38,7 @@ public class NecromasterDragon extends mage.sets.dragonsoftarkir.NecromasterDrag
 
     public NecromasterDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NephaliaMoondrakes.java b/Mage.Sets/src/mage/sets/mediainserts/NephaliaMoondrakes.java
index 8fa2e37054..08771fcde8 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NephaliaMoondrakes.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NephaliaMoondrakes.java
@@ -37,7 +37,7 @@ public class NephaliaMoondrakes extends mage.sets.shadowsoverinnistrad.NephaliaM
 
     public NephaliaMoondrakes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NiblisOfFrost.java b/Mage.Sets/src/mage/sets/mediainserts/NiblisOfFrost.java
index 1135b008b2..63e1d5de93 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NiblisOfFrost.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NiblisOfFrost.java
@@ -37,7 +37,7 @@ public class NiblisOfFrost extends mage.sets.eldritchmoon.NiblisOfFrost {
 
     public NiblisOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NightveilSpecter.java b/Mage.Sets/src/mage/sets/mediainserts/NightveilSpecter.java
index 8783dfc0ec..9be56a7a96 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NightveilSpecter.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NightveilSpecter.java
@@ -6,7 +6,7 @@ public class NightveilSpecter extends mage.sets.gatecrash.NightveilSpecter {
     
     public NightveilSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NissaRevane.java b/Mage.Sets/src/mage/sets/mediainserts/NissaRevane.java
index dff7767752..dc7a7a9106 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NissaRevane.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NissaRevane.java
@@ -6,7 +6,7 @@ public class NissaRevane extends mage.sets.zendikar.NissaRevane {
     
     public NissaRevane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NissaSageAnimist.java b/Mage.Sets/src/mage/sets/mediainserts/NissaSageAnimist.java
index 47a7b3c3dc..0b68ed1ee8 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NissaSageAnimist.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NissaSageAnimist.java
@@ -38,7 +38,7 @@ public class NissaSageAnimist extends mage.sets.magicorigins.NissaSageAnimist {
 
     public NissaSageAnimist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 998;
+        this.cardNumber = "998";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NissaVastwoodSeer.java b/Mage.Sets/src/mage/sets/mediainserts/NissaVastwoodSeer.java
index 4dc10bc6f2..fef024fc9f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NissaVastwoodSeer.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NissaVastwoodSeer.java
@@ -38,7 +38,7 @@ public class NissaVastwoodSeer extends mage.sets.magicorigins.NissaVastwoodSeer
 
     public NissaVastwoodSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 998;
+        this.cardNumber = "998";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NissaWorldwaker.java b/Mage.Sets/src/mage/sets/mediainserts/NissaWorldwaker.java
index df05b655d5..b72151b058 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NissaWorldwaker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NissaWorldwaker.java
@@ -6,7 +6,7 @@ public class NissaWorldwaker extends mage.sets.magic2015.NissaWorldwaker {
     
     public NissaWorldwaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/NoosegrafMob.java b/Mage.Sets/src/mage/sets/mediainserts/NoosegrafMob.java
index 2989620862..3f932206ba 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/NoosegrafMob.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/NoosegrafMob.java
@@ -37,7 +37,7 @@ public class NoosegrafMob extends mage.sets.eldritchmoon.NoosegrafMob {
 
     public NoosegrafMob(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/OgreArsonist.java b/Mage.Sets/src/mage/sets/mediainserts/OgreArsonist.java
index c832c8d75a..fae32b9a75 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/OgreArsonist.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/OgreArsonist.java
@@ -39,7 +39,7 @@ public class OgreArsonist extends mage.sets.portalsecondage.OgreArsonist {
 
     public OgreArsonist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/OgreBattledriver.java b/Mage.Sets/src/mage/sets/mediainserts/OgreBattledriver.java
index e57a3a3132..c28493f130 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/OgreBattledriver.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/OgreBattledriver.java
@@ -6,7 +6,7 @@ public class OgreBattledriver extends mage.sets.magic2014.OgreBattledriver {
     
     public OgreBattledriver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/OjutaisCommand.java b/Mage.Sets/src/mage/sets/mediainserts/OjutaisCommand.java
index 7179988e6e..961758f3e3 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/OjutaisCommand.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/OjutaisCommand.java
@@ -38,7 +38,7 @@ public class OjutaisCommand extends mage.sets.dragonsoftarkir.OjutaisCommand {
 
     public OjutaisCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/OranRiefHydra.java b/Mage.Sets/src/mage/sets/mediainserts/OranRiefHydra.java
index f0221a6983..dd0ac5a79b 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/OranRiefHydra.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/OranRiefHydra.java
@@ -38,7 +38,7 @@ public class OranRiefHydra extends mage.sets.battleforzendikar.OranRiefHydra {
 
     public OranRiefHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/PhyrexianRager.java b/Mage.Sets/src/mage/sets/mediainserts/PhyrexianRager.java
index a6e1ffa502..f377b61a56 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/PhyrexianRager.java
@@ -6,7 +6,7 @@ public class PhyrexianRager extends mage.sets.mirrodinbesieged.PhyrexianRager {
     
     public PhyrexianRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/sets/mediainserts/PiaAndKiranNalaar.java
index 312c4d2a52..015633685e 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/PiaAndKiranNalaar.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/PiaAndKiranNalaar.java
@@ -38,7 +38,7 @@ public class PiaAndKiranNalaar extends mage.sets.magicorigins.PiaAndKiranNalaar
 
     public PiaAndKiranNalaar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/PrimordialHydra.java b/Mage.Sets/src/mage/sets/mediainserts/PrimordialHydra.java
index 4ed5947cf0..76a8d20343 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/PrimordialHydra.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/PrimordialHydra.java
@@ -6,7 +6,7 @@ public class PrimordialHydra extends mage.sets.magic2012.PrimordialHydra {
     
     public PrimordialHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/PristineSkywise.java b/Mage.Sets/src/mage/sets/mediainserts/PristineSkywise.java
index bc1e7f0747..ebb66056de 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/PristineSkywise.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/PristineSkywise.java
@@ -38,7 +38,7 @@ public class PristineSkywise extends mage.sets.dragonsoftarkir.PristineSkywise {
 
     public PristineSkywise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RakshasaVizier.java b/Mage.Sets/src/mage/sets/mediainserts/RakshasaVizier.java
index fdd18d5dff..8e3ee0f356 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RakshasaVizier.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RakshasaVizier.java
@@ -6,7 +6,7 @@ public class RakshasaVizier extends mage.sets.khansoftarkir.RakshasaVizier {
     
     public RakshasaVizier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RatchetBomb.java b/Mage.Sets/src/mage/sets/mediainserts/RatchetBomb.java
index 629199cec5..82cc77d545 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RatchetBomb.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RatchetBomb.java
@@ -6,7 +6,7 @@ public class RatchetBomb extends mage.sets.magic2014.RatchetBomb {
     
     public RatchetBomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RattleclawMystic.java b/Mage.Sets/src/mage/sets/mediainserts/RattleclawMystic.java
index b1c5d2e6ed..ef105736e4 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RattleclawMystic.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RattleclawMystic.java
@@ -6,7 +6,7 @@ public class RattleclawMystic extends mage.sets.khansoftarkir.RattleclawMystic {
     
     public RattleclawMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RavenousBloodseeker.java b/Mage.Sets/src/mage/sets/mediainserts/RavenousBloodseeker.java
index e06df0d1a3..59a34abdab 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RavenousBloodseeker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RavenousBloodseeker.java
@@ -37,7 +37,7 @@ public class RavenousBloodseeker extends mage.sets.shadowsoverinnistrad.Ravenous
 
     public RavenousBloodseeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RelicSeeker.java b/Mage.Sets/src/mage/sets/mediainserts/RelicSeeker.java
index cd117abe57..a778ba55a6 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RelicSeeker.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RelicSeeker.java
@@ -38,7 +38,7 @@ public class RelicSeeker extends mage.sets.magicorigins.RelicSeeker {
 
     public RelicSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.RARE;
         
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RenderSilent.java b/Mage.Sets/src/mage/sets/mediainserts/RenderSilent.java
index 6ccfa763a7..860af6cb16 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RenderSilent.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RenderSilent.java
@@ -6,7 +6,7 @@ public class RenderSilent extends mage.sets.dragonsmaze.RenderSilent {
     
     public RenderSilent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RetaliatorGriffin.java b/Mage.Sets/src/mage/sets/mediainserts/RetaliatorGriffin.java
index 17a639872e..dc6d3efea4 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RetaliatorGriffin.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RetaliatorGriffin.java
@@ -6,7 +6,7 @@ public class RetaliatorGriffin extends mage.sets.alarareborn.RetaliatorGriffin {
     
     public RetaliatorGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/RuinousPath.java b/Mage.Sets/src/mage/sets/mediainserts/RuinousPath.java
index 9fbfd47494..cde961be55 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/RuinousPath.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/RuinousPath.java
@@ -38,7 +38,7 @@ public class RuinousPath extends mage.sets.battleforzendikar.RuinousPath {
 
     public RuinousPath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SageEyeAvengers.java b/Mage.Sets/src/mage/sets/mediainserts/SageEyeAvengers.java
index 004ee5eec5..907f776125 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SageEyeAvengers.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SageEyeAvengers.java
@@ -38,7 +38,7 @@ public class SageEyeAvengers extends mage.sets.fatereforged.SageEyeAvengers {
 
     public SageEyeAvengers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SageOfTheInwardEye.java b/Mage.Sets/src/mage/sets/mediainserts/SageOfTheInwardEye.java
index 0c8e9ab88c..93a7dcc2f0 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SageOfTheInwardEye.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SageOfTheInwardEye.java
@@ -6,7 +6,7 @@ public class SageOfTheInwardEye extends mage.sets.khansoftarkir.SageOfTheInwardE
     
     public SageOfTheInwardEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SanctifierOfSouls.java b/Mage.Sets/src/mage/sets/mediainserts/SanctifierOfSouls.java
index 6e9edd5e42..37c75c17f2 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SanctifierOfSouls.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SanctifierOfSouls.java
@@ -37,7 +37,7 @@ public class SanctifierOfSouls extends mage.sets.eldritchmoon.SanctifierOfSouls
 
     public SanctifierOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SandsteppeCitadel.java b/Mage.Sets/src/mage/sets/mediainserts/SandsteppeCitadel.java
index cd7e17a6b1..3cdb9e93f0 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SandsteppeCitadel.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SandsteppeCitadel.java
@@ -38,7 +38,7 @@ public class SandsteppeCitadel extends mage.sets.khansoftarkir.SandsteppeCitadel
 
     public SandsteppeCitadel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ScavengingOoze.java b/Mage.Sets/src/mage/sets/mediainserts/ScavengingOoze.java
index 68503e0c03..d5aa671fd9 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ScavengingOoze.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ScavengingOoze.java
@@ -6,7 +6,7 @@ public class ScavengingOoze extends mage.sets.commander.ScavengingOoze {
     
     public ScavengingOoze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ScytheLeopard.java b/Mage.Sets/src/mage/sets/mediainserts/ScytheLeopard.java
index 390ad64129..8e3679c6ee 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ScytheLeopard.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ScytheLeopard.java
@@ -38,7 +38,7 @@ public class ScytheLeopard extends mage.sets.battleforzendikar.ScytheLeopard {
 
     public ScytheLeopard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SeekerOfTheWay.java b/Mage.Sets/src/mage/sets/mediainserts/SeekerOfTheWay.java
index 7fbc89892d..b0eb207fd4 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SeekerOfTheWay.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SeekerOfTheWay.java
@@ -38,7 +38,7 @@ public class SeekerOfTheWay extends mage.sets.khansoftarkir.SeekerOfTheWay {
 
     public SeekerOfTheWay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SerraAvatar.java b/Mage.Sets/src/mage/sets/mediainserts/SerraAvatar.java
index d5e2711572..9aaefe6064 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SerraAvatar.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SerraAvatar.java
@@ -6,7 +6,7 @@ public class SerraAvatar extends mage.sets.magic2013.SerraAvatar {
     
     public SerraAvatar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ShamanicRevelation.java b/Mage.Sets/src/mage/sets/mediainserts/ShamanicRevelation.java
index 7cc4a651b9..8a126c79fb 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ShamanicRevelation.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ShamanicRevelation.java
@@ -38,7 +38,7 @@ public class ShamanicRevelation extends mage.sets.fatereforged.ShamanicRevelatio
 
     public ShamanicRevelation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SiegeRhino.java b/Mage.Sets/src/mage/sets/mediainserts/SiegeRhino.java
index be70fd1eb9..cc6760bba1 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SiegeRhino.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SiegeRhino.java
@@ -38,7 +38,7 @@ public class SiegeRhino extends mage.sets.khansoftarkir.SiegeRhino {
 
     public SiegeRhino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SilverbladePaladin.java b/Mage.Sets/src/mage/sets/mediainserts/SilverbladePaladin.java
index 2fd5f9d67c..99079b1acd 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SilverbladePaladin.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SilverbladePaladin.java
@@ -6,7 +6,7 @@ public class SilverbladePaladin extends mage.sets.commander2014.SilverbladePalad
     
     public SilverbladePaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SoulOfRavnica.java b/Mage.Sets/src/mage/sets/mediainserts/SoulOfRavnica.java
index 64185e7709..fe9121f155 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SoulOfRavnica.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SoulOfRavnica.java
@@ -6,7 +6,7 @@ public class SoulOfRavnica extends mage.sets.magic2015.SoulOfRavnica {
     
     public SoulOfRavnica(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SoulOfZendikar.java b/Mage.Sets/src/mage/sets/mediainserts/SoulOfZendikar.java
index db869f0d23..79b5709866 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SoulOfZendikar.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SoulOfZendikar.java
@@ -6,7 +6,7 @@ public class SoulOfZendikar extends mage.sets.magic2015.SoulOfZendikar {
     
     public SoulOfZendikar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SoulSwallower.java b/Mage.Sets/src/mage/sets/mediainserts/SoulSwallower.java
index 7178cda491..093c13b220 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SoulSwallower.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SoulSwallower.java
@@ -37,7 +37,7 @@ public class SoulSwallower extends mage.sets.shadowsoverinnistrad.SoulSwallower
 
     public SoulSwallower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SpinedWurm.java b/Mage.Sets/src/mage/sets/mediainserts/SpinedWurm.java
index c563564f54..7752ace02f 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SpinedWurm.java
@@ -38,7 +38,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Standstill.java b/Mage.Sets/src/mage/sets/mediainserts/Standstill.java
index e51c0cc7a2..71039463cc 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Standstill.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Standstill.java
@@ -6,7 +6,7 @@ public class Standstill extends mage.sets.odyssey.Standstill {
     
     public Standstill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/StealerOfSecrets.java b/Mage.Sets/src/mage/sets/mediainserts/StealerOfSecrets.java
index ede2ef4fb8..cb7fd47b0a 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/StealerOfSecrets.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/StealerOfSecrets.java
@@ -6,7 +6,7 @@ public class StealerOfSecrets extends mage.sets.returntoravnica.StealerOfSecrets
     
     public StealerOfSecrets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/StewardOfValeron.java b/Mage.Sets/src/mage/sets/mediainserts/StewardOfValeron.java
index db0db352c2..380d893512 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/StewardOfValeron.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/StewardOfValeron.java
@@ -6,7 +6,7 @@ public class StewardOfValeron extends mage.sets.shardsofalara.StewardOfValeron {
     
     public StewardOfValeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SultaiCharm.java b/Mage.Sets/src/mage/sets/mediainserts/SultaiCharm.java
index 31421bc84e..f2d4ceeb17 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SultaiCharm.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SultaiCharm.java
@@ -38,7 +38,7 @@ public class SultaiCharm extends mage.sets.khansoftarkir.SultaiCharm {
 
     public SultaiCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SunblastAngel.java b/Mage.Sets/src/mage/sets/mediainserts/SunblastAngel.java
index efefc82bc2..af6911e893 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SunblastAngel.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SunblastAngel.java
@@ -6,7 +6,7 @@ public class SunblastAngel extends mage.sets.scarsofmirrodin.SunblastAngel {
     
     public SunblastAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SupremeVerdict.java b/Mage.Sets/src/mage/sets/mediainserts/SupremeVerdict.java
index 80b501acfa..e86e6e2647 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SupremeVerdict.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SupremeVerdict.java
@@ -6,7 +6,7 @@ public class SupremeVerdict extends mage.sets.returntoravnica.SupremeVerdict {
     
     public SupremeVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SurgicalExtraction.java b/Mage.Sets/src/mage/sets/mediainserts/SurgicalExtraction.java
index 80cfdb11b3..7e9d69d62d 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SurgicalExtraction.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SurgicalExtraction.java
@@ -6,7 +6,7 @@ public class SurgicalExtraction extends mage.sets.newphyrexia.SurgicalExtraction
     
     public SurgicalExtraction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/SylvanCaryatid.java b/Mage.Sets/src/mage/sets/mediainserts/SylvanCaryatid.java
index 2fcd20a933..21965f9016 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/SylvanCaryatid.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/SylvanCaryatid.java
@@ -6,7 +6,7 @@ public class SylvanCaryatid extends mage.sets.theros.SylvanCaryatid {
     
     public SylvanCaryatid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/TemurWarShaman.java b/Mage.Sets/src/mage/sets/mediainserts/TemurWarShaman.java
index f7a8e287ae..a5fa473742 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/TemurWarShaman.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/TemurWarShaman.java
@@ -38,7 +38,7 @@ public class TemurWarShaman extends mage.sets.fatereforged.TemurWarShaman {
 
     public TemurWarShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Terastodon.java b/Mage.Sets/src/mage/sets/mediainserts/Terastodon.java
index ce6a714e1d..7155beeea7 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Terastodon.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Terastodon.java
@@ -6,7 +6,7 @@ public class Terastodon extends mage.sets.worldwake.Terastodon {
     
     public Terastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/TreasureHunt.java b/Mage.Sets/src/mage/sets/mediainserts/TreasureHunt.java
index eb7f32fa27..fd0419744c 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/TreasureHunt.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/TreasureHunt.java
@@ -6,7 +6,7 @@ public class TreasureHunt extends mage.sets.worldwake.TreasureHunt {
     
     public TreasureHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/Turnabout.java b/Mage.Sets/src/mage/sets/mediainserts/Turnabout.java
index eb13a9bb13..8aeb451f69 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/Turnabout.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/Turnabout.java
@@ -6,7 +6,7 @@ public class Turnabout extends mage.sets.urzassaga.Turnabout {
     
     public Turnabout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/TyrantOfValakut.java b/Mage.Sets/src/mage/sets/mediainserts/TyrantOfValakut.java
index 9f218369d1..2c54cd51ff 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/TyrantOfValakut.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/TyrantOfValakut.java
@@ -37,7 +37,7 @@ public class TyrantOfValakut extends mage.sets.oathofthegatewatch.TyrantOfValaku
 
     public TyrantOfValakut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/UlvenwaldObserver.java b/Mage.Sets/src/mage/sets/mediainserts/UlvenwaldObserver.java
index a9a31ddf97..79e00d241c 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/UlvenwaldObserver.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/UlvenwaldObserver.java
@@ -37,7 +37,7 @@ public class UlvenwaldObserver extends mage.sets.eldritchmoon.UlvenwaldObserver
 
     public UlvenwaldObserver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "MBP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mediainserts/ValorousStance.java b/Mage.Sets/src/mage/sets/mediainserts/ValorousStance.java
index 3e627b3cad..f79769f296 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/ValorousStance.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/ValorousStance.java
@@ -38,7 +38,7 @@ public class ValorousStance extends mage.sets.fatereforged.ValorousStance {
 
     public ValorousStance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mediainserts/VampireNocturnus.java b/Mage.Sets/src/mage/sets/mediainserts/VampireNocturnus.java
index cb5d3bdb1b..7971374c81 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/VampireNocturnus.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/VampireNocturnus.java
@@ -6,7 +6,7 @@ public class VampireNocturnus extends mage.sets.magic2010.VampireNocturnus {
     
     public VampireNocturnus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/WashOut.java b/Mage.Sets/src/mage/sets/mediainserts/WashOut.java
index a39f647ac7..515d3f6207 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/WashOut.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/WashOut.java
@@ -6,7 +6,7 @@ public class WashOut extends mage.sets.invasion.WashOut {
     
     public WashOut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "MBP";
     }
     
diff --git a/Mage.Sets/src/mage/sets/mediainserts/XathridNecromancer.java b/Mage.Sets/src/mage/sets/mediainserts/XathridNecromancer.java
index e0bea5f22d..211c7c750a 100644
--- a/Mage.Sets/src/mage/sets/mediainserts/XathridNecromancer.java
+++ b/Mage.Sets/src/mage/sets/mediainserts/XathridNecromancer.java
@@ -38,7 +38,7 @@ public class XathridNecromancer extends mage.sets.magic2014.XathridNecromancer {
 
     public XathridNecromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "MBP";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Afterlife.java b/Mage.Sets/src/mage/sets/mercadianmasques/Afterlife.java
index 6c385c573d..f132c37314 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Afterlife.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Afterlife.java
@@ -37,7 +37,7 @@ public class Afterlife extends mage.sets.mirage.Afterlife {
 
     public Afterlife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Armistice.java b/Mage.Sets/src/mage/sets/mercadianmasques/Armistice.java
index edd24938d8..f93e39ca23 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Armistice.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Armistice.java
@@ -37,7 +37,7 @@ public class Armistice extends mage.sets.commander2014.Armistice {
 
     public Armistice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ArmsDealer.java b/Mage.Sets/src/mage/sets/mercadianmasques/ArmsDealer.java
index 2e62b665dc..335f1ba2ff 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/ArmsDealer.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/ArmsDealer.java
@@ -37,7 +37,7 @@ public class ArmsDealer extends mage.sets.magic2013.ArmsDealer {
 
     public ArmsDealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java b/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java
index 581ab6a42c..a835413aa1 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java
@@ -38,7 +38,7 @@ public class Arrest extends mage.sets.mirrodin.Arrest {
 
     public Arrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/BattleRampart.java b/Mage.Sets/src/mage/sets/mercadianmasques/BattleRampart.java
index f353065ff4..799d6a4d6c 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/BattleRampart.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/BattleRampart.java
@@ -37,7 +37,7 @@ public class BattleRampart extends mage.sets.riseoftheeldrazi.BattleRampart {
 
     public BattleRampart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Brainstorm.java b/Mage.Sets/src/mage/sets/mercadianmasques/Brainstorm.java
index e567631fbb..84ebf513dd 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ChoMannoRevolutionary.java b/Mage.Sets/src/mage/sets/mercadianmasques/ChoMannoRevolutionary.java
index 3ee09d4827..0f72d5c26a 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/ChoMannoRevolutionary.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/ChoMannoRevolutionary.java
@@ -37,7 +37,7 @@ public class ChoMannoRevolutionary extends mage.sets.tenthedition.ChoMannoRevolu
 
     public ChoMannoRevolutionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CinderElemental.java b/Mage.Sets/src/mage/sets/mercadianmasques/CinderElemental.java
index f5f5157235..f591a71693 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/CinderElemental.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/CinderElemental.java
@@ -37,7 +37,7 @@ public class CinderElemental extends mage.sets.gatecrash.CinderElemental {
 
     public CinderElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CloudSprite.java b/Mage.Sets/src/mage/sets/mercadianmasques/CloudSprite.java
index 79652742cd..dcd20f696e 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/CloudSprite.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/CloudSprite.java
@@ -37,7 +37,7 @@ public class CloudSprite extends mage.sets.tenthedition.CloudSprite {
 
     public CloudSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Counterspell.java b/Mage.Sets/src/mage/sets/mercadianmasques/Counterspell.java
index f258a6718d..fb25e32161 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Cowardice.java b/Mage.Sets/src/mage/sets/mercadianmasques/Cowardice.java
index 690b7d0fed..238b7d57db 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Cowardice.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Cowardice.java
@@ -37,7 +37,7 @@ public class Cowardice extends mage.sets.ninthedition.Cowardice {
 
     public Cowardice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CrossbowInfantry.java b/Mage.Sets/src/mage/sets/mercadianmasques/CrossbowInfantry.java
index ecf3a81c83..8ac4083a9f 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/CrossbowInfantry.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/CrossbowInfantry.java
@@ -37,7 +37,7 @@ public class CrossbowInfantry extends mage.sets.ninthedition.CrossbowInfantry {
 
     public CrossbowInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DarkRitual.java b/Mage.Sets/src/mage/sets/mercadianmasques/DarkRitual.java
index 6720819c85..e33ed9fb5a 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Deathgazer.java b/Mage.Sets/src/mage/sets/mercadianmasques/Deathgazer.java
index e5b58dae73..8956d8183f 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Deathgazer.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Deathgazer.java
@@ -37,7 +37,7 @@ public class Deathgazer extends mage.sets.ninthedition.Deathgazer {
 
     public Deathgazer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Dehydration.java b/Mage.Sets/src/mage/sets/mercadianmasques/Dehydration.java
index 8cb17214a0..1c2d3c6585 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Dehydration.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Dehydration.java
@@ -37,7 +37,7 @@ public class Dehydration extends mage.sets.tenthedition.Dehydration {
 
     public Dehydration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DesertTwister.java b/Mage.Sets/src/mage/sets/mercadianmasques/DesertTwister.java
index 834822e85b..755f87d15e 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DevoutWitness.java b/Mage.Sets/src/mage/sets/mercadianmasques/DevoutWitness.java
index 9652c78d01..a6c41abe2d 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/DevoutWitness.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/DevoutWitness.java
@@ -38,7 +38,7 @@ public class DevoutWitness extends mage.sets.vintagemasters.DevoutWitness {
 
     public DevoutWitness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Disenchant.java b/Mage.Sets/src/mage/sets/mercadianmasques/Disenchant.java
index ec50780fa9..86acf0199d 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DistortingLens.java b/Mage.Sets/src/mage/sets/mercadianmasques/DistortingLens.java
index 208a90d539..73bf2b9083 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/DistortingLens.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/DistortingLens.java
@@ -37,7 +37,7 @@ public class DistortingLens extends mage.sets.eighthedition.DistortingLens {
 
     public DistortingLens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/EnergyFlux.java b/Mage.Sets/src/mage/sets/mercadianmasques/EnergyFlux.java
index 3cd8721317..8565ef90b5 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/EnergyFlux.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/EnergyFlux.java
@@ -37,7 +37,7 @@ public class EnergyFlux extends mage.sets.antiquities.EnergyFlux {
 
     public EnergyFlux(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Foster.java b/Mage.Sets/src/mage/sets/mercadianmasques/Foster.java
index bc1e47b1ae..701ab22a4e 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Foster.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Foster.java
@@ -37,7 +37,7 @@ public class Foster extends mage.sets.commander2013.Foster {
 
     public Foster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/GhoulsFeast.java b/Mage.Sets/src/mage/sets/mercadianmasques/GhoulsFeast.java
index 1e1bd80f0d..222fe42ea3 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/GhoulsFeast.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/GhoulsFeast.java
@@ -37,7 +37,7 @@ public class GhoulsFeast extends mage.sets.izzetvsgolgari.GhoulsFeast {
 
     public GhoulsFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Groundskeeper.java b/Mage.Sets/src/mage/sets/mercadianmasques/Groundskeeper.java
index 3c4157e590..41b814dacb 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Groundskeeper.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Groundskeeper.java
@@ -37,7 +37,7 @@ public class Groundskeeper extends mage.sets.ninthedition.Groundskeeper {
 
     public Groundskeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Gush.java b/Mage.Sets/src/mage/sets/mercadianmasques/Gush.java
index 6dd08adfca..89cb0682d3 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Gush.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Gush.java
@@ -37,7 +37,7 @@ public class Gush extends mage.sets.jacevschandra.Gush {
 
     public Gush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/HighwayRobber.java b/Mage.Sets/src/mage/sets/mercadianmasques/HighwayRobber.java
index ebc60e9f6a..e15b689f76 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/HighwayRobber.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/HighwayRobber.java
@@ -37,7 +37,7 @@ public class HighwayRobber extends mage.sets.tenthedition.HighwayRobber {
 
     public HighwayRobber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/HuntedWumpus.java b/Mage.Sets/src/mage/sets/mercadianmasques/HuntedWumpus.java
index f654de6bcf..05236e810f 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/HuntedWumpus.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/HuntedWumpus.java
@@ -37,7 +37,7 @@ public class HuntedWumpus extends mage.sets.ninthedition.HuntedWumpus {
 
     public HuntedWumpus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Invigorate.java b/Mage.Sets/src/mage/sets/mercadianmasques/Invigorate.java
index a240b88395..eeed642823 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Invigorate.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Invigorate.java
@@ -37,7 +37,7 @@ public class Invigorate extends mage.sets.commander.Invigorate {
 
     public Invigorate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/IvoryMask.java b/Mage.Sets/src/mage/sets/mercadianmasques/IvoryMask.java
index 7c064c2ffd..282963d836 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/IvoryMask.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/IvoryMask.java
@@ -37,7 +37,7 @@ public class IvoryMask extends mage.sets.ninthedition.IvoryMask {
 
     public IvoryMask(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/LastBreath.java b/Mage.Sets/src/mage/sets/mercadianmasques/LastBreath.java
index ef9214f864..5a10b994b6 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/LastBreath.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/LastBreath.java
@@ -38,7 +38,7 @@ public class LastBreath extends mage.sets.shadowmoor.LastBreath {
 
     public LastBreath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Lure.java b/Mage.Sets/src/mage/sets/mercadianmasques/Lure.java
index a3c0f351bb..76a6f47f22 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Lure.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/NaturalAffinity.java b/Mage.Sets/src/mage/sets/mercadianmasques/NaturalAffinity.java
index 0734d053b9..81660a7492 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/NaturalAffinity.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/NaturalAffinity.java
@@ -37,7 +37,7 @@ public class NaturalAffinity extends mage.sets.ninthedition.NaturalAffinity {
 
     public NaturalAffinity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/mercadianmasques/OgreTaskmaster.java
index 3eb493b7b6..fde367817e 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/OgreTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/OgreTaskmaster.java
@@ -37,7 +37,7 @@ public class OgreTaskmaster extends mage.sets.ninthedition.OgreTaskmaster {
 
     public OgreTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RainOfTears.java b/Mage.Sets/src/mage/sets/mercadianmasques/RainOfTears.java
index 9ce226131d..8b33f32436 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/RainOfTears.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/RainOfTears.java
@@ -37,7 +37,7 @@ public class RainOfTears extends mage.sets.tempest.RainOfTears {
 
     public RainOfTears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Revive.java b/Mage.Sets/src/mage/sets/mercadianmasques/Revive.java
index 667b09905f..f2587724b3 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Revive.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Revive.java
@@ -37,7 +37,7 @@ public class Revive extends mage.sets.magic2013.Revive {
 
     public Revive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RighteousAura.java b/Mage.Sets/src/mage/sets/mercadianmasques/RighteousAura.java
index dafd9416aa..7592352c21 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/RighteousAura.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/RighteousAura.java
@@ -38,7 +38,7 @@ public class RighteousAura extends mage.sets.visions.RighteousAura {
 
     public RighteousAura(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java b/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java
index 25e489c6f4..f9e27e2167 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java
@@ -38,7 +38,7 @@ public class RockBadger extends mage.sets.tenthedition.RockBadger {
 
     public RockBadger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RushwoodDryad.java b/Mage.Sets/src/mage/sets/mercadianmasques/RushwoodDryad.java
index 8bd0321ab4..46d31a0600 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/RushwoodDryad.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/RushwoodDryad.java
@@ -37,7 +37,7 @@ public class RushwoodDryad extends mage.sets.tenthedition.RushwoodDryad {
 
     public RushwoodDryad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SilvergladeElemental.java b/Mage.Sets/src/mage/sets/mercadianmasques/SilvergladeElemental.java
index bff46c245a..4e8eb8e475 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/SilvergladeElemental.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/SilvergladeElemental.java
@@ -37,7 +37,7 @@ public class SilvergladeElemental extends mage.sets.planechase.SilvergladeElemen
 
     public SilvergladeElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SpidersilkArmor.java b/Mage.Sets/src/mage/sets/mercadianmasques/SpidersilkArmor.java
index 4a3cb1541e..5bf2b96d99 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/SpidersilkArmor.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/SpidersilkArmor.java
@@ -37,7 +37,7 @@ public class SpidersilkArmor extends mage.sets.knightsvsdragons.SpidersilkArmor
 
     public SpidersilkArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Squall.java b/Mage.Sets/src/mage/sets/mercadianmasques/Squall.java
index 0b57ca42ca..ff62e9ffb0 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Squall.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Squall.java
@@ -38,7 +38,7 @@ public class Squall extends mage.sets.starter1999.Squall {
 
     public Squall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Squallmonger.java b/Mage.Sets/src/mage/sets/mercadianmasques/Squallmonger.java
index 48d394544f..f259e4002d 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Squallmonger.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Squallmonger.java
@@ -37,7 +37,7 @@ public class Squallmonger extends mage.sets.commander.Squallmonger {
 
     public Squallmonger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SqueeGoblinNabob.java b/Mage.Sets/src/mage/sets/mercadianmasques/SqueeGoblinNabob.java
index 3034e429fb..65fb790bea 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/SqueeGoblinNabob.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/SqueeGoblinNabob.java
@@ -37,7 +37,7 @@ public class SqueeGoblinNabob extends mage.sets.tenthedition.SqueeGoblinNabob {
 
     public SqueeGoblinNabob(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SteadfastGuard.java b/Mage.Sets/src/mage/sets/mercadianmasques/SteadfastGuard.java
index a2502f81ce..d41490c6d2 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/SteadfastGuard.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/SteadfastGuard.java
@@ -37,7 +37,7 @@ public class SteadfastGuard extends mage.sets.tenthedition.SteadfastGuard {
 
     public SteadfastGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/StoneRain.java b/Mage.Sets/src/mage/sets/mercadianmasques/StoneRain.java
index 45e58398eb..bff47bfc24 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/TidalKraken.java b/Mage.Sets/src/mage/sets/mercadianmasques/TidalKraken.java
index 93b3e22b3b..6c310609dd 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/TidalKraken.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/TidalKraken.java
@@ -37,7 +37,7 @@ public class TidalKraken extends mage.sets.ninthedition.TidalKraken {
 
     public TidalKraken(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/TradeRoutes.java b/Mage.Sets/src/mage/sets/mercadianmasques/TradeRoutes.java
index ee5114f69d..675b606fd5 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/TradeRoutes.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/TradeRoutes.java
@@ -37,7 +37,7 @@ public class TradeRoutes extends mage.sets.ninthedition.TradeRoutes {
 
     public TradeRoutes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Tranquility.java b/Mage.Sets/src/mage/sets/mercadianmasques/Tranquility.java
index 2ae33d2b73..ce091c4c82 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Tremor.java b/Mage.Sets/src/mage/sets/mercadianmasques/Tremor.java
index ce8ec427cc..65854f7e0a 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Tremor.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Tremor.java
@@ -37,7 +37,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor {
 
     public Tremor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Undertaker.java b/Mage.Sets/src/mage/sets/mercadianmasques/Undertaker.java
index a320d19f83..b094095c67 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Undertaker.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Undertaker.java
@@ -38,7 +38,7 @@ public class Undertaker extends mage.sets.timeshifted.Undertaker {
 
     public Undertaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Vendetta.java b/Mage.Sets/src/mage/sets/mercadianmasques/Vendetta.java
index 115328e1b9..83f4bdde6b 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Vendetta.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Vendetta.java
@@ -37,7 +37,7 @@ public class Vendetta extends mage.sets.riseoftheeldrazi.Vendetta {
 
     public Vendetta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WarCadence.java b/Mage.Sets/src/mage/sets/mercadianmasques/WarCadence.java
index 28d865cb02..142b7d3070 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/WarCadence.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/WarCadence.java
@@ -37,7 +37,7 @@ public class WarCadence extends mage.sets.commander2013.WarCadence {
 
     public WarCadence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Warmonger.java b/Mage.Sets/src/mage/sets/mercadianmasques/Warmonger.java
index 2353def5a0..d280d20614 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Warmonger.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Warmonger.java
@@ -38,7 +38,7 @@ public class Warmonger extends mage.sets.mediainserts.Warmonger {
 
     public Warmonger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "MMQ";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WordOfBlasting.java b/Mage.Sets/src/mage/sets/mercadianmasques/WordOfBlasting.java
index 169b5aa9a8..9bf900319f 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/WordOfBlasting.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/WordOfBlasting.java
@@ -37,7 +37,7 @@ public class WordOfBlasting extends mage.sets.iceage.WordOfBlasting {
 
     public WordOfBlasting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "MMQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/AncestralMemories.java b/Mage.Sets/src/mage/sets/mirage/AncestralMemories.java
index 59d3aef6ea..78f776a121 100644
--- a/Mage.Sets/src/mage/sets/mirage/AncestralMemories.java
+++ b/Mage.Sets/src/mage/sets/mirage/AncestralMemories.java
@@ -37,7 +37,7 @@ public class AncestralMemories extends mage.sets.seventhedition.AncestralMemorie
 
     public AncestralMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Boomerang.java b/Mage.Sets/src/mage/sets/mirage/Boomerang.java
index 76e2bf9343..8fada51f4e 100644
--- a/Mage.Sets/src/mage/sets/mirage/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/mirage/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/CadaverousKnight.java b/Mage.Sets/src/mage/sets/mirage/CadaverousKnight.java
index b3e9ab3810..d81679047d 100644
--- a/Mage.Sets/src/mage/sets/mirage/CadaverousKnight.java
+++ b/Mage.Sets/src/mage/sets/mirage/CadaverousKnight.java
@@ -37,7 +37,7 @@ public class CadaverousKnight extends mage.sets.planechase.CadaverousKnight {
 
     public CadaverousKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/CelestialDawn.java b/Mage.Sets/src/mage/sets/mirage/CelestialDawn.java
index f2da523441..686b5d1244 100644
--- a/Mage.Sets/src/mage/sets/mirage/CelestialDawn.java
+++ b/Mage.Sets/src/mage/sets/mirage/CelestialDawn.java
@@ -38,7 +38,7 @@ public class CelestialDawn extends mage.sets.timeshifted.CelestialDawn {
 
     public CelestialDawn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mirage/CharcoalDiamond.java b/Mage.Sets/src/mage/sets/mirage/CharcoalDiamond.java
index 5d7baf05a4..2159e77595 100644
--- a/Mage.Sets/src/mage/sets/mirage/CharcoalDiamond.java
+++ b/Mage.Sets/src/mage/sets/mirage/CharcoalDiamond.java
@@ -37,7 +37,7 @@ public class CharcoalDiamond extends mage.sets.seventhedition.CharcoalDiamond {
 
     public CharcoalDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/ChokingSands.java b/Mage.Sets/src/mage/sets/mirage/ChokingSands.java
index 5ecbfc820c..718dbd43f9 100644
--- a/Mage.Sets/src/mage/sets/mirage/ChokingSands.java
+++ b/Mage.Sets/src/mage/sets/mirage/ChokingSands.java
@@ -37,7 +37,7 @@ public class ChokingSands extends mage.sets.vintagemasters.ChokingSands {
 
     public ChokingSands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/CoralFighters.java b/Mage.Sets/src/mage/sets/mirage/CoralFighters.java
index b238dd6d94..7daf5642f4 100644
--- a/Mage.Sets/src/mage/sets/mirage/CoralFighters.java
+++ b/Mage.Sets/src/mage/sets/mirage/CoralFighters.java
@@ -37,7 +37,7 @@ public class CoralFighters extends mage.sets.venservskoth.CoralFighters {
 
     public CoralFighters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/CrimsonHellkite.java b/Mage.Sets/src/mage/sets/mirage/CrimsonHellkite.java
index 635b4c0f31..817b7cffbd 100644
--- a/Mage.Sets/src/mage/sets/mirage/CrimsonHellkite.java
+++ b/Mage.Sets/src/mage/sets/mirage/CrimsonHellkite.java
@@ -37,7 +37,7 @@ public class CrimsonHellkite extends mage.sets.seventhedition.CrimsonHellkite {
 
     public CrimsonHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/DaringApprentice.java b/Mage.Sets/src/mage/sets/mirage/DaringApprentice.java
index a41353410f..0156afd1a6 100644
--- a/Mage.Sets/src/mage/sets/mirage/DaringApprentice.java
+++ b/Mage.Sets/src/mage/sets/mirage/DaringApprentice.java
@@ -37,7 +37,7 @@ public class DaringApprentice extends mage.sets.ninthedition.DaringApprentice {
 
     public DaringApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/DarkBanishing.java b/Mage.Sets/src/mage/sets/mirage/DarkBanishing.java
index 42f4eec56a..60e36212e6 100644
--- a/Mage.Sets/src/mage/sets/mirage/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/mirage/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/DarkRitual.java b/Mage.Sets/src/mage/sets/mirage/DarkRitual.java
index 15fd5ca57d..cb96b4e447 100644
--- a/Mage.Sets/src/mage/sets/mirage/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/mirage/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Disenchant.java b/Mage.Sets/src/mage/sets/mirage/Disenchant.java
index 86fa72e291..0a920f496b 100644
--- a/Mage.Sets/src/mage/sets/mirage/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/mirage/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Dissipate.java b/Mage.Sets/src/mage/sets/mirage/Dissipate.java
index 6023673e6e..f1aaa3c893 100644
--- a/Mage.Sets/src/mage/sets/mirage/Dissipate.java
+++ b/Mage.Sets/src/mage/sets/mirage/Dissipate.java
@@ -37,7 +37,7 @@ public class Dissipate extends mage.sets.innistrad.Dissipate {
 
     public Dissipate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/DivineOffering.java b/Mage.Sets/src/mage/sets/mirage/DivineOffering.java
index c4a4d41bc9..6dba0dfdda 100644
--- a/Mage.Sets/src/mage/sets/mirage/DivineOffering.java
+++ b/Mage.Sets/src/mage/sets/mirage/DivineOffering.java
@@ -37,7 +37,7 @@ public class DivineOffering extends mage.sets.mirrodinbesieged.DivineOffering {
 
     public DivineOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/DrainLife.java b/Mage.Sets/src/mage/sets/mirage/DrainLife.java
index cc8b0d4fe7..801923c18a 100644
--- a/Mage.Sets/src/mage/sets/mirage/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/mirage/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/DreamCache.java b/Mage.Sets/src/mage/sets/mirage/DreamCache.java
index 546f316abb..6912a77c45 100644
--- a/Mage.Sets/src/mage/sets/mirage/DreamCache.java
+++ b/Mage.Sets/src/mage/sets/mirage/DreamCache.java
@@ -37,7 +37,7 @@ public class DreamCache extends mage.sets.tempest.DreamCache {
 
     public DreamCache(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/EarlyHarvest.java b/Mage.Sets/src/mage/sets/mirage/EarlyHarvest.java
index d80774af16..dee9307734 100644
--- a/Mage.Sets/src/mage/sets/mirage/EarlyHarvest.java
+++ b/Mage.Sets/src/mage/sets/mirage/EarlyHarvest.java
@@ -37,7 +37,7 @@ public class EarlyHarvest extends mage.sets.ninthedition.EarlyHarvest {
 
     public EarlyHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Enfeeblement.java b/Mage.Sets/src/mage/sets/mirage/Enfeeblement.java
index 337cdb46a3..929cb7c1d0 100644
--- a/Mage.Sets/src/mage/sets/mirage/Enfeeblement.java
+++ b/Mage.Sets/src/mage/sets/mirage/Enfeeblement.java
@@ -37,7 +37,7 @@ public class Enfeeblement extends mage.sets.tempest.Enfeeblement {
 
     public Enfeeblement(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/FemerefArchers.java b/Mage.Sets/src/mage/sets/mirage/FemerefArchers.java
index 935cf2bd34..2074abc237 100644
--- a/Mage.Sets/src/mage/sets/mirage/FemerefArchers.java
+++ b/Mage.Sets/src/mage/sets/mirage/FemerefArchers.java
@@ -37,7 +37,7 @@ public class FemerefArchers extends mage.sets.tenthedition.FemerefArchers {
 
     public FemerefArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/FinalFortune.java b/Mage.Sets/src/mage/sets/mirage/FinalFortune.java
index b61d9a9927..80fff098af 100644
--- a/Mage.Sets/src/mage/sets/mirage/FinalFortune.java
+++ b/Mage.Sets/src/mage/sets/mirage/FinalFortune.java
@@ -37,7 +37,7 @@ public class FinalFortune extends mage.sets.seventhedition.FinalFortune {
 
     public FinalFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/FireDiamond.java b/Mage.Sets/src/mage/sets/mirage/FireDiamond.java
index 9c884b3c38..5489dc5d92 100644
--- a/Mage.Sets/src/mage/sets/mirage/FireDiamond.java
+++ b/Mage.Sets/src/mage/sets/mirage/FireDiamond.java
@@ -37,7 +37,7 @@ public class FireDiamond extends mage.sets.seventhedition.FireDiamond {
 
     public FireDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Firebreathing.java b/Mage.Sets/src/mage/sets/mirage/Firebreathing.java
index d73fa2b5e7..fcd4d72b7d 100644
--- a/Mage.Sets/src/mage/sets/mirage/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/mirage/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Flare.java b/Mage.Sets/src/mage/sets/mirage/Flare.java
index 967557d19a..faadd19c54 100644
--- a/Mage.Sets/src/mage/sets/mirage/Flare.java
+++ b/Mage.Sets/src/mage/sets/mirage/Flare.java
@@ -37,7 +37,7 @@ public class Flare extends mage.sets.fifthedition.Flare {
 
     public Flare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/FloodPlain.java b/Mage.Sets/src/mage/sets/mirage/FloodPlain.java
index 44fd33e526..2923f7f3a5 100644
--- a/Mage.Sets/src/mage/sets/mirage/FloodPlain.java
+++ b/Mage.Sets/src/mage/sets/mirage/FloodPlain.java
@@ -37,7 +37,7 @@ public class FloodPlain extends mage.sets.venservskoth.FloodPlain {
 
     public FloodPlain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Fog.java b/Mage.Sets/src/mage/sets/mirage/Fog.java
index b59de53b75..d19cf760cc 100644
--- a/Mage.Sets/src/mage/sets/mirage/Fog.java
+++ b/Mage.Sets/src/mage/sets/mirage/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/GoblinEliteInfantry.java b/Mage.Sets/src/mage/sets/mirage/GoblinEliteInfantry.java
index e2f194d11b..d6d05f6248 100644
--- a/Mage.Sets/src/mage/sets/mirage/GoblinEliteInfantry.java
+++ b/Mage.Sets/src/mage/sets/mirage/GoblinEliteInfantry.java
@@ -37,7 +37,7 @@ public class GoblinEliteInfantry extends mage.sets.tenthedition.GoblinEliteInfan
 
     public GoblinEliteInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Grasslands.java b/Mage.Sets/src/mage/sets/mirage/Grasslands.java
index 4a7dcf21a2..86e20d6e67 100644
--- a/Mage.Sets/src/mage/sets/mirage/Grasslands.java
+++ b/Mage.Sets/src/mage/sets/mirage/Grasslands.java
@@ -37,7 +37,7 @@ public class Grasslands extends mage.sets.knightsvsdragons.Grasslands {
 
     public Grasslands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/GrinningTotem.java b/Mage.Sets/src/mage/sets/mirage/GrinningTotem.java
index faec4b1aeb..c306e6c882 100644
--- a/Mage.Sets/src/mage/sets/mirage/GrinningTotem.java
+++ b/Mage.Sets/src/mage/sets/mirage/GrinningTotem.java
@@ -38,7 +38,7 @@ public class GrinningTotem extends mage.sets.timeshifted.GrinningTotem {
 
     public GrinningTotem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mirage/HealingSalve.java b/Mage.Sets/src/mage/sets/mirage/HealingSalve.java
index 822e4a0696..67ad5c6649 100644
--- a/Mage.Sets/src/mage/sets/mirage/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/mirage/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Incinerate.java b/Mage.Sets/src/mage/sets/mirage/Incinerate.java
index f8c80a4255..3022691db5 100644
--- a/Mage.Sets/src/mage/sets/mirage/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/mirage/Incinerate.java
@@ -37,7 +37,7 @@ public class Incinerate extends mage.sets.tenthedition.Incinerate {
 
     public Incinerate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/InfernalContract.java b/Mage.Sets/src/mage/sets/mirage/InfernalContract.java
index 4a1be6181b..a17779938e 100644
--- a/Mage.Sets/src/mage/sets/mirage/InfernalContract.java
+++ b/Mage.Sets/src/mage/sets/mirage/InfernalContract.java
@@ -37,7 +37,7 @@ public class InfernalContract extends mage.sets.seventhedition.InfernalContract
 
     public InfernalContract(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/KaerveksTorch.java b/Mage.Sets/src/mage/sets/mirage/KaerveksTorch.java
index f8d13a5863..ff85b90163 100644
--- a/Mage.Sets/src/mage/sets/mirage/KaerveksTorch.java
+++ b/Mage.Sets/src/mage/sets/mirage/KaerveksTorch.java
@@ -39,7 +39,7 @@ public class KaerveksTorch extends mage.sets.vintagemasters.KaerveksTorch {
 
     public KaerveksTorch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirage/MarbleDiamond.java b/Mage.Sets/src/mage/sets/mirage/MarbleDiamond.java
index f9639cb951..cc3cc73ea8 100644
--- a/Mage.Sets/src/mage/sets/mirage/MarbleDiamond.java
+++ b/Mage.Sets/src/mage/sets/mirage/MarbleDiamond.java
@@ -37,7 +37,7 @@ public class MarbleDiamond extends mage.sets.seventhedition.MarbleDiamond {
 
     public MarbleDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Maro.java b/Mage.Sets/src/mage/sets/mirage/Maro.java
index 4669e47a35..2a07418f91 100644
--- a/Mage.Sets/src/mage/sets/mirage/Maro.java
+++ b/Mage.Sets/src/mage/sets/mirage/Maro.java
@@ -37,7 +37,7 @@ public class Maro extends mage.sets.ninthedition.Maro {
 
     public Maro(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/MemoryLapse.java b/Mage.Sets/src/mage/sets/mirage/MemoryLapse.java
index 0518c6f5bc..c7afd6e818 100644
--- a/Mage.Sets/src/mage/sets/mirage/MemoryLapse.java
+++ b/Mage.Sets/src/mage/sets/mirage/MemoryLapse.java
@@ -37,7 +37,7 @@ public class MemoryLapse extends mage.sets.seventhedition.MemoryLapse {
 
     public MemoryLapse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/MossDiamond.java b/Mage.Sets/src/mage/sets/mirage/MossDiamond.java
index 8c98400d59..a5e8582fba 100644
--- a/Mage.Sets/src/mage/sets/mirage/MossDiamond.java
+++ b/Mage.Sets/src/mage/sets/mirage/MossDiamond.java
@@ -37,7 +37,7 @@ public class MossDiamond extends mage.sets.seventhedition.MossDiamond {
 
     public MossDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Pacifism.java b/Mage.Sets/src/mage/sets/mirage/Pacifism.java
index a4db67197f..73d9baab53 100644
--- a/Mage.Sets/src/mage/sets/mirage/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/mirage/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/PatagiaGolem.java b/Mage.Sets/src/mage/sets/mirage/PatagiaGolem.java
index 6659cddc77..b51bc669f7 100644
--- a/Mage.Sets/src/mage/sets/mirage/PatagiaGolem.java
+++ b/Mage.Sets/src/mage/sets/mirage/PatagiaGolem.java
@@ -37,7 +37,7 @@ public class PatagiaGolem extends mage.sets.seventhedition.PatagiaGolem {
 
     public PatagiaGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/PhyrexianVault.java b/Mage.Sets/src/mage/sets/mirage/PhyrexianVault.java
index 60f04c3364..0cf8ee1ded 100644
--- a/Mage.Sets/src/mage/sets/mirage/PhyrexianVault.java
+++ b/Mage.Sets/src/mage/sets/mirage/PhyrexianVault.java
@@ -37,7 +37,7 @@ public class PhyrexianVault extends mage.sets.tenthedition.PhyrexianVault {
 
     public PhyrexianVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Polymorph.java b/Mage.Sets/src/mage/sets/mirage/Polymorph.java
index 16312f4ba3..089bf2ba01 100644
--- a/Mage.Sets/src/mage/sets/mirage/Polymorph.java
+++ b/Mage.Sets/src/mage/sets/mirage/Polymorph.java
@@ -37,7 +37,7 @@ public class Polymorph extends mage.sets.magic2010.Polymorph {
 
     public Polymorph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/PowerSink.java b/Mage.Sets/src/mage/sets/mirage/PowerSink.java
index ba5c8ce129..4d57ae1849 100644
--- a/Mage.Sets/src/mage/sets/mirage/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/mirage/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/RampantGrowth.java b/Mage.Sets/src/mage/sets/mirage/RampantGrowth.java
index 5c0adb715d..74afb5bd2a 100644
--- a/Mage.Sets/src/mage/sets/mirage/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/mirage/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/RayOfCommand.java b/Mage.Sets/src/mage/sets/mirage/RayOfCommand.java
index 999ca9f128..60b774b1d4 100644
--- a/Mage.Sets/src/mage/sets/mirage/RayOfCommand.java
+++ b/Mage.Sets/src/mage/sets/mirage/RayOfCommand.java
@@ -37,7 +37,7 @@ public class RayOfCommand extends mage.sets.iceage.RayOfCommand {
 
     public RayOfCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/RecklessEmbermage.java b/Mage.Sets/src/mage/sets/mirage/RecklessEmbermage.java
index 56814aa421..dda9827f76 100644
--- a/Mage.Sets/src/mage/sets/mirage/RecklessEmbermage.java
+++ b/Mage.Sets/src/mage/sets/mirage/RecklessEmbermage.java
@@ -37,7 +37,7 @@ public class RecklessEmbermage extends mage.sets.seventhedition.RecklessEmbermag
 
     public RecklessEmbermage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Regeneration.java b/Mage.Sets/src/mage/sets/mirage/Regeneration.java
index 73f531f223..51a52b3f48 100644
--- a/Mage.Sets/src/mage/sets/mirage/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/mirage/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Sandstorm.java b/Mage.Sets/src/mage/sets/mirage/Sandstorm.java
index ce570de42f..12b9e59443 100644
--- a/Mage.Sets/src/mage/sets/mirage/Sandstorm.java
+++ b/Mage.Sets/src/mage/sets/mirage/Sandstorm.java
@@ -37,7 +37,7 @@ public class Sandstorm extends mage.sets.fourthedition.Sandstorm {
 
     public Sandstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/SavageTwister.java b/Mage.Sets/src/mage/sets/mirage/SavageTwister.java
index 9aa44e1d91..bc3b0efe90 100644
--- a/Mage.Sets/src/mage/sets/mirage/SavageTwister.java
+++ b/Mage.Sets/src/mage/sets/mirage/SavageTwister.java
@@ -37,7 +37,7 @@ public class SavageTwister extends mage.sets.commander2013.SavageTwister {
 
     public SavageTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 340;
+        this.cardNumber = "340";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/SkyDiamond.java b/Mage.Sets/src/mage/sets/mirage/SkyDiamond.java
index 62ce21d845..fc49ab93be 100644
--- a/Mage.Sets/src/mage/sets/mirage/SkyDiamond.java
+++ b/Mage.Sets/src/mage/sets/mirage/SkyDiamond.java
@@ -37,7 +37,7 @@ public class SkyDiamond extends mage.sets.seventhedition.SkyDiamond {
 
     public SkyDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/SpittingEarth.java b/Mage.Sets/src/mage/sets/mirage/SpittingEarth.java
index c3b471907e..6dba28884a 100644
--- a/Mage.Sets/src/mage/sets/mirage/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/mirage/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/StalkingTiger.java b/Mage.Sets/src/mage/sets/mirage/StalkingTiger.java
index eca0d5ff08..16398e811d 100644
--- a/Mage.Sets/src/mage/sets/mirage/StalkingTiger.java
+++ b/Mage.Sets/src/mage/sets/mirage/StalkingTiger.java
@@ -37,7 +37,7 @@ public class StalkingTiger extends mage.sets.tenthedition.StalkingTiger {
 
     public StalkingTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/StoneRain.java b/Mage.Sets/src/mage/sets/mirage/StoneRain.java
index d6ad1bb914..f90e529e12 100644
--- a/Mage.Sets/src/mage/sets/mirage/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/mirage/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/Stupor.java b/Mage.Sets/src/mage/sets/mirage/Stupor.java
index e22a353665..2678c18b87 100644
--- a/Mage.Sets/src/mage/sets/mirage/Stupor.java
+++ b/Mage.Sets/src/mage/sets/mirage/Stupor.java
@@ -38,7 +38,7 @@ public class Stupor extends mage.sets.timeshifted.Stupor {
 
     public Stupor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirage/Sunweb.java b/Mage.Sets/src/mage/sets/mirage/Sunweb.java
index 8b2d4eb05e..0889f3d636 100644
--- a/Mage.Sets/src/mage/sets/mirage/Sunweb.java
+++ b/Mage.Sets/src/mage/sets/mirage/Sunweb.java
@@ -37,7 +37,7 @@ public class Sunweb extends mage.sets.seventhedition.Sunweb {
 
     public Sunweb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/UktabiWildcats.java b/Mage.Sets/src/mage/sets/mirage/UktabiWildcats.java
index 2492cb0979..529dfd4ab4 100644
--- a/Mage.Sets/src/mage/sets/mirage/UktabiWildcats.java
+++ b/Mage.Sets/src/mage/sets/mirage/UktabiWildcats.java
@@ -37,7 +37,7 @@ public class UktabiWildcats extends mage.sets.seventhedition.UktabiWildcats {
 
     public UktabiWildcats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java b/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java
index 0c202b0175..19d9a46f71 100644
--- a/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java
+++ b/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java
@@ -38,7 +38,7 @@ public class VolcanicDragon extends mage.sets.magic2012.VolcanicDragon {
 
     public VolcanicDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mirage/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/mirage/VolcanicGeyser.java
index 957f1f1390..1acb5a9862 100644
--- a/Mage.Sets/src/mage/sets/mirage/VolcanicGeyser.java
+++ b/Mage.Sets/src/mage/sets/mirage/VolcanicGeyser.java
@@ -37,7 +37,7 @@ public class VolcanicGeyser extends mage.sets.magic2013.VolcanicGeyser {
 
     public VolcanicGeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "MIR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java b/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java
index 94aa07df9a..689a417c00 100644
--- a/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java
+++ b/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java
@@ -38,7 +38,7 @@ public class WallOfRoots extends mage.sets.timeshifted.WallOfRoots {
 
     public WallOfRoots(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java
index 997b14d879..37de607efb 100644
--- a/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java
+++ b/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java
@@ -38,7 +38,7 @@ public class ZhalfirinCommander extends mage.sets.timeshifted.ZhalfirinCommander
 
     public ZhalfirinCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "MIR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java
index c27b2d019f..c9c6aa7767 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java
@@ -37,7 +37,7 @@ public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb
 
     public AEtherSpellbomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java b/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java
index fefe637158..eb0c5c43da 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java
@@ -37,7 +37,7 @@ public class BarterInBlood extends mage.sets.avacynrestored.BarterInBlood {
 
     public BarterInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java b/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java
index c359a3248e..c310bad837 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java
@@ -37,7 +37,7 @@ public class BlindingBeam extends mage.sets.elspethvstezzeret.BlindingBeam {
 
     public BlindingBeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java b/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java
index 09975e06b8..431a373f01 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java
@@ -37,7 +37,7 @@ public class BoshIronGolem extends mage.sets.planechase.BoshIronGolem {
 
     public BoshIronGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java b/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java
index 5cad2595df..b3ea2b041e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java b/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java
index 9304a18f70..84ff66cb44 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java
@@ -37,7 +37,7 @@ public class Broodstar extends mage.sets.planechase.Broodstar {
 
     public Broodstar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java
index b6870bd0fb..6c262c70b4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java
@@ -38,7 +38,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "MRD";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java b/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java
index b89a4f8a8f..066b00228b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java
@@ -37,7 +37,7 @@ public class ContaminatedBond extends mage.sets.ninthedition.ContaminatedBond {
 
     public ContaminatedBond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java b/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java
index e177850c1f..80ea89c113 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java
@@ -37,7 +37,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Detonate.java b/Mage.Sets/src/mage/sets/mirrodin/Detonate.java
index 54ec6023ce..4d54eedffc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Detonate.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Detonate.java
@@ -37,7 +37,7 @@ public class Detonate extends mage.sets.fifthedition.Detonate {
 
     public Detonate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java b/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java
index 83d1ca6bd2..d0955687f2 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java
@@ -37,7 +37,7 @@ public class Fabricate extends mage.sets.magic2010.Fabricate {
 
     public Fabricate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java b/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java
index ede7674420..b0b28846c9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java
@@ -37,7 +37,7 @@ public class Fireshrieker extends mage.sets.magic2014.Fireshrieker {
 
     public Fireshrieker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java b/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java
index 02f82225fb..f233c24200 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java
@@ -37,7 +37,7 @@ public class FistsOfTheAnvil extends mage.sets.tenthedition.FistsOfTheAnvil {
 
     public FistsOfTheAnvil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java b/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java
index d00384469a..e0f2a7724c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java
@@ -37,7 +37,7 @@ public class Frogmite extends mage.sets.elspethvstezzeret.Frogmite {
 
     public Frogmite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java b/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java
index afd3842ee6..beefb362d4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java
@@ -37,7 +37,7 @@ public class GildedLotus extends mage.sets.magic2013.GildedLotus {
 
     public GildedLotus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java b/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java
index 16014100f4..f9482dc977 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java
index 96c6384569..2dc925123c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java
@@ -37,7 +37,7 @@ public class LeoninBladetrap extends mage.sets.commander2013.LeoninBladetrap {
 
     public LeoninBladetrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java
index 3bfc324c50..d06aed20b6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java
@@ -38,7 +38,7 @@ public class LeoninScimitar extends mage.sets.tenthedition.LeoninScimitar {
 
     public LeoninScimitar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "MRD";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java b/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java
index b038b82304..31811b0664 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java
@@ -37,7 +37,7 @@ public class LodestoneMyr extends mage.sets.planechase.LodestoneMyr {
 
     public LodestoneMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java
index a311276864..39a602dcdd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java
@@ -38,7 +38,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
 
     public LoxodonWarhammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "MRD";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java b/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java
index 9a35d490b4..7743bc6d10 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java
@@ -37,7 +37,7 @@ public class LumengridWarden extends mage.sets.tenthedition.LumengridWarden {
 
     public LumengridWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java b/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java
index 6bb1675452..49e0d02742 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java
@@ -37,7 +37,7 @@ public class MarchOfTheMachines extends mage.sets.tenthedition.MarchOfTheMachine
 
     public MarchOfTheMachines(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java b/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java
index 1fb2fff129..bb15fdfc72 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java
@@ -37,7 +37,7 @@ public class MaskOfMemory extends mage.sets.planechase.MaskOfMemory {
 
     public MaskOfMemory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java b/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java
index 08b6f3d697..3fc1838359 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java
@@ -38,7 +38,7 @@ public class Mindslaver extends mage.sets.scarsofmirrodin.Mindslaver {
 
     public Mindslaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "MRD";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java b/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java
index f85fcc57ce..ef6d6543d2 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java
@@ -37,7 +37,7 @@ public class MyrEnforcer extends mage.sets.planechase.MyrEnforcer {
 
     public MyrEnforcer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java b/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java
index 818668ac7c..d9fb5559fa 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java
@@ -37,7 +37,7 @@ public class MyrRetriever extends mage.sets.modernmasters.MyrRetriever {
 
     public MyrRetriever(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java b/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java
index 13383509f4..78597ffc00 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java
@@ -37,7 +37,7 @@ public class NuisanceEngine extends mage.sets.planechase.NuisanceEngine {
 
     public NuisanceEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java b/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java
index f498aaa5fa..8042b6e95f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java
@@ -37,7 +37,7 @@ public class OneDozenEyes extends mage.sets.commander2013.OneDozenEyes {
 
     public OneDozenEyes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java b/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java
index c0c1f17809..bda958927e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java
@@ -37,7 +37,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java b/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java
index 08334a9ef4..91ccd9ea84 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java
@@ -37,7 +37,7 @@ public class Pentavus extends mage.sets.elspethvstezzeret.Pentavus {
 
     public Pentavus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java b/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java
index 224f0aa823..7f84f52633 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java
@@ -37,7 +37,7 @@ public class PlatinumAngel extends mage.sets.tenthedition.PlatinumAngel {
 
     public PlatinumAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java b/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java
index ff94ea6142..4869ad9e3b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java
@@ -37,7 +37,7 @@ public class PromiseOfPower extends mage.sets.commander2014.PromiseOfPower {
 
     public PromiseOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java b/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java
index d19d45f4a9..3b689da1d9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java
@@ -37,7 +37,7 @@ public class RazorBarrier extends mage.sets.elspethvstezzeret.RazorBarrier {
 
     public RazorBarrier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java b/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java
index 5a6c5a41fe..d835d9c652 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java
@@ -37,7 +37,7 @@ public class ReiverDemon extends mage.sets.divinevsdemonic.ReiverDemon {
 
     public ReiverDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java b/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java
index e67bd74fec..07e90099f1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java
@@ -38,7 +38,7 @@ public class RuleOfLaw extends mage.sets.tenthedition.RuleOfLaw {
 
     public RuleOfLaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MRD";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java b/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java
index 6b4995142c..04d6f4d673 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java
@@ -37,7 +37,7 @@ public class SculptingSteel extends mage.sets.tenthedition.SculptingSteel {
 
     public SculptingSteel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java b/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java
index 2fe693eadd..0a2ef9394f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java
@@ -37,7 +37,7 @@ public class SkeletonShard extends mage.sets.planechase.SkeletonShard {
 
     public SkeletonShard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java b/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java
index 01a960e16d..5a7f1b2757 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java
@@ -37,7 +37,7 @@ public class SkyhunterPatrol extends mage.sets.tenthedition.SkyhunterPatrol {
 
     public SkyhunterPatrol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java
index 242603591a..91ce2efdd0 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java
@@ -37,7 +37,7 @@ public class SolemnSimulacrum extends mage.sets.magic2012.SolemnSimulacrum {
 
     public SolemnSimulacrum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java b/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java
index 88381985ea..ce360972cf 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java
@@ -37,7 +37,7 @@ public class StalkingStones extends mage.sets.tempest.StalkingStones {
 
     public StalkingStones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java b/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java
index c259a6cc59..0052b616bd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java
@@ -37,7 +37,7 @@ public class SunDroplet extends mage.sets.commander2013.SunDroplet {
 
     public SunDroplet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java b/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java
index 931caa993b..3e8c0ee496 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java
@@ -37,7 +37,7 @@ public class SylvanScrying extends mage.sets.tenthedition.SylvanScrying {
 
     public SylvanScrying(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SynodSanctum.java b/Mage.Sets/src/mage/sets/mirrodin/SynodSanctum.java
index 2313b4d201..9f686afed3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SynodSanctum.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SynodSanctum.java
@@ -37,7 +37,7 @@ public class SynodSanctum extends mage.sets.archenemy.SynodSanctum {
 
     public SynodSanctum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java b/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java
index b181543a12..94fd9462a0 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java
@@ -37,7 +37,7 @@ public class TempestOfLight extends mage.sets.magic2010.TempestOfLight {
 
     public TempestOfLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Terror.java b/Mage.Sets/src/mage/sets/mirrodin/Terror.java
index c432db580c..5134a2d466 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Terror.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java
index cade076d46..2017e9e36d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java
@@ -37,7 +37,7 @@ public class ThirstForKnowledge extends mage.sets.planechase.ThirstForKnowledge
 
     public ThirstForKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java b/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java
index 8d5018e3b6..78ad4a4f41 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java
@@ -37,7 +37,7 @@ public class Thoughtcast extends mage.sets.elspethvstezzeret.Thoughtcast {
 
     public Thoughtcast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java b/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java
index 9238afc76b..6bab8e5b68 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java
@@ -37,7 +37,7 @@ public class ToothAndNail extends mage.sets.modernmasters.ToothAndNail {
 
     public ToothAndNail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java b/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java
index fd6629c222..efd3f58421 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java
@@ -37,7 +37,7 @@ public class Triskelion extends mage.sets.magic2011.Triskelion {
 
     public Triskelion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java b/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java
index 7e7879d6ec..1ec2a851fc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java
@@ -37,7 +37,7 @@ public class ViridianShaman extends mage.sets.tenthedition.ViridianShaman {
 
     public ViridianShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java b/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java
index 6bfb0ff0c1..f900d0013d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java
@@ -37,7 +37,7 @@ public class VulshokBerserker extends mage.sets.magic2011.VulshokBerserker {
 
     public VulshokBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java b/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java
index f2d7e02ddc..79ce5b34eb 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java
@@ -37,7 +37,7 @@ public class WanderguardSentry extends mage.sets.ninthedition.WanderguardSentry
 
     public WanderguardSentry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java b/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java
index 2ed29ca0fe..19cec995ca 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java
@@ -37,7 +37,7 @@ public class WizardReplica extends mage.sets.planechase.WizardReplica {
 
     public WizardReplica(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java b/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java
index 7eaa680ba1..9f7c36ec29 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java
@@ -37,7 +37,7 @@ public class Worldslayer extends mage.sets.magic2012.Worldslayer {
 
     public Worldslayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "MRD";
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java
index 0c45e28046..407a7bc15f 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java
@@ -39,7 +39,7 @@ public class LeoninSkyhunter extends mage.sets.mirrodin.LeoninSkyhunter {
 
     public LeoninSkyhunter (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MBS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRager.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRager.java
index bfd4d36a5b..e98af0d0f0 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRager.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRager.java
@@ -38,7 +38,7 @@ public class PhyrexianRager extends mage.sets.tenthedition.PhyrexianRager {
 
     public PhyrexianRager (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "MBS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java
index b43ab55c89..a66c20822e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java
@@ -37,7 +37,7 @@ public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb
 
     public AEtherSpellbomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java b/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java
index 2d1778f5e7..86fcb9e0e1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java
@@ -38,7 +38,7 @@ public class AEtherVial extends mage.sets.darksteel.AEtherVial {
 
     public AEtherVial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java b/Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java
index 5a9cc1a1c6..ffadc8c982 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java
@@ -37,7 +37,7 @@ public class AEthersnipe extends mage.sets.commander.AEthersnipe {
 
     public AEthersnipe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AbsorbVis.java b/Mage.Sets/src/mage/sets/modernmasters/AbsorbVis.java
index 951300d6f0..ef22cc2a4d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AbsorbVis.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AbsorbVis.java
@@ -37,7 +37,7 @@ public class AbsorbVis extends mage.sets.conflux.AbsorbVis {
 
     public AbsorbVis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AcademyRuins.java b/Mage.Sets/src/mage/sets/modernmasters/AcademyRuins.java
index d803fe5bfb..18a28edccf 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AcademyRuins.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AcademyRuins.java
@@ -37,7 +37,7 @@ public class AcademyRuins extends mage.sets.timespiral.AcademyRuins {
 
     public AcademyRuins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AdarkarValkyrie.java b/Mage.Sets/src/mage/sets/modernmasters/AdarkarValkyrie.java
index b0314e3f60..b04fa9e97d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AdarkarValkyrie.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AdarkarValkyrie.java
@@ -37,7 +37,7 @@ public class AdarkarValkyrie extends mage.sets.coldsnap.AdarkarValkyrie {
 
     public AdarkarValkyrie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AmrouScout.java b/Mage.Sets/src/mage/sets/modernmasters/AmrouScout.java
index 57b136df53..51db164a4c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AmrouScout.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AmrouScout.java
@@ -37,7 +37,7 @@ public class AmrouScout extends mage.sets.timespiral.AmrouScout {
 
     public AmrouScout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AmrouSeekers.java b/Mage.Sets/src/mage/sets/modernmasters/AmrouSeekers.java
index 37373db911..e98aee9edd 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AmrouSeekers.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AmrouSeekers.java
@@ -37,7 +37,7 @@ public class AmrouSeekers extends mage.sets.timespiral.AmrouSeekers {
 
     public AmrouSeekers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AngelsGrace.java b/Mage.Sets/src/mage/sets/modernmasters/AngelsGrace.java
index 9b889e2330..7af566801c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AngelsGrace.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AngelsGrace.java
@@ -37,7 +37,7 @@ public class AngelsGrace extends mage.sets.timespiral.AngelsGrace {
 
     public AngelsGrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ArcboundRavager.java b/Mage.Sets/src/mage/sets/modernmasters/ArcboundRavager.java
index f4634a9409..250ee8111c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ArcboundRavager.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ArcboundRavager.java
@@ -37,7 +37,7 @@ public class ArcboundRavager extends mage.sets.darksteel.ArcboundRavager {
 
     public ArcboundRavager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ArcboundStinger.java b/Mage.Sets/src/mage/sets/modernmasters/ArcboundStinger.java
index 173f76bc3c..57e6348c4e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ArcboundStinger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ArcboundStinger.java
@@ -37,7 +37,7 @@ public class ArcboundStinger extends mage.sets.darksteel.ArcboundStinger {
 
     public ArcboundStinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ArcboundWorker.java b/Mage.Sets/src/mage/sets/modernmasters/ArcboundWorker.java
index d3b7b0b779..8eb9c374ae 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ArcboundWorker.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ArcboundWorker.java
@@ -37,7 +37,7 @@ public class ArcboundWorker extends mage.sets.darksteel.ArcboundWorker {
 
     public ArcboundWorker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AvianChangeling.java b/Mage.Sets/src/mage/sets/modernmasters/AvianChangeling.java
index b027c9cfaf..f2ce095245 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AvianChangeling.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AvianChangeling.java
@@ -37,7 +37,7 @@ public class AvianChangeling extends mage.sets.lorwyn.AvianChangeling {
 
     public AvianChangeling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Blightspeaker.java b/Mage.Sets/src/mage/sets/modernmasters/Blightspeaker.java
index ce24a6e9de..cac866d4de 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Blightspeaker.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Blightspeaker.java
@@ -37,7 +37,7 @@ public class Blightspeaker extends mage.sets.planarchaos.Blightspeaker {
 
     public Blightspeaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/BlindingBeam.java b/Mage.Sets/src/mage/sets/modernmasters/BlindingBeam.java
index 23d99f09f9..d442a48704 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/BlindingBeam.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/BlindingBeam.java
@@ -37,7 +37,7 @@ public class BlindingBeam extends mage.sets.elspethvstezzeret.BlindingBeam {
 
     public BlindingBeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/BlinkmothNexus.java b/Mage.Sets/src/mage/sets/modernmasters/BlinkmothNexus.java
index e03d647719..0b67980372 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/BlinkmothNexus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/BlinkmothNexus.java
@@ -37,7 +37,7 @@ public class BlinkmothNexus extends mage.sets.darksteel.BlinkmothNexus {
 
     public BlinkmothNexus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/BloodMoon.java b/Mage.Sets/src/mage/sets/modernmasters/BloodMoon.java
index 3c96643991..3864aad92a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/BloodMoon.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/BloodMoon.java
@@ -37,7 +37,7 @@ public class BloodMoon extends mage.sets.ninthedition.BloodMoon {
 
     public BloodMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Bonesplitter.java b/Mage.Sets/src/mage/sets/modernmasters/Bonesplitter.java
index 2426a8d176..3a5c274afb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Bonesplitter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Bonesplitter.java
@@ -37,7 +37,7 @@ public class Bonesplitter extends mage.sets.mirrodin.Bonesplitter {
 
     public Bonesplitter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/BridgeFromBelow.java b/Mage.Sets/src/mage/sets/modernmasters/BridgeFromBelow.java
index 9ce804c429..534988ccc8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/BridgeFromBelow.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/BridgeFromBelow.java
@@ -37,7 +37,7 @@ public class BridgeFromBelow extends mage.sets.futuresight.BridgeFromBelow {
 
     public BridgeFromBelow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/BruteForce.java b/Mage.Sets/src/mage/sets/modernmasters/BruteForce.java
index 8ccc58f86c..13d0baf7f8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/BruteForce.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/BruteForce.java
@@ -37,7 +37,7 @@ public class BruteForce extends mage.sets.planarchaos.BruteForce {
 
     public BruteForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CarefulConsideration.java b/Mage.Sets/src/mage/sets/modernmasters/CarefulConsideration.java
index e6ecc2029d..67f5d7ee76 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CarefulConsideration.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CarefulConsideration.java
@@ -37,7 +37,7 @@ public class CarefulConsideration extends mage.sets.timespiral.CarefulConsiderat
 
     public CarefulConsideration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CennsEnlistment.java b/Mage.Sets/src/mage/sets/modernmasters/CennsEnlistment.java
index 2dbcf0093a..fa9ec7b5cb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CennsEnlistment.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CennsEnlistment.java
@@ -37,7 +37,7 @@ public class CennsEnlistment extends mage.sets.eventide.CennsEnlistment {
 
     public CennsEnlistment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ChaliceOfTheVoid.java b/Mage.Sets/src/mage/sets/modernmasters/ChaliceOfTheVoid.java
index 2a265ce9ed..dea8e8e317 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ChaliceOfTheVoid.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ChaliceOfTheVoid.java
@@ -37,7 +37,7 @@ public class ChaliceOfTheVoid extends mage.sets.mirrodin.ChaliceOfTheVoid {
 
     public ChaliceOfTheVoid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CitanulWoodreaders.java b/Mage.Sets/src/mage/sets/modernmasters/CitanulWoodreaders.java
index 26e56c2749..e787ba363f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CitanulWoodreaders.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CitanulWoodreaders.java
@@ -37,7 +37,7 @@ public class CitanulWoodreaders extends mage.sets.planarchaos.CitanulWoodreaders
 
     public CitanulWoodreaders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CityOfBrass.java b/Mage.Sets/src/mage/sets/modernmasters/CityOfBrass.java
index fc11979893..8654d08ce3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CityOfBrass.java
@@ -37,7 +37,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CloudgoatRanger.java b/Mage.Sets/src/mage/sets/modernmasters/CloudgoatRanger.java
index 8e187ff322..e927207094 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CloudgoatRanger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CloudgoatRanger.java
@@ -37,7 +37,7 @@ public class CloudgoatRanger extends mage.sets.lorwyn.CloudgoatRanger {
 
     public CloudgoatRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ColdEyedSelkie.java b/Mage.Sets/src/mage/sets/modernmasters/ColdEyedSelkie.java
index 6b95c8476c..99657daeaa 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ColdEyedSelkie.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ColdEyedSelkie.java
@@ -37,7 +37,7 @@ public class ColdEyedSelkie extends mage.sets.eventide.ColdEyedSelkie {
 
     public ColdEyedSelkie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CountrysideCrusher.java b/Mage.Sets/src/mage/sets/modernmasters/CountrysideCrusher.java
index 8d73d6666c..2836a2d450 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CountrysideCrusher.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CountrysideCrusher.java
@@ -37,7 +37,7 @@ public class CountrysideCrusher extends mage.sets.morningtide.CountrysideCrusher
 
     public CountrysideCrusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CourtHomunculus.java b/Mage.Sets/src/mage/sets/modernmasters/CourtHomunculus.java
index 73995ea4ed..f9ed6c9407 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CourtHomunculus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CourtHomunculus.java
@@ -37,7 +37,7 @@ public class CourtHomunculus extends mage.sets.conflux.CourtHomunculus {
 
     public CourtHomunculus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/CrypticCommand.java b/Mage.Sets/src/mage/sets/modernmasters/CrypticCommand.java
index 2ffe0320b5..e574218575 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/CrypticCommand.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/CrypticCommand.java
@@ -37,7 +37,7 @@ public class CrypticCommand extends mage.sets.lorwyn.CrypticCommand {
 
     public CrypticCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DakmorSalvage.java b/Mage.Sets/src/mage/sets/modernmasters/DakmorSalvage.java
index 43f63009f9..acd261afb1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DakmorSalvage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DakmorSalvage.java
@@ -37,7 +37,7 @@ public class DakmorSalvage extends mage.sets.futuresight.DakmorSalvage {
 
     public DakmorSalvage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java b/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java
index 3a09d60d7c..dc7b9b34a9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java
@@ -38,7 +38,7 @@ public class DarkConfidant extends mage.sets.ravnica.DarkConfidant {
 
     public DarkConfidant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeathDenied.java b/Mage.Sets/src/mage/sets/modernmasters/DeathDenied.java
index f342d226d5..4cf6c2c88c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DeathDenied.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DeathDenied.java
@@ -37,7 +37,7 @@ public class DeathDenied extends mage.sets.saviorsofkamigawa.DeathDenied {
 
     public DeathDenied(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DemigodOfRevenge.java b/Mage.Sets/src/mage/sets/modernmasters/DemigodOfRevenge.java
index 9fb1a80e02..ba58042cdb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DemigodOfRevenge.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DemigodOfRevenge.java
@@ -37,7 +37,7 @@ public class DemigodOfRevenge extends mage.sets.shadowmoor.DemigodOfRevenge {
 
     public DemigodOfRevenge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DispellersCapsule.java b/Mage.Sets/src/mage/sets/modernmasters/DispellersCapsule.java
index 0494d31fe1..ce6b3e2372 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DispellersCapsule.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DispellersCapsule.java
@@ -37,7 +37,7 @@ public class DispellersCapsule extends mage.sets.shardsofalara.DispellersCapsule
 
     public DispellersCapsule(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DivinityOfPride.java b/Mage.Sets/src/mage/sets/modernmasters/DivinityOfPride.java
index 6bed809327..726fa2d27a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DivinityOfPride.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DivinityOfPride.java
@@ -37,7 +37,7 @@ public class DivinityOfPride extends mage.sets.eventide.DivinityOfPride {
 
     public DivinityOfPride(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DragDown.java b/Mage.Sets/src/mage/sets/modernmasters/DragDown.java
index c71107462a..83f9bba320 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DragDown.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DragDown.java
@@ -37,7 +37,7 @@ public class DragDown extends mage.sets.conflux.DragDown {
 
     public DragDown(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java b/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java
index 65650d2a21..ed1359a91a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java
@@ -38,7 +38,7 @@ public class Dragonstorm extends mage.sets.timeshifted.Dragonstorm {
 
     public Dragonstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DurkwoodBaloth.java b/Mage.Sets/src/mage/sets/modernmasters/DurkwoodBaloth.java
index f3dd963355..56c402e9d4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DurkwoodBaloth.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DurkwoodBaloth.java
@@ -37,7 +37,7 @@ public class DurkwoodBaloth extends mage.sets.timespiral.DurkwoodBaloth {
 
     public DurkwoodBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EchoingTruth.java b/Mage.Sets/src/mage/sets/modernmasters/EchoingTruth.java
index 60751acee7..3bfaf9cdec 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EchoingTruth.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EchoingTruth.java
@@ -37,7 +37,7 @@ public class EchoingTruth extends mage.sets.elspethvstezzeret.EchoingTruth {
 
     public EchoingTruth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Electrolyze.java b/Mage.Sets/src/mage/sets/modernmasters/Electrolyze.java
index 2efad80cb8..7cf0f3755c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Electrolyze.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Electrolyze.java
@@ -37,7 +37,7 @@ public class Electrolyze extends mage.sets.guildpact.Electrolyze {
 
     public Electrolyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/modernmasters/ElspethKnightErrant.java
index 5ae6426730..59b3fe57fd 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ElspethKnightErrant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ElspethKnightErrant.java
@@ -37,7 +37,7 @@ public class ElspethKnightErrant extends mage.sets.shardsofalara.ElspethKnightEr
 
     public ElspethKnightErrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EmptyTheWarrens.java b/Mage.Sets/src/mage/sets/modernmasters/EmptyTheWarrens.java
index 285947df6a..42db34db3a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EmptyTheWarrens.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EmptyTheWarrens.java
@@ -37,7 +37,7 @@ public class EmptyTheWarrens extends mage.sets.timespiral.EmptyTheWarrens {
 
     public EmptyTheWarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EngineeredExplosives.java b/Mage.Sets/src/mage/sets/modernmasters/EngineeredExplosives.java
index e189f454ab..618fcc74db 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EngineeredExplosives.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EngineeredExplosives.java
@@ -37,7 +37,7 @@ public class EngineeredExplosives extends mage.sets.fifthdawn.EngineeredExplosiv
 
     public EngineeredExplosives(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ErrantEphemeron.java b/Mage.Sets/src/mage/sets/modernmasters/ErrantEphemeron.java
index 9b6dcc8d53..a407df8204 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ErrantEphemeron.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ErrantEphemeron.java
@@ -37,7 +37,7 @@ public class ErrantEphemeron extends mage.sets.timespiral.ErrantEphemeron {
 
     public ErrantEphemeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ErraticMutation.java b/Mage.Sets/src/mage/sets/modernmasters/ErraticMutation.java
index bd29c9405d..e7306c7cc5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ErraticMutation.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ErraticMutation.java
@@ -37,7 +37,7 @@ public class ErraticMutation extends mage.sets.planarchaos.ErraticMutation {
 
     public ErraticMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Esperzoa.java b/Mage.Sets/src/mage/sets/modernmasters/Esperzoa.java
index 44650b3d1f..fd074f3df0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Esperzoa.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Esperzoa.java
@@ -37,7 +37,7 @@ public class Esperzoa extends mage.sets.conflux.Esperzoa {
 
     public Esperzoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EtchedOracle.java b/Mage.Sets/src/mage/sets/modernmasters/EtchedOracle.java
index 36bf7a201c..4155fc7a9d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EtchedOracle.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EtchedOracle.java
@@ -37,7 +37,7 @@ public class EtchedOracle extends mage.sets.planechase.EtchedOracle {
 
     public EtchedOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EternalWitness.java b/Mage.Sets/src/mage/sets/modernmasters/EternalWitness.java
index 438a9c50f7..51ff1edcf3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EternalWitness.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EternalWitness.java
@@ -37,7 +37,7 @@ public class EternalWitness extends mage.sets.fifthdawn.EternalWitness {
 
     public EternalWitness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EtheriumSculptor.java b/Mage.Sets/src/mage/sets/modernmasters/EtheriumSculptor.java
index 82d384ce3d..a7c74d05d5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EtheriumSculptor.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EtheriumSculptor.java
@@ -37,7 +37,7 @@ public class EtheriumSculptor extends mage.sets.shardsofalara.EtheriumSculptor {
 
     public EtheriumSculptor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/modernmasters/EtherswornCanonist.java
index c58dca516a..a035ab9064 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/EtherswornCanonist.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/EtherswornCanonist.java
@@ -37,7 +37,7 @@ public class EtherswornCanonist extends mage.sets.shardsofalara.EtherswornCanoni
 
     public EtherswornCanonist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java b/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java
index ac8d3f951d..fdbb098eaa 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java
@@ -38,7 +38,7 @@ public class ExecutionersCapsule extends mage.sets.shardsofalara.ExecutionersCap
 
     public ExecutionersCapsule(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Extirpate.java b/Mage.Sets/src/mage/sets/modernmasters/Extirpate.java
index b33dbe25a3..8051330555 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Extirpate.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Extirpate.java
@@ -37,7 +37,7 @@ public class Extirpate extends mage.sets.planarchaos.Extirpate {
 
     public Extirpate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Facevaulter.java b/Mage.Sets/src/mage/sets/modernmasters/Facevaulter.java
index 48bd3b3667..5b7d650a6d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Facevaulter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Facevaulter.java
@@ -37,7 +37,7 @@ public class Facevaulter extends mage.sets.lorwyn.Facevaulter {
 
     public Facevaulter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/FaerieMacabre.java b/Mage.Sets/src/mage/sets/modernmasters/FaerieMacabre.java
index a1ba0e5957..9c86f10587 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/FaerieMacabre.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/FaerieMacabre.java
@@ -37,7 +37,7 @@ public class FaerieMacabre extends mage.sets.shadowmoor.FaerieMacabre {
 
     public FaerieMacabre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/FaerieMechanist.java b/Mage.Sets/src/mage/sets/modernmasters/FaerieMechanist.java
index 2422ca0b6c..d12b2c8121 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/FaerieMechanist.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/FaerieMechanist.java
@@ -37,7 +37,7 @@ public class FaerieMechanist extends mage.sets.conflux.FaerieMechanist {
 
     public FaerieMechanist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/FesteringGoblin.java b/Mage.Sets/src/mage/sets/modernmasters/FesteringGoblin.java
index e577923bfe..7011ca0299 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/FesteringGoblin.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/FesteringGoblin.java
@@ -37,7 +37,7 @@ public class FesteringGoblin extends mage.sets.planechase.FesteringGoblin {
 
     public FesteringGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/FieryFall.java b/Mage.Sets/src/mage/sets/modernmasters/FieryFall.java
index 9540e46081..6474e8e512 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/FieryFall.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/FieryFall.java
@@ -37,7 +37,7 @@ public class FieryFall extends mage.sets.conflux.FieryFall {
 
     public FieryFall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/modernmasters/FigureOfDestiny.java
index 2dc3872658..2888014b64 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/FigureOfDestiny.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/FigureOfDestiny.java
@@ -37,7 +37,7 @@ public class FigureOfDestiny extends mage.sets.eventide.FigureOfDestiny {
 
     public FigureOfDestiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Flickerwisp.java b/Mage.Sets/src/mage/sets/modernmasters/Flickerwisp.java
index b81ad4b24c..acbb28e632 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Flickerwisp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Flickerwisp.java
@@ -37,7 +37,7 @@ public class Flickerwisp extends mage.sets.eventide.Flickerwisp {
 
     public Flickerwisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Frogmite.java b/Mage.Sets/src/mage/sets/modernmasters/Frogmite.java
index 8d4a84707c..7ae538492f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Frogmite.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Frogmite.java
@@ -37,7 +37,7 @@ public class Frogmite extends mage.sets.elspethvstezzeret.Frogmite {
 
     public Frogmite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/FuryCharm.java b/Mage.Sets/src/mage/sets/modernmasters/FuryCharm.java
index 65630c1363..a21cbc5b30 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/FuryCharm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/FuryCharm.java
@@ -37,7 +37,7 @@ public class FuryCharm extends mage.sets.planarchaos.FuryCharm {
 
     public FuryCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/GiantDustwasp.java b/Mage.Sets/src/mage/sets/modernmasters/GiantDustwasp.java
index 4960b6f970..a11f4fe90d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/GiantDustwasp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/GiantDustwasp.java
@@ -37,7 +37,7 @@ public class GiantDustwasp extends mage.sets.planarchaos.GiantDustwasp {
 
     public GiantDustwasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/GiftsUngiven.java b/Mage.Sets/src/mage/sets/modernmasters/GiftsUngiven.java
index 79749239b0..270ce10d3b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/GiftsUngiven.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/GiftsUngiven.java
@@ -37,7 +37,7 @@ public class GiftsUngiven extends mage.sets.championsofkamigawa.GiftsUngiven {
 
     public GiftsUngiven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/GleamOfResistance.java b/Mage.Sets/src/mage/sets/modernmasters/GleamOfResistance.java
index 10415de93d..1ed0ace368 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/GleamOfResistance.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/GleamOfResistance.java
@@ -37,7 +37,7 @@ public class GleamOfResistance extends mage.sets.conflux.GleamOfResistance {
 
     public GleamOfResistance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/GlenElendraArchmage.java b/Mage.Sets/src/mage/sets/modernmasters/GlenElendraArchmage.java
index 9e54cd1ee7..dd78efea55 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/GlenElendraArchmage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/GlenElendraArchmage.java
@@ -37,7 +37,7 @@ public class GlenElendraArchmage extends mage.sets.eventide.GlenElendraArchmage
 
     public GlenElendraArchmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Glimmervoid.java b/Mage.Sets/src/mage/sets/modernmasters/Glimmervoid.java
index 343071383b..88b7abf86e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Glimmervoid.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Glimmervoid.java
@@ -37,7 +37,7 @@ public class Glimmervoid extends mage.sets.mirrodin.Glimmervoid {
 
     public Glimmervoid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Grapeshot.java b/Mage.Sets/src/mage/sets/modernmasters/Grapeshot.java
index 3ca7a04fd5..9f099bacf5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Grapeshot.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Grapeshot.java
@@ -37,7 +37,7 @@ public class Grapeshot extends mage.sets.timespiral.Grapeshot {
 
     public Grapeshot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/GreaterGargadon.java b/Mage.Sets/src/mage/sets/modernmasters/GreaterGargadon.java
index bc83d7e8de..41c6884dc7 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/GreaterGargadon.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/GreaterGargadon.java
@@ -37,7 +37,7 @@ public class GreaterGargadon extends mage.sets.timespiral.GreaterGargadon {
 
     public GreaterGargadon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/GreaterMossdog.java b/Mage.Sets/src/mage/sets/modernmasters/GreaterMossdog.java
index 2771a037a9..1f89b03761 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/GreaterMossdog.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/GreaterMossdog.java
@@ -37,7 +37,7 @@ public class GreaterMossdog extends mage.sets.ravnica.GreaterMossdog {
 
     public GreaterMossdog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/HammerheimDeadeye.java b/Mage.Sets/src/mage/sets/modernmasters/HammerheimDeadeye.java
index b02089a92e..e02bc3f5ba 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/HammerheimDeadeye.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/HammerheimDeadeye.java
@@ -38,7 +38,7 @@ public class HammerheimDeadeye extends mage.sets.planarchaos.HammerheimDeadeye {
 
     public HammerheimDeadeye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java b/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java
index 63979fb91e..ddd42d4600 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java
@@ -38,7 +38,7 @@ public class HanaKami extends mage.sets.championsofkamigawa.HanaKami {
 
     public HanaKami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/HillcomberGiant.java b/Mage.Sets/src/mage/sets/modernmasters/HillcomberGiant.java
index 15bd9d8c65..b0c4270af0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/HillcomberGiant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/HillcomberGiant.java
@@ -37,7 +37,7 @@ public class HillcomberGiant extends mage.sets.lorwyn.HillcomberGiant {
 
     public HillcomberGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/HorobisWhisper.java b/Mage.Sets/src/mage/sets/modernmasters/HorobisWhisper.java
index c22e9b9c0a..02123b38b8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/HorobisWhisper.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/HorobisWhisper.java
@@ -38,7 +38,7 @@ public class HorobisWhisper extends mage.sets.betrayersofkamigawa.HorobisWhisper
 
     public HorobisWhisper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/IvoryGiant.java b/Mage.Sets/src/mage/sets/modernmasters/IvoryGiant.java
index b2eeee4d8e..ca9713936d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/IvoryGiant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/IvoryGiant.java
@@ -37,7 +37,7 @@ public class IvoryGiant extends mage.sets.timespiral.IvoryGiant {
 
     public IvoryGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java b/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java
index df52c68653..d60c11874d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java
@@ -38,7 +38,7 @@ public class JuganTheRisingStar extends mage.sets.championsofkamigawa.JuganTheRi
 
     public JuganTheRisingStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KatakiWarsWage.java b/Mage.Sets/src/mage/sets/modernmasters/KatakiWarsWage.java
index 72bf79bbb6..8ba65ad20c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KatakiWarsWage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KatakiWarsWage.java
@@ -37,7 +37,7 @@ public class KatakiWarsWage extends mage.sets.saviorsofkamigawa.KatakiWarsWage {
 
     public KatakiWarsWage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java
index 9a7b9aed42..25b3541728 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java
@@ -38,7 +38,7 @@ public class KeigaTheTideStar extends mage.sets.championsofkamigawa.KeigaTheTide
 
     public KeigaTheTideStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java
index e8748ac90c..8b8d9df049 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java
@@ -38,7 +38,7 @@ public class KikiJikiMirrorBreaker extends mage.sets.championsofkamigawa.KikiJik
 
     public KikiJikiMirrorBreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KiraGreatGlassSpinner.java b/Mage.Sets/src/mage/sets/modernmasters/KiraGreatGlassSpinner.java
index 52f42728af..6f9464c401 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KiraGreatGlassSpinner.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KiraGreatGlassSpinner.java
@@ -37,7 +37,7 @@ public class KiraGreatGlassSpinner extends mage.sets.betrayersofkamigawa.KiraGre
 
     public KiraGreatGlassSpinner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KitchenFinks.java b/Mage.Sets/src/mage/sets/modernmasters/KitchenFinks.java
index 14d4f91c58..0a077ac61a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KitchenFinks.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KitchenFinks.java
@@ -37,7 +37,7 @@ public class KitchenFinks extends mage.sets.shadowmoor.KitchenFinks {
 
     public KitchenFinks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KnightOfTheReliquary.java b/Mage.Sets/src/mage/sets/modernmasters/KnightOfTheReliquary.java
index d7aea02aec..28bafd44a2 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KnightOfTheReliquary.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KnightOfTheReliquary.java
@@ -37,7 +37,7 @@ public class KnightOfTheReliquary extends mage.sets.conflux.KnightOfTheReliquary
 
     public KnightOfTheReliquary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KodamasReach.java b/Mage.Sets/src/mage/sets/modernmasters/KodamasReach.java
index 7465f08525..a39c6f39e4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KodamasReach.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KodamasReach.java
@@ -37,7 +37,7 @@ public class KodamasReach extends mage.sets.commander.KodamasReach {
 
     public KodamasReach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java b/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java
index d26fc24c1f..72c9496762 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java
@@ -38,7 +38,7 @@ public class KokushoTheEveningStar extends mage.sets.championsofkamigawa.Kokusho
 
     public KokushoTheEveningStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/KrosanGrip.java b/Mage.Sets/src/mage/sets/modernmasters/KrosanGrip.java
index cd64ecb734..f6e98bf11d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/KrosanGrip.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/KrosanGrip.java
@@ -37,7 +37,7 @@ public class KrosanGrip extends mage.sets.timespiral.KrosanGrip {
 
     public KrosanGrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/LavaSpike.java b/Mage.Sets/src/mage/sets/modernmasters/LavaSpike.java
index a062ef424f..8446fd1d17 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/LavaSpike.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/LavaSpike.java
@@ -37,7 +37,7 @@ public class LavaSpike extends mage.sets.championsofkamigawa.LavaSpike {
 
     public LavaSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/LifeFromTheLoam.java b/Mage.Sets/src/mage/sets/modernmasters/LifeFromTheLoam.java
index 8ea0334956..06018c1168 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/LifeFromTheLoam.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/LifeFromTheLoam.java
@@ -37,7 +37,7 @@ public class LifeFromTheLoam extends mage.sets.ravnica.LifeFromTheLoam {
 
     public LifeFromTheLoam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/LightningHelix.java b/Mage.Sets/src/mage/sets/modernmasters/LightningHelix.java
index 1b1cad7139..d546daa5a4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/LightningHelix.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/LightningHelix.java
@@ -37,7 +37,7 @@ public class LightningHelix extends mage.sets.ravnica.LightningHelix {
 
     public LightningHelix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/LotusBloom.java b/Mage.Sets/src/mage/sets/modernmasters/LotusBloom.java
index 77ae3f18f8..6617439361 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/LotusBloom.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/LotusBloom.java
@@ -37,7 +37,7 @@ public class LotusBloom extends mage.sets.timespiral.LotusBloom {
 
     public LotusBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java b/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java
index eaf6150d1c..c1f2468752 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java
@@ -38,7 +38,7 @@ public class MadAuntie extends mage.sets.lorwyn.MadAuntie {
 
     public MadAuntie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MaelstromPulse.java b/Mage.Sets/src/mage/sets/modernmasters/MaelstromPulse.java
index 45268b1b64..3a0f19e236 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MaelstromPulse.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MaelstromPulse.java
@@ -37,7 +37,7 @@ public class MaelstromPulse extends mage.sets.alarareborn.MaelstromPulse {
 
     public MaelstromPulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java b/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java
index 3fabf9795f..07cf82db79 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java
@@ -38,7 +38,7 @@ public class Manamorphose extends mage.sets.shadowmoor.Manamorphose {
 
     public Manamorphose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Meadowboon.java b/Mage.Sets/src/mage/sets/modernmasters/Meadowboon.java
index c1d12e458e..2455f06d4a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Meadowboon.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Meadowboon.java
@@ -37,7 +37,7 @@ public class Meadowboon extends mage.sets.morningtide.Meadowboon {
 
     public Meadowboon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/sets/modernmasters/MelokuTheCloudedMirror.java
index 66bcdbc04c..51e1228549 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MelokuTheCloudedMirror.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MelokuTheCloudedMirror.java
@@ -37,7 +37,7 @@ public class MelokuTheCloudedMirror extends mage.sets.championsofkamigawa.Meloku
 
     public MelokuTheCloudedMirror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MindFuneral.java b/Mage.Sets/src/mage/sets/modernmasters/MindFuneral.java
index 482ab217c0..dfc6dfa140 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MindFuneral.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MindFuneral.java
@@ -37,7 +37,7 @@ public class MindFuneral extends mage.sets.alarareborn.MindFuneral {
 
     public MindFuneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MoggWarMarshal.java b/Mage.Sets/src/mage/sets/modernmasters/MoggWarMarshal.java
index b1a98d06cf..abab4570a8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MoggWarMarshal.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MoggWarMarshal.java
@@ -37,7 +37,7 @@ public class MoggWarMarshal extends mage.sets.timespiral.MoggWarMarshal {
 
     public MoggWarMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java b/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java
index 2c5fb5cf54..eb65892688 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java
@@ -38,7 +38,7 @@ public class MoldervineCloak extends mage.sets.ravnica.MoldervineCloak {
 
     public MoldervineCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MothdustChangeling.java b/Mage.Sets/src/mage/sets/modernmasters/MothdustChangeling.java
index dfc8edbb29..7552d2372f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MothdustChangeling.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MothdustChangeling.java
@@ -37,7 +37,7 @@ public class MothdustChangeling extends mage.sets.morningtide.MothdustChangeling
 
     public MothdustChangeling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java b/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java
index 89e95d6db1..73d7fef79a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java
@@ -38,7 +38,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MurderousRedcap.java b/Mage.Sets/src/mage/sets/modernmasters/MurderousRedcap.java
index 4a4ac76360..b42299fed6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MurderousRedcap.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MurderousRedcap.java
@@ -37,7 +37,7 @@ public class MurderousRedcap extends mage.sets.shadowmoor.MurderousRedcap {
 
     public MurderousRedcap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MyrEnforcer.java b/Mage.Sets/src/mage/sets/modernmasters/MyrEnforcer.java
index 58d5c2668c..278e21ed9e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MyrEnforcer.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MyrEnforcer.java
@@ -37,7 +37,7 @@ public class MyrEnforcer extends mage.sets.planechase.MyrEnforcer {
 
     public MyrEnforcer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/NantukoShaman.java b/Mage.Sets/src/mage/sets/modernmasters/NantukoShaman.java
index b5fcf1896c..9b1ca49510 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/NantukoShaman.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/NantukoShaman.java
@@ -37,7 +37,7 @@ public class NantukoShaman extends mage.sets.timespiral.NantukoShaman {
 
     public NantukoShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Narcomoeba.java b/Mage.Sets/src/mage/sets/modernmasters/Narcomoeba.java
index 7b8fd9102c..1c80f67e13 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Narcomoeba.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Narcomoeba.java
@@ -37,7 +37,7 @@ public class Narcomoeba extends mage.sets.futuresight.Narcomoeba {
 
     public Narcomoeba(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/sets/modernmasters/OonaQueenOfTheFae.java
index 4ebce73c2d..3326e6e1e4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/OonaQueenOfTheFae.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/OonaQueenOfTheFae.java
@@ -37,7 +37,7 @@ public class OonaQueenOfTheFae extends mage.sets.shadowmoor.OonaQueenOfTheFae {
 
     public OonaQueenOfTheFae(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java
index 8629ee4944..7238f4f292 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java
@@ -38,7 +38,7 @@ public class OtherworldlyJourney extends mage.sets.championsofkamigawa.Otherworl
 
     public OtherworldlyJourney(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PactOfNegation.java b/Mage.Sets/src/mage/sets/modernmasters/PactOfNegation.java
index ef6dbd2292..91b72c4778 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PactOfNegation.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PactOfNegation.java
@@ -37,7 +37,7 @@ public class PactOfNegation extends mage.sets.futuresight.PactOfNegation {
 
     public PactOfNegation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PallidMycoderm.java b/Mage.Sets/src/mage/sets/modernmasters/PallidMycoderm.java
index 0c7ac9eca4..9a8d44a373 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PallidMycoderm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PallidMycoderm.java
@@ -37,7 +37,7 @@ public class PallidMycoderm extends mage.sets.planarchaos.PallidMycoderm {
 
     public PallidMycoderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ParadiseMantle.java b/Mage.Sets/src/mage/sets/modernmasters/ParadiseMantle.java
index ca90a0b0ad..9fb8c4cada 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ParadiseMantle.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ParadiseMantle.java
@@ -37,7 +37,7 @@ public class ParadiseMantle extends mage.sets.fifthdawn.ParadiseMantle {
 
     public ParadiseMantle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PardicDragon.java b/Mage.Sets/src/mage/sets/modernmasters/PardicDragon.java
index 8c5f950bf7..ea2b1208f3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PardicDragon.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PardicDragon.java
@@ -38,7 +38,7 @@ public class PardicDragon extends mage.sets.timespiral.PardicDragon {
 
     public PardicDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PathToExile.java b/Mage.Sets/src/mage/sets/modernmasters/PathToExile.java
index a636cf83a5..1995603f59 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PathToExile.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PathToExile.java
@@ -37,7 +37,7 @@ public class PathToExile extends mage.sets.conflux.PathToExile {
 
     public PathToExile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PeerThroughDepths.java b/Mage.Sets/src/mage/sets/modernmasters/PeerThroughDepths.java
index 378141cdc2..7b28c5854e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PeerThroughDepths.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PeerThroughDepths.java
@@ -37,7 +37,7 @@ public class PeerThroughDepths extends mage.sets.championsofkamigawa.PeerThrough
 
     public PeerThroughDepths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PenumbraSpider.java b/Mage.Sets/src/mage/sets/modernmasters/PenumbraSpider.java
index f3ab8a3254..73ad876c1a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PenumbraSpider.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PenumbraSpider.java
@@ -37,7 +37,7 @@ public class PenumbraSpider extends mage.sets.planechase2012.PenumbraSpider {
 
     public PenumbraSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java b/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java
index 906e8b4e0e..d6f066bd26 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java
@@ -38,7 +38,7 @@ public class PerilousResearch extends mage.sets.commander.PerilousResearch {
 
     public PerilousResearch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Pestermite.java b/Mage.Sets/src/mage/sets/modernmasters/Pestermite.java
index 92bfbe93d8..25542a3fce 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Pestermite.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Pestermite.java
@@ -37,7 +37,7 @@ public class Pestermite extends mage.sets.lorwyn.Pestermite {
 
     public Pestermite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Phthisis.java b/Mage.Sets/src/mage/sets/modernmasters/Phthisis.java
index 0f1c2dd990..f8e9bdc9d8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Phthisis.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Phthisis.java
@@ -37,7 +37,7 @@ public class Phthisis extends mage.sets.timespiral.Phthisis {
 
     public Phthisis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Plumeveil.java b/Mage.Sets/src/mage/sets/modernmasters/Plumeveil.java
index a226681fdc..4232609d02 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Plumeveil.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Plumeveil.java
@@ -37,7 +37,7 @@ public class Plumeveil extends mage.sets.shadowmoor.Plumeveil {
 
     public Plumeveil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Progenitus.java b/Mage.Sets/src/mage/sets/modernmasters/Progenitus.java
index b3cba66f32..32d9fa50a0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Progenitus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Progenitus.java
@@ -37,7 +37,7 @@ public class Progenitus extends mage.sets.conflux.Progenitus {
 
     public Progenitus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/PyriteSpellbomb.java b/Mage.Sets/src/mage/sets/modernmasters/PyriteSpellbomb.java
index a1422c84db..6114c8e92c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/PyriteSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/PyriteSpellbomb.java
@@ -37,7 +37,7 @@ public class PyriteSpellbomb extends mage.sets.mirrodin.PyriteSpellbomb {
 
     public PyriteSpellbomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/RathiTrapper.java b/Mage.Sets/src/mage/sets/modernmasters/RathiTrapper.java
index aa7ea2afa8..79f315896a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/RathiTrapper.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/RathiTrapper.java
@@ -37,7 +37,7 @@ public class RathiTrapper extends mage.sets.planarchaos.RathiTrapper {
 
     public RathiTrapper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/RavensCrime.java b/Mage.Sets/src/mage/sets/modernmasters/RavensCrime.java
index 6fb746a037..f3e79eaf31 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/RavensCrime.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/RavensCrime.java
@@ -37,7 +37,7 @@ public class RavensCrime extends mage.sets.eventide.RavensCrime {
 
     public RavensCrime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ReachThroughMists.java b/Mage.Sets/src/mage/sets/modernmasters/ReachThroughMists.java
index 38f1211aac..d380571171 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ReachThroughMists.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ReachThroughMists.java
@@ -37,7 +37,7 @@ public class ReachThroughMists extends mage.sets.championsofkamigawa.ReachThroug
 
     public ReachThroughMists(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java
index e01c7c384b..c486d584bc 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java
@@ -38,7 +38,7 @@ public class RelicOfProgenitus extends mage.sets.shardsofalara.RelicOfProgenitus
 
     public RelicOfProgenitus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Reveillark.java b/Mage.Sets/src/mage/sets/modernmasters/Reveillark.java
index 74cc095165..9e32702187 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Reveillark.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Reveillark.java
@@ -37,7 +37,7 @@ public class Reveillark extends mage.sets.morningtide.Reveillark {
 
     public Reveillark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/RiftBolt.java b/Mage.Sets/src/mage/sets/modernmasters/RiftBolt.java
index aee6adbb74..b3c8e0d8b8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/RiftBolt.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/RiftBolt.java
@@ -37,7 +37,7 @@ public class RiftBolt extends mage.sets.timespiral.RiftBolt {
 
     public RiftBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/modernmasters/RiftwingCloudskate.java
index 88b9580b74..893cbab3b3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/RiftwingCloudskate.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/RiftwingCloudskate.java
@@ -37,7 +37,7 @@ public class RiftwingCloudskate extends mage.sets.timespiral.RiftwingCloudskate
 
     public RiftwingCloudskate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java
index de428de895..8e39547c43 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java
@@ -38,7 +38,7 @@ public class RyuseiTheFallingStar extends mage.sets.championsofkamigawa.RyuseiTh
 
     public RyuseiTheFallingStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SaltfieldRecluse.java b/Mage.Sets/src/mage/sets/modernmasters/SaltfieldRecluse.java
index f1ce931301..c026a9675c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SaltfieldRecluse.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SaltfieldRecluse.java
@@ -37,7 +37,7 @@ public class SaltfieldRecluse extends mage.sets.planarchaos.SaltfieldRecluse {
 
     public SaltfieldRecluse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SanctumGargoyle.java b/Mage.Sets/src/mage/sets/modernmasters/SanctumGargoyle.java
index f417c86c0b..c0daa65054 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SanctumGargoyle.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SanctumGargoyle.java
@@ -37,7 +37,7 @@ public class SanctumGargoyle extends mage.sets.shardsofalara.SanctumGargoyle {
 
     public SanctumGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Sandsower.java b/Mage.Sets/src/mage/sets/modernmasters/Sandsower.java
index 443c176a6d..2383adcb07 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Sandsower.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Sandsower.java
@@ -37,7 +37,7 @@ public class Sandsower extends mage.sets.ravnica.Sandsower {
 
     public Sandsower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SarkhanVol.java b/Mage.Sets/src/mage/sets/modernmasters/SarkhanVol.java
index 329f708e59..ddd611ec0d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SarkhanVol.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SarkhanVol.java
@@ -37,7 +37,7 @@ public class SarkhanVol extends mage.sets.shardsofalara.SarkhanVol {
 
     public SarkhanVol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ScionOfOona.java b/Mage.Sets/src/mage/sets/modernmasters/ScionOfOona.java
index e146e12da7..81a534ee87 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ScionOfOona.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ScionOfOona.java
@@ -37,7 +37,7 @@ public class ScionOfOona extends mage.sets.lorwyn.ScionOfOona {
 
     public ScionOfOona(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SearchForTomorrow.java b/Mage.Sets/src/mage/sets/modernmasters/SearchForTomorrow.java
index fdb1c70b4b..a425957618 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SearchForTomorrow.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SearchForTomorrow.java
@@ -37,7 +37,7 @@ public class SearchForTomorrow extends mage.sets.timespiral.SearchForTomorrow {
 
     public SearchForTomorrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/modernmasters/ShrapnelBlast.java
index d482933c60..e9dc39bc38 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ShrapnelBlast.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ShrapnelBlast.java
@@ -37,7 +37,7 @@ public class ShrapnelBlast extends mage.sets.mirrodin.ShrapnelBlast {
 
     public ShrapnelBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SkeletalVampire.java b/Mage.Sets/src/mage/sets/modernmasters/SkeletalVampire.java
index c6cd0c66d6..2617987aba 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SkeletalVampire.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SkeletalVampire.java
@@ -37,7 +37,7 @@ public class SkeletalVampire extends mage.sets.guildpact.SkeletalVampire {
 
     public SkeletalVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SkyreachManta.java b/Mage.Sets/src/mage/sets/modernmasters/SkyreachManta.java
index bf69351acd..b0ba12b850 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SkyreachManta.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SkyreachManta.java
@@ -37,7 +37,7 @@ public class SkyreachManta extends mage.sets.fifthdawn.SkyreachManta {
 
     public SkyreachManta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SlaughterPact.java b/Mage.Sets/src/mage/sets/modernmasters/SlaughterPact.java
index 5629292674..20d25d81af 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SlaughterPact.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SlaughterPact.java
@@ -37,7 +37,7 @@ public class SlaughterPact extends mage.sets.futuresight.SlaughterPact {
 
     public SlaughterPact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SpellSnare.java b/Mage.Sets/src/mage/sets/modernmasters/SpellSnare.java
index e3afd4fe09..81c0d5b934 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SpellSnare.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SpellSnare.java
@@ -37,7 +37,7 @@ public class SpellSnare extends mage.sets.dissension.SpellSnare {
 
     public SpellSnare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SpellstutterSprite.java b/Mage.Sets/src/mage/sets/modernmasters/SpellstutterSprite.java
index 5987404ced..000a255a97 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SpellstutterSprite.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SpellstutterSprite.java
@@ -37,7 +37,7 @@ public class SpellstutterSprite extends mage.sets.lorwyn.SpellstutterSprite {
 
     public SpellstutterSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SporesowerThallid.java b/Mage.Sets/src/mage/sets/modernmasters/SporesowerThallid.java
index 85dd75be3e..2d1ab40650 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SporesowerThallid.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SporesowerThallid.java
@@ -37,7 +37,7 @@ public class SporesowerThallid extends mage.sets.timespiral.SporesowerThallid {
 
     public SporesowerThallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SqueeGoblinNabob.java b/Mage.Sets/src/mage/sets/modernmasters/SqueeGoblinNabob.java
index d7286c76b4..43781d226e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SqueeGoblinNabob.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SqueeGoblinNabob.java
@@ -37,7 +37,7 @@ public class SqueeGoblinNabob extends mage.sets.tenthedition.SqueeGoblinNabob {
 
     public SqueeGoblinNabob(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Stingscourger.java b/Mage.Sets/src/mage/sets/modernmasters/Stingscourger.java
index 8d34edd0ae..85fec02002 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Stingscourger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Stingscourger.java
@@ -37,7 +37,7 @@ public class Stingscourger extends mage.sets.planarchaos.Stingscourger {
 
     public Stingscourger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/StinkdrinkerDaredevil.java b/Mage.Sets/src/mage/sets/modernmasters/StinkdrinkerDaredevil.java
index 2dc399aed2..fdb8650e44 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/StinkdrinkerDaredevil.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/StinkdrinkerDaredevil.java
@@ -37,7 +37,7 @@ public class StinkdrinkerDaredevil extends mage.sets.lorwyn.StinkdrinkerDaredevi
 
     public StinkdrinkerDaredevil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/StinkweedImp.java b/Mage.Sets/src/mage/sets/modernmasters/StinkweedImp.java
index 0a9c67f923..c9556ecfeb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/StinkweedImp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/StinkweedImp.java
@@ -37,7 +37,7 @@ public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
 
     public StinkweedImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java b/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java
index e4734fb14d..500aeb23b4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java
@@ -38,7 +38,7 @@ public class StreetWraith extends mage.sets.futuresight.StreetWraith {
 
     public StreetWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SuddenShock.java b/Mage.Sets/src/mage/sets/modernmasters/SuddenShock.java
index d7346d45d8..b92e7adac6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SuddenShock.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SuddenShock.java
@@ -37,7 +37,7 @@ public class SuddenShock extends mage.sets.timespiral.SuddenShock {
 
     public SuddenShock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SummonersPact.java b/Mage.Sets/src/mage/sets/modernmasters/SummonersPact.java
index d93db80fdd..5486a56a60 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SummonersPact.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SummonersPact.java
@@ -37,7 +37,7 @@ public class SummonersPact extends mage.sets.futuresight.SummonersPact {
 
     public SummonersPact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java
index 948b3ba0fb..dadd973607 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java
@@ -38,7 +38,7 @@ public class SwordOfFireAndIce extends mage.sets.darksteel.SwordOfFireAndIce {
 
     public SwordOfFireAndIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java b/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java
index ca253b6e4e..f95745ab05 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java
@@ -38,7 +38,7 @@ public class SwordOfLightAndShadow extends mage.sets.darksteel.SwordOfLightAndSh
 
     public SwordOfLightAndShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SylvanBounty.java b/Mage.Sets/src/mage/sets/modernmasters/SylvanBounty.java
index d27216bbc6..f66bd0e4ec 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SylvanBounty.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SylvanBounty.java
@@ -37,7 +37,7 @@ public class SylvanBounty extends mage.sets.conflux.SylvanBounty {
 
     public SylvanBounty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java b/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java
index 03dc648787..b488eeadf3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java
@@ -38,7 +38,7 @@ public class SyphonLife extends mage.sets.eventide.SyphonLife {
 
     public SyphonLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TarPitcher.java b/Mage.Sets/src/mage/sets/modernmasters/TarPitcher.java
index 9294fb5eab..c24ab44a63 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TarPitcher.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TarPitcher.java
@@ -37,7 +37,7 @@ public class TarPitcher extends mage.sets.lorwyn.TarPitcher {
 
     public TarPitcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java b/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java
index d5adc1d186..bb1591089c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java
@@ -38,7 +38,7 @@ public class Tarmogoyf extends mage.sets.futuresight.Tarmogoyf {
 
     public Tarmogoyf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java b/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java
index 33b6a7c6ff..9c1511a7be 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java
@@ -38,7 +38,7 @@ public class TerashisGrasp extends mage.sets.betrayersofkamigawa.TerashisGrasp {
 
     public TerashisGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/modernmasters/TerramorphicExpanse.java
index 7d57b0459d..50b7e186a2 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Thallid.java b/Mage.Sets/src/mage/sets/modernmasters/Thallid.java
index 353c4e5408..a42853f85e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Thallid.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Thallid.java
@@ -38,7 +38,7 @@ public class Thallid extends mage.sets.timeshifted.Thallid {
 
     public Thallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThallidGerminator.java b/Mage.Sets/src/mage/sets/modernmasters/ThallidGerminator.java
index 1c4198bb0a..8f14e2102c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ThallidGerminator.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ThallidGerminator.java
@@ -37,7 +37,7 @@ public class ThallidGerminator extends mage.sets.timespiral.ThallidGerminator {
 
     public ThallidGerminator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThallidShellDweller.java b/Mage.Sets/src/mage/sets/modernmasters/ThallidShellDweller.java
index bc7dce98c3..7fece5f8de 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ThallidShellDweller.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ThallidShellDweller.java
@@ -37,7 +37,7 @@ public class ThallidShellDweller extends mage.sets.timespiral.ThallidShellDwelle
 
     public ThallidShellDweller(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/modernmasters/ThirstForKnowledge.java
index d246e00226..737754e30b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ThirstForKnowledge.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ThirstForKnowledge.java
@@ -37,7 +37,7 @@ public class ThirstForKnowledge extends mage.sets.planechase.ThirstForKnowledge
 
     public ThirstForKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java b/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java
index c0a1ad9e9c..bf69c708a5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java
@@ -38,7 +38,7 @@ public class ThunderingGiant extends mage.sets.tenthedition.ThunderingGiant {
 
     public ThunderingGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TidehollowSculler.java b/Mage.Sets/src/mage/sets/modernmasters/TidehollowSculler.java
index 06232400d5..31faf6eb36 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TidehollowSculler.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TidehollowSculler.java
@@ -37,7 +37,7 @@ public class TidehollowSculler extends mage.sets.shardsofalara.TidehollowSculler
 
     public TidehollowSculler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TorrentOfStone.java b/Mage.Sets/src/mage/sets/modernmasters/TorrentOfStone.java
index 57141a9a1f..93f1af81f3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TorrentOfStone.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TorrentOfStone.java
@@ -37,7 +37,7 @@ public class TorrentOfStone extends mage.sets.betrayersofkamigawa.TorrentOfStone
 
     public TorrentOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TraumaticVisions.java b/Mage.Sets/src/mage/sets/modernmasters/TraumaticVisions.java
index b6422e65d5..66a2595599 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TraumaticVisions.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TraumaticVisions.java
@@ -37,7 +37,7 @@ public class TraumaticVisions extends mage.sets.conflux.TraumaticVisions {
 
     public TraumaticVisions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java b/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java
index 264b344d02..266bd9dbe9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java
@@ -38,7 +38,7 @@ public class TribalFlames extends mage.sets.invasion.TribalFlames {
 
     public TribalFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TrompTheDomains.java b/Mage.Sets/src/mage/sets/modernmasters/TrompTheDomains.java
index ce984ac97e..40f7e7a888 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TrompTheDomains.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TrompTheDomains.java
@@ -37,7 +37,7 @@ public class TrompTheDomains extends mage.sets.timespiral.TrompTheDomains {
 
     public TrompTheDomains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VedalkenDismisser.java b/Mage.Sets/src/mage/sets/modernmasters/VedalkenDismisser.java
index 71060e2a49..7651aea928 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VedalkenDismisser.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VedalkenDismisser.java
@@ -37,7 +37,7 @@ public class VedalkenDismisser extends mage.sets.ravnica.VedalkenDismisser {
 
     public VedalkenDismisser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java b/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java
index 2166ab46a6..4a0eaf9259 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java
@@ -38,7 +38,7 @@ public class VendilionClique extends mage.sets.morningtide.VendilionClique {
 
     public VendilionClique(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VerdelothTheAncient.java b/Mage.Sets/src/mage/sets/modernmasters/VerdelothTheAncient.java
index 91a1bc13f7..1c1f0e25af 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VerdelothTheAncient.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VerdelothTheAncient.java
@@ -37,7 +37,7 @@ public class VerdelothTheAncient extends mage.sets.invasion.VerdelothTheAncient
 
     public VerdelothTheAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VeteranArmorer.java b/Mage.Sets/src/mage/sets/modernmasters/VeteranArmorer.java
index 329d23daf5..3555ddc332 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VeteranArmorer.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VeteranArmorer.java
@@ -37,7 +37,7 @@ public class VeteranArmorer extends mage.sets.ravnica.VeteranArmorer {
 
     public VeteranArmorer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VividCrag.java b/Mage.Sets/src/mage/sets/modernmasters/VividCrag.java
index f9272f29ed..8a4b6327b6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VividCrag.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VividCrag.java
@@ -37,7 +37,7 @@ public class VividCrag extends mage.sets.lorwyn.VividCrag {
 
     public VividCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VividCreek.java b/Mage.Sets/src/mage/sets/modernmasters/VividCreek.java
index 0a3f071881..b5c028f203 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VividCreek.java
@@ -37,7 +37,7 @@ public class VividCreek extends mage.sets.lorwyn.VividCreek {
 
     public VividCreek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VividGrove.java b/Mage.Sets/src/mage/sets/modernmasters/VividGrove.java
index ae1cf1a564..4e18287e07 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VividGrove.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VividGrove.java
@@ -37,7 +37,7 @@ public class VividGrove extends mage.sets.lorwyn.VividGrove {
 
     public VividGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VividMarsh.java b/Mage.Sets/src/mage/sets/modernmasters/VividMarsh.java
index d19d9ee59c..16cf3f78a1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VividMarsh.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VividMarsh.java
@@ -37,7 +37,7 @@ public class VividMarsh extends mage.sets.lorwyn.VividMarsh {
 
     public VividMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/VividMeadow.java b/Mage.Sets/src/mage/sets/modernmasters/VividMeadow.java
index 1541a46035..19773fbb4b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/VividMeadow.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/VividMeadow.java
@@ -37,7 +37,7 @@ public class VividMeadow extends mage.sets.lorwyn.VividMeadow {
 
     public VividMeadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java b/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java
index 3556d3af57..bf2f9d8cfd 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java
@@ -38,7 +38,7 @@ public class WalkerOfTheGrove extends mage.sets.morningtide.WalkerOfTheGrove {
 
     public WalkerOfTheGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/WarSpikeChangeling.java b/Mage.Sets/src/mage/sets/modernmasters/WarSpikeChangeling.java
index 4c621c9aee..1e1e9bd4d5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/WarSpikeChangeling.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/WarSpikeChangeling.java
@@ -37,7 +37,7 @@ public class WarSpikeChangeling extends mage.sets.morningtide.WarSpikeChangeling
 
     public WarSpikeChangeling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/WoodfallPrimus.java b/Mage.Sets/src/mage/sets/modernmasters/WoodfallPrimus.java
index 396614f709..512976f0ac 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/WoodfallPrimus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/WoodfallPrimus.java
@@ -37,7 +37,7 @@ public class WoodfallPrimus extends mage.sets.shadowmoor.WoodfallPrimus {
 
     public WoodfallPrimus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "MMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/WormHarvest.java b/Mage.Sets/src/mage/sets/modernmasters/WormHarvest.java
index f9db5c100e..c867e6b865 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/WormHarvest.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/WormHarvest.java
@@ -38,7 +38,7 @@ public class WormHarvest extends mage.sets.eventide.WormHarvest {
 
     public WormHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java
index 5a16f51d31..853608bb75 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java
@@ -38,7 +38,7 @@ public class YoseiTheMorningStar extends mage.sets.championsofkamigawa.YoseiTheM
 
     public YoseiTheMorningStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java b/Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java
index da8e689fb0..781d43888c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java
@@ -37,7 +37,7 @@ public class AEthersnipe extends mage.sets.commander.AEthersnipe {
 
     public AEthersnipe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AgonyWarp.java b/Mage.Sets/src/mage/sets/modernmasters2015/AgonyWarp.java
index 88b9cfb532..3014e82afe 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AgonyWarp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AgonyWarp.java
@@ -38,7 +38,7 @@ public class AgonyWarp extends mage.sets.shardsofalara.AgonyWarp {
 
     public AgonyWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AirServant.java b/Mage.Sets/src/mage/sets/modernmasters2015/AirServant.java
index c195c880f5..f95bcfb03d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AirServant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AirServant.java
@@ -37,7 +37,7 @@ public class AirServant extends mage.sets.magic2011.AirServant {
 
     public AirServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AlgaeGharial.java b/Mage.Sets/src/mage/sets/modernmasters2015/AlgaeGharial.java
index f6bb20db12..fa51797aa6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AlgaeGharial.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AlgaeGharial.java
@@ -37,7 +37,7 @@ public class AlgaeGharial extends mage.sets.shardsofalara.AlgaeGharial {
 
     public AlgaeGharial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AllIsDust.java b/Mage.Sets/src/mage/sets/modernmasters2015/AllIsDust.java
index 8d48f4742e..3f95e2be05 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AllIsDust.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AllIsDust.java
@@ -38,7 +38,7 @@ public class AllIsDust extends mage.sets.riseoftheeldrazi.AllIsDust {
 
     public AllIsDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AlloyMyr.java b/Mage.Sets/src/mage/sets/modernmasters2015/AlloyMyr.java
index c642ce09a5..d7a52eef2f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AlloyMyr.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AlloyMyr.java
@@ -38,7 +38,7 @@ public class AlloyMyr extends mage.sets.newphyrexia.AlloyMyr {
 
     public AlloyMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AntQueen.java b/Mage.Sets/src/mage/sets/modernmasters2015/AntQueen.java
index a7ea41dc44..015d14dc3b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AntQueen.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AntQueen.java
@@ -37,7 +37,7 @@ public class AntQueen extends mage.sets.magic2010.AntQueen {
 
     public AntQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ApocalypseHydra.java b/Mage.Sets/src/mage/sets/modernmasters2015/ApocalypseHydra.java
index 37822565a4..6952112dc3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ApocalypseHydra.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ApocalypseHydra.java
@@ -38,7 +38,7 @@ public class ApocalypseHydra extends mage.sets.conflux.ApocalypseHydra {
 
     public ApocalypseHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ApostlesBlessing.java b/Mage.Sets/src/mage/sets/modernmasters2015/ApostlesBlessing.java
index 1c1df935f3..4d43764bbb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ApostlesBlessing.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ApostlesBlessing.java
@@ -37,7 +37,7 @@ public class ApostlesBlessing extends mage.sets.newphyrexia.ApostlesBlessing {
 
     public ApostlesBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AquastrandSpider.java b/Mage.Sets/src/mage/sets/modernmasters2015/AquastrandSpider.java
index 6500f5a45b..f1a828b022 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AquastrandSpider.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AquastrandSpider.java
@@ -37,7 +37,7 @@ public class AquastrandSpider extends mage.sets.dissension.AquastrandSpider {
 
     public AquastrandSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ArgentSphinx.java b/Mage.Sets/src/mage/sets/modernmasters2015/ArgentSphinx.java
index 724d6b7f5b..04eb47dc90 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ArgentSphinx.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ArgentSphinx.java
@@ -37,7 +37,7 @@ public class ArgentSphinx extends mage.sets.scarsofmirrodin.ArgentSphinx {
 
     public ArgentSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Arrest.java b/Mage.Sets/src/mage/sets/modernmasters2015/Arrest.java
index ca784593c9..15e950f681 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Arrest.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Arrest.java
@@ -37,7 +37,7 @@ public class Arrest extends mage.sets.mirrodin.Arrest {
 
     public Arrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/modernmasters2015/ArtisanOfKozilek.java
index 4597ef28c4..a43374119f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ArtisanOfKozilek.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ArtisanOfKozilek.java
@@ -37,7 +37,7 @@ public class ArtisanOfKozilek extends mage.sets.riseoftheeldrazi.ArtisanOfKozile
 
     public ArtisanOfKozilek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AshenmoorGouger.java b/Mage.Sets/src/mage/sets/modernmasters2015/AshenmoorGouger.java
index 5d551bdf44..ae05ffceb3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AshenmoorGouger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AshenmoorGouger.java
@@ -37,7 +37,7 @@ public class AshenmoorGouger extends mage.sets.shadowmoor.AshenmoorGouger {
 
     public AshenmoorGouger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AzoriusChancery.java b/Mage.Sets/src/mage/sets/modernmasters2015/AzoriusChancery.java
index 8aecc35d92..32d3cb5572 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/AzoriusChancery.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/AzoriusChancery.java
@@ -38,7 +38,7 @@ public class AzoriusChancery extends mage.sets.dissension.AzoriusChancery {
 
     public AzoriusChancery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Banefire.java b/Mage.Sets/src/mage/sets/modernmasters2015/Banefire.java
index 6135f55769..5a363096ee 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Banefire.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Banefire.java
@@ -37,7 +37,7 @@ public class Banefire extends mage.sets.conflux.Banefire {
 
     public Banefire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BattlegraceAngel.java b/Mage.Sets/src/mage/sets/modernmasters2015/BattlegraceAngel.java
index bdc1af35eb..b580e7c0ae 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BattlegraceAngel.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BattlegraceAngel.java
@@ -37,7 +37,7 @@ public class BattlegraceAngel extends mage.sets.shardsofalara.BattlegraceAngel {
 
     public BattlegraceAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BestialMenace.java b/Mage.Sets/src/mage/sets/modernmasters2015/BestialMenace.java
index 223c9cc719..8829609669 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BestialMenace.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BestialMenace.java
@@ -37,7 +37,7 @@ public class BestialMenace extends mage.sets.worldwake.BestialMenace {
 
     public BestialMenace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Bitterblossom.java b/Mage.Sets/src/mage/sets/modernmasters2015/Bitterblossom.java
index a11cbf994a..36a47421e5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Bitterblossom.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Bitterblossom.java
@@ -38,7 +38,7 @@ public class Bitterblossom extends mage.sets.morningtide.Bitterblossom {
 
     public Bitterblossom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BladesOfVelisVel.java b/Mage.Sets/src/mage/sets/modernmasters2015/BladesOfVelisVel.java
index 84b19120fb..1720c49e7d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BladesOfVelisVel.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BladesOfVelisVel.java
@@ -37,7 +37,7 @@ public class BladesOfVelisVel extends mage.sets.lorwyn.BladesOfVelisVel {
 
     public BladesOfVelisVel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BlindingSouleater.java b/Mage.Sets/src/mage/sets/modernmasters2015/BlindingSouleater.java
index 919f278ccc..15bd3ef194 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BlindingSouleater.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BlindingSouleater.java
@@ -37,7 +37,7 @@ public class BlindingSouleater extends mage.sets.newphyrexia.BlindingSouleater {
 
     public BlindingSouleater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BlinkmothNexus.java b/Mage.Sets/src/mage/sets/modernmasters2015/BlinkmothNexus.java
index 933a74370a..837e5f5354 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BlinkmothNexus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BlinkmothNexus.java
@@ -37,7 +37,7 @@ public class BlinkmothNexus extends mage.sets.darksteel.BlinkmothNexus {
 
     public BlinkmothNexus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BloodOgre.java b/Mage.Sets/src/mage/sets/modernmasters2015/BloodOgre.java
index e2eefef607..fc97e20e18 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BloodOgre.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BloodOgre.java
@@ -37,7 +37,7 @@ public class BloodOgre extends mage.sets.magic2012.BloodOgre {
 
     public BloodOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BloodshotTrainee.java b/Mage.Sets/src/mage/sets/modernmasters2015/BloodshotTrainee.java
index 41c43f4775..cda44a8fa9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BloodshotTrainee.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BloodshotTrainee.java
@@ -37,7 +37,7 @@ public class BloodshotTrainee extends mage.sets.scarsofmirrodin.BloodshotTrainee
 
     public BloodshotTrainee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/modernmasters2015/BloodthroneVampire.java
index ec5b3b22c0..e2c2f1a0b4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BloodthroneVampire.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BloodthroneVampire.java
@@ -37,7 +37,7 @@ public class BloodthroneVampire extends mage.sets.riseoftheeldrazi.BloodthroneVa
 
     public BloodthroneVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BoneSplinters.java b/Mage.Sets/src/mage/sets/modernmasters2015/BoneSplinters.java
index e98e3a02ec..94be45245e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BoneSplinters.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BoneSplinters.java
@@ -37,7 +37,7 @@ public class BoneSplinters extends mage.sets.shardsofalara.BoneSplinters {
 
     public BoneSplinters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BorosGarrison.java b/Mage.Sets/src/mage/sets/modernmasters2015/BorosGarrison.java
index 9e0c83ba02..0682ddd706 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BorosGarrison.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BorosGarrison.java
@@ -38,7 +38,7 @@ public class BorosGarrison extends mage.sets.planechase.BorosGarrison {
 
     public BorosGarrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BorosSwiftblade.java b/Mage.Sets/src/mage/sets/modernmasters2015/BorosSwiftblade.java
index b439eee1fd..beed7840a3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BorosSwiftblade.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BorosSwiftblade.java
@@ -37,7 +37,7 @@ public class BorosSwiftblade extends mage.sets.planechase.BorosSwiftblade {
 
     public BorosSwiftblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BruteForce.java b/Mage.Sets/src/mage/sets/modernmasters2015/BruteForce.java
index d29ae35c87..720fb82d50 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BruteForce.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BruteForce.java
@@ -37,7 +37,7 @@ public class BruteForce extends mage.sets.planarchaos.BruteForce {
 
     public BruteForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/BurstLightning.java b/Mage.Sets/src/mage/sets/modernmasters2015/BurstLightning.java
index dbd6a7b38d..7546c6ff59 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/BurstLightning.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/BurstLightning.java
@@ -37,7 +37,7 @@ public class BurstLightning extends mage.sets.zendikar.BurstLightning {
 
     public BurstLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Cathodion.java b/Mage.Sets/src/mage/sets/modernmasters2015/Cathodion.java
index 221335e5a4..86dd138891 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Cathodion.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Cathodion.java
@@ -38,7 +38,7 @@ public class Cathodion extends mage.sets.mirrodin.Cathodion {
 
     public Cathodion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CelestialPurge.java b/Mage.Sets/src/mage/sets/modernmasters2015/CelestialPurge.java
index 31d1bae0e1..86f9a160b5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CelestialPurge.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CelestialPurge.java
@@ -37,7 +37,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge {
 
     public CelestialPurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ChimericMass.java b/Mage.Sets/src/mage/sets/modernmasters2015/ChimericMass.java
index ecca6c0b4f..104a66b745 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ChimericMass.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ChimericMass.java
@@ -37,7 +37,7 @@ public class ChimericMass extends mage.sets.scarsofmirrodin.ChimericMass {
 
     public ChimericMass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CloudElemental.java b/Mage.Sets/src/mage/sets/modernmasters2015/CloudElemental.java
index 831b034c6d..f84d49052b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CloudElemental.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CloudElemental.java
@@ -37,7 +37,7 @@ public class CloudElemental extends mage.sets.tenthedition.CloudElemental {
 
     public CloudElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Combust.java b/Mage.Sets/src/mage/sets/modernmasters2015/Combust.java
index 49541808ba..645fd08eeb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Combust.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Combust.java
@@ -38,7 +38,7 @@ public class Combust extends mage.sets.magic2011.Combust {
 
     public Combust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CometStorm.java b/Mage.Sets/src/mage/sets/modernmasters2015/CometStorm.java
index f103c2e8ad..f71b744917 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CometStorm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CometStorm.java
@@ -37,7 +37,7 @@ public class CometStorm extends mage.sets.worldwake.CometStorm {
 
     public CometStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CommuneWithNature.java b/Mage.Sets/src/mage/sets/modernmasters2015/CommuneWithNature.java
index 13d4816c4e..23a9150547 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CommuneWithNature.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CommuneWithNature.java
@@ -37,7 +37,7 @@ public class CommuneWithNature extends mage.sets.championsofkamigawa.CommuneWith
 
     public CommuneWithNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ConclavePhalanx.java b/Mage.Sets/src/mage/sets/modernmasters2015/ConclavePhalanx.java
index e2738a9880..7bac40df4f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ConclavePhalanx.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ConclavePhalanx.java
@@ -38,7 +38,7 @@ public class ConclavePhalanx extends mage.sets.elspethvstezzeret.ConclavePhalanx
 
     public ConclavePhalanx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CopperCarapace.java b/Mage.Sets/src/mage/sets/modernmasters2015/CopperCarapace.java
index be8be8d63c..4107dad96e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CopperCarapace.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CopperCarapace.java
@@ -37,7 +37,7 @@ public class CopperCarapace extends mage.sets.mirrodinbesieged.CopperCarapace {
 
     public CopperCarapace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CourtHomunculus.java b/Mage.Sets/src/mage/sets/modernmasters2015/CourtHomunculus.java
index f946275cbb..36bc4fccb8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CourtHomunculus.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CourtHomunculus.java
@@ -37,7 +37,7 @@ public class CourtHomunculus extends mage.sets.conflux.CourtHomunculus {
 
     public CourtHomunculus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CranialPlating.java b/Mage.Sets/src/mage/sets/modernmasters2015/CranialPlating.java
index 3040c95bdb..b19a37ba41 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CranialPlating.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CranialPlating.java
@@ -38,7 +38,7 @@ public class CranialPlating extends mage.sets.planechase.CranialPlating {
 
     public CranialPlating(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CreakwoodLiege.java b/Mage.Sets/src/mage/sets/modernmasters2015/CreakwoodLiege.java
index 2b295c881c..07161535c8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CreakwoodLiege.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CreakwoodLiege.java
@@ -37,7 +37,7 @@ public class CreakwoodLiege extends mage.sets.eventide.CreakwoodLiege {
 
     public CreakwoodLiege(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CrypticCommand.java b/Mage.Sets/src/mage/sets/modernmasters2015/CrypticCommand.java
index 50b183ab31..0072e91a30 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CrypticCommand.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CrypticCommand.java
@@ -37,7 +37,7 @@ public class CrypticCommand extends mage.sets.lorwyn.CrypticCommand {
 
     public CrypticCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CullingDais.java b/Mage.Sets/src/mage/sets/modernmasters2015/CullingDais.java
index e5ef99b8be..abcb441e20 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CullingDais.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CullingDais.java
@@ -37,7 +37,7 @@ public class CullingDais extends mage.sets.scarsofmirrodin.CullingDais {
 
     public CullingDais(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/CytoplastRootKin.java b/Mage.Sets/src/mage/sets/modernmasters2015/CytoplastRootKin.java
index 3c6e9ab060..21cb9ea8ab 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/CytoplastRootKin.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/CytoplastRootKin.java
@@ -38,7 +38,7 @@ public class CytoplastRootKin extends mage.sets.dissension.CytoplastRootKin {
 
     public CytoplastRootKin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DaggerclawImp.java b/Mage.Sets/src/mage/sets/modernmasters2015/DaggerclawImp.java
index d3edd73246..7d3f19303f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DaggerclawImp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DaggerclawImp.java
@@ -37,7 +37,7 @@ public class DaggerclawImp extends mage.sets.guildpact.DaggerclawImp {
 
     public DaggerclawImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DarkConfidant.java b/Mage.Sets/src/mage/sets/modernmasters2015/DarkConfidant.java
index 0403a1f770..f730bbe1f3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DarkConfidant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DarkConfidant.java
@@ -38,7 +38,7 @@ public class DarkConfidant extends mage.sets.ravnica.DarkConfidant {
 
     public DarkConfidant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelAxe.java b/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelAxe.java
index e1f2ed50d9..a7d2c2c8de 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelAxe.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelAxe.java
@@ -37,7 +37,7 @@ public class DarksteelAxe extends mage.sets.scarsofmirrodin.DarksteelAxe {
 
     public DarksteelAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelCitadel.java b/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelCitadel.java
index 3c54a006b1..a253937a62 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelCitadel.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DarksteelCitadel.java
@@ -37,7 +37,7 @@ public class DarksteelCitadel extends mage.sets.darksteel.DarksteelCitadel {
 
     public DarksteelCitadel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DaybreakCoronet.java b/Mage.Sets/src/mage/sets/modernmasters2015/DaybreakCoronet.java
index f8380d9143..c0359864fa 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DaybreakCoronet.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DaybreakCoronet.java
@@ -37,7 +37,7 @@ public class DaybreakCoronet extends mage.sets.futuresight.DaybreakCoronet {
 
     public DaybreakCoronet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DeathDenied.java b/Mage.Sets/src/mage/sets/modernmasters2015/DeathDenied.java
index 2aae77b283..6d8640f903 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DeathDenied.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DeathDenied.java
@@ -37,7 +37,7 @@ public class DeathDenied extends mage.sets.saviorsofkamigawa.DeathDenied {
 
     public DeathDenied(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Deathmark.java b/Mage.Sets/src/mage/sets/modernmasters2015/Deathmark.java
index be032f9d17..2531148441 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Deathmark.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Deathmark.java
@@ -37,7 +37,7 @@ public class Deathmark extends mage.sets.tenthedition.Deathmark {
 
     public Deathmark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DevouringGreed.java b/Mage.Sets/src/mage/sets/modernmasters2015/DevouringGreed.java
index 03d175d2e0..dc4df4a845 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DevouringGreed.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DevouringGreed.java
@@ -38,7 +38,7 @@ public class DevouringGreed extends mage.sets.championsofkamigawa.DevouringGreed
 
     public DevouringGreed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DimirAqueduct.java b/Mage.Sets/src/mage/sets/modernmasters2015/DimirAqueduct.java
index 2e852afd07..ac0cef755c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DimirAqueduct.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DimirAqueduct.java
@@ -38,7 +38,7 @@ public class DimirAqueduct extends mage.sets.ravnica.DimirAqueduct {
 
     public DimirAqueduct(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DimirGuildmage.java b/Mage.Sets/src/mage/sets/modernmasters2015/DimirGuildmage.java
index f8c78e5f4f..02cdd7e217 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DimirGuildmage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DimirGuildmage.java
@@ -37,7 +37,7 @@ public class DimirGuildmage extends mage.sets.ravnica.DimirGuildmage {
 
     public DimirGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Dismember.java b/Mage.Sets/src/mage/sets/modernmasters2015/Dismember.java
index 8c90f9a4ce..9ef4c5d0eb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Dismember.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Dismember.java
@@ -37,7 +37,7 @@ public class Dismember extends mage.sets.newphyrexia.Dismember {
 
     public Dismember(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Dispatch.java b/Mage.Sets/src/mage/sets/modernmasters2015/Dispatch.java
index 6d3ce970fa..5326574b53 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Dispatch.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Dispatch.java
@@ -37,7 +37,7 @@ public class Dispatch extends mage.sets.newphyrexia.Dispatch {
 
     public Dispatch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DragonsoulKnight.java b/Mage.Sets/src/mage/sets/modernmasters2015/DragonsoulKnight.java
index 4de240d40c..53026df798 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DragonsoulKnight.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DragonsoulKnight.java
@@ -38,7 +38,7 @@ public class DragonsoulKnight extends mage.sets.conflux.DragonsoulKnight {
 
     public DragonsoulKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DreadDrone.java b/Mage.Sets/src/mage/sets/modernmasters2015/DreadDrone.java
index bddc9d73c4..3c5be01ea9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DreadDrone.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DreadDrone.java
@@ -37,7 +37,7 @@ public class DreadDrone extends mage.sets.riseoftheeldrazi.DreadDrone {
 
     public DreadDrone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DroolingGroodion.java b/Mage.Sets/src/mage/sets/modernmasters2015/DroolingGroodion.java
index a7e92063d2..3c78972315 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DroolingGroodion.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DroolingGroodion.java
@@ -37,7 +37,7 @@ public class DroolingGroodion extends mage.sets.jacevsvraska.DroolingGroodion {
 
     public DroolingGroodion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/DuskhunterBat.java b/Mage.Sets/src/mage/sets/modernmasters2015/DuskhunterBat.java
index f9751d3c23..8caa598c8c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/DuskhunterBat.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/DuskhunterBat.java
@@ -37,7 +37,7 @@ public class DuskhunterBat extends mage.sets.magic2012.DuskhunterBat {
 
     public DuskhunterBat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EldraziTemple.java b/Mage.Sets/src/mage/sets/modernmasters2015/EldraziTemple.java
index 1a36e6648a..a426c547d8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EldraziTemple.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EldraziTemple.java
@@ -38,7 +38,7 @@ public class EldraziTemple extends mage.sets.riseoftheeldrazi.EldraziTemple {
 
     public EldraziTemple(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Electrolyze.java b/Mage.Sets/src/mage/sets/modernmasters2015/Electrolyze.java
index d46413278e..7e87a24e2e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Electrolyze.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Electrolyze.java
@@ -37,7 +37,7 @@ public class Electrolyze extends mage.sets.guildpact.Electrolyze {
 
     public Electrolyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/sets/modernmasters2015/EleshNornGrandCenobite.java
index adcc91a7a0..b8393be385 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EleshNornGrandCenobite.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EleshNornGrandCenobite.java
@@ -37,7 +37,7 @@ public class EleshNornGrandCenobite extends mage.sets.newphyrexia.EleshNornGrand
 
     public EleshNornGrandCenobite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/sets/modernmasters2015/EmrakulTheAeonsTorn.java
index 7abd6537df..4c6b45a634 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EmrakulTheAeonsTorn.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EmrakulTheAeonsTorn.java
@@ -37,7 +37,7 @@ public class EmrakulTheAeonsTorn extends mage.sets.riseoftheeldrazi.EmrakulTheAe
 
     public EmrakulTheAeonsTorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/sets/modernmasters2015/EndrekSahrMasterBreeder.java
index d97cadafb2..c2b046b501 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EndrekSahrMasterBreeder.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EndrekSahrMasterBreeder.java
@@ -37,7 +37,7 @@ public class EndrekSahrMasterBreeder extends mage.sets.commander2013.EndrekSahrM
 
     public EndrekSahrMasterBreeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EtchedChampion.java b/Mage.Sets/src/mage/sets/modernmasters2015/EtchedChampion.java
index e93bb7ee7b..a219d504e8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EtchedChampion.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EtchedChampion.java
@@ -37,7 +37,7 @@ public class EtchedChampion extends mage.sets.scarsofmirrodin.EtchedChampion {
 
     public EtchedChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EtchedMonstrosity.java b/Mage.Sets/src/mage/sets/modernmasters2015/EtchedMonstrosity.java
index 0780b1dfa5..f330973cac 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EtchedMonstrosity.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EtchedMonstrosity.java
@@ -38,7 +38,7 @@ public class EtchedMonstrosity extends mage.sets.newphyrexia.EtchedMonstrosity {
 
     public EtchedMonstrosity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EtchedOracle.java b/Mage.Sets/src/mage/sets/modernmasters2015/EtchedOracle.java
index 2eae2e1aca..36d677a33d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EtchedOracle.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EtchedOracle.java
@@ -37,7 +37,7 @@ public class EtchedOracle extends mage.sets.planechase.EtchedOracle {
 
     public EtchedOracle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EthercasteKnight.java b/Mage.Sets/src/mage/sets/modernmasters2015/EthercasteKnight.java
index 42b131da35..9911efdeed 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EthercasteKnight.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EthercasteKnight.java
@@ -38,7 +38,7 @@ public class EthercasteKnight extends mage.sets.alarareborn.EthercasteKnight {
 
     public EthercasteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EverflowingChalice.java b/Mage.Sets/src/mage/sets/modernmasters2015/EverflowingChalice.java
index 52fbfa7609..3a273ecdc1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EverflowingChalice.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EverflowingChalice.java
@@ -37,7 +37,7 @@ public class EverflowingChalice extends mage.sets.worldwake.EverflowingChalice {
 
     public EverflowingChalice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EvolvingWilds.java b/Mage.Sets/src/mage/sets/modernmasters2015/EvolvingWilds.java
index 6c4b1e78b0..56e062efd8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ExpeditionMap.java b/Mage.Sets/src/mage/sets/modernmasters2015/ExpeditionMap.java
index 34b62929b7..5cbe5d491f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ExpeditionMap.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ExpeditionMap.java
@@ -38,7 +38,7 @@ public class ExpeditionMap extends mage.sets.zendikar.ExpeditionMap {
 
     public ExpeditionMap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/EyeOfUgin.java b/Mage.Sets/src/mage/sets/modernmasters2015/EyeOfUgin.java
index 43c1e022bd..e4d310e5cc 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/EyeOfUgin.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/EyeOfUgin.java
@@ -38,7 +38,7 @@ public class EyeOfUgin extends mage.sets.worldwake.EyeOfUgin {
 
     public EyeOfUgin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/FaerieMechanist.java b/Mage.Sets/src/mage/sets/modernmasters2015/FaerieMechanist.java
index 7bce4d1a26..73d1088f6a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/FaerieMechanist.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/FaerieMechanist.java
@@ -37,7 +37,7 @@ public class FaerieMechanist extends mage.sets.conflux.FaerieMechanist {
 
     public FaerieMechanist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/FieryFall.java b/Mage.Sets/src/mage/sets/modernmasters2015/FieryFall.java
index 0c28a75a1c..6a052a5755 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/FieryFall.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/FieryFall.java
@@ -37,7 +37,7 @@ public class FieryFall extends mage.sets.conflux.FieryFall {
 
     public FieryFall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Flashfreeze.java b/Mage.Sets/src/mage/sets/modernmasters2015/Flashfreeze.java
index 9cb73c528a..964b515729 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Flashfreeze.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Flashfreeze.java
@@ -37,7 +37,7 @@ public class Flashfreeze extends mage.sets.tenthedition.Flashfreeze {
 
     public Flashfreeze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/FlayerHusk.java b/Mage.Sets/src/mage/sets/modernmasters2015/FlayerHusk.java
index 4dabe7a330..65b5cdd7e8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/FlayerHusk.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/FlayerHusk.java
@@ -37,7 +37,7 @@ public class FlayerHusk extends mage.sets.mirrodinbesieged.FlayerHusk {
 
     public FlayerHusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Fortify.java b/Mage.Sets/src/mage/sets/modernmasters2015/Fortify.java
index 976f6a84cc..a80653dd71 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Fortify.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Fortify.java
@@ -37,7 +37,7 @@ public class Fortify extends mage.sets.timespiral.Fortify {
 
     public Fortify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Frogmite.java b/Mage.Sets/src/mage/sets/modernmasters2015/Frogmite.java
index 33b9e0a361..d83d1c2af7 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Frogmite.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Frogmite.java
@@ -37,7 +37,7 @@ public class Frogmite extends mage.sets.elspethvstezzeret.Frogmite {
 
     public Frogmite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/FulminatorMage.java b/Mage.Sets/src/mage/sets/modernmasters2015/FulminatorMage.java
index b82e77ce8b..9396debdfa 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/FulminatorMage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/FulminatorMage.java
@@ -37,7 +37,7 @@ public class FulminatorMage extends mage.sets.shadowmoor.FulminatorMage {
 
     public FulminatorMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/sets/modernmasters2015/GhostCouncilOfOrzhova.java
index 9145113afa..b1168b4020 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GhostCouncilOfOrzhova.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GhostCouncilOfOrzhova.java
@@ -37,7 +37,7 @@ public class GhostCouncilOfOrzhova extends mage.sets.guildpact.GhostCouncilOfOrz
 
     public GhostCouncilOfOrzhova(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GhostlyChangeling.java b/Mage.Sets/src/mage/sets/modernmasters2015/GhostlyChangeling.java
index 76aa637456..1b27d547c6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GhostlyChangeling.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GhostlyChangeling.java
@@ -38,7 +38,7 @@ public class GhostlyChangeling extends mage.sets.lorwyn.GhostlyChangeling {
 
     public GhostlyChangeling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GlassdustHulk.java b/Mage.Sets/src/mage/sets/modernmasters2015/GlassdustHulk.java
index 46be98e424..de1b500e11 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GlassdustHulk.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GlassdustHulk.java
@@ -38,7 +38,7 @@ public class GlassdustHulk extends mage.sets.alarareborn.GlassdustHulk {
 
     public GlassdustHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GlintHawkIdol.java b/Mage.Sets/src/mage/sets/modernmasters2015/GlintHawkIdol.java
index 578b7c550a..a436d905ec 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GlintHawkIdol.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GlintHawkIdol.java
@@ -37,7 +37,7 @@ public class GlintHawkIdol extends mage.sets.scarsofmirrodin.GlintHawkIdol {
 
     public GlintHawkIdol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GnarlidPack.java b/Mage.Sets/src/mage/sets/modernmasters2015/GnarlidPack.java
index 254d2b5c66..fa5f13914c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GnarlidPack.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GnarlidPack.java
@@ -37,7 +37,7 @@ public class GnarlidPack extends mage.sets.worldwake.GnarlidPack {
 
     public GnarlidPack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GoblinFireslinger.java b/Mage.Sets/src/mage/sets/modernmasters2015/GoblinFireslinger.java
index b8a613031c..ba196e3584 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GoblinFireslinger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GoblinFireslinger.java
@@ -37,7 +37,7 @@ public class GoblinFireslinger extends mage.sets.magic2012.GoblinFireslinger {
 
     public GoblinFireslinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/modernmasters2015/GoblinWarPaint.java
index a884e9977d..124e41999b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GoblinWarPaint.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GoblinWarPaint.java
@@ -37,7 +37,7 @@ public class GoblinWarPaint extends mage.sets.zendikar.GoblinWarPaint {
 
     public GoblinWarPaint(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/modernmasters2015/GolgariRotFarm.java
index da9d839727..bfc80dbcf1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GolgariRotFarm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GolgariRotFarm.java
@@ -38,7 +38,7 @@ public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
 
     public GolgariRotFarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GorehornMinotaurs.java b/Mage.Sets/src/mage/sets/modernmasters2015/GorehornMinotaurs.java
index 832a2afb9c..cf4cf041a6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GorehornMinotaurs.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GorehornMinotaurs.java
@@ -37,7 +37,7 @@ public class GorehornMinotaurs extends mage.sets.magic2012.GorehornMinotaurs {
 
     public GorehornMinotaurs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GrimAffliction.java b/Mage.Sets/src/mage/sets/modernmasters2015/GrimAffliction.java
index f1a4dd2830..a78aa5fe20 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GrimAffliction.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GrimAffliction.java
@@ -37,7 +37,7 @@ public class GrimAffliction extends mage.sets.newphyrexia.GrimAffliction {
 
     public GrimAffliction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GruulTurf.java b/Mage.Sets/src/mage/sets/modernmasters2015/GruulTurf.java
index 5c3f627e56..3c649ac01a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GruulTurf.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GruulTurf.java
@@ -38,7 +38,7 @@ public class GruulTurf extends mage.sets.planechase.GruulTurf {
 
     public GruulTurf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Guile.java b/Mage.Sets/src/mage/sets/modernmasters2015/Guile.java
index 23b27a6dd8..a9fafc2126 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Guile.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Guile.java
@@ -37,7 +37,7 @@ public class Guile extends mage.sets.lorwyn.Guile {
 
     public Guile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GustSkimmer.java b/Mage.Sets/src/mage/sets/modernmasters2015/GustSkimmer.java
index 7ba7cec4ef..ff8f104830 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GustSkimmer.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GustSkimmer.java
@@ -37,7 +37,7 @@ public class GustSkimmer extends mage.sets.mirrodinbesieged.GustSkimmer {
 
     public GustSkimmer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/GutShot.java b/Mage.Sets/src/mage/sets/modernmasters2015/GutShot.java
index 5585b02fcf..f0d84e566b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/GutShot.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/GutShot.java
@@ -38,7 +38,7 @@ public class GutShot extends mage.sets.newphyrexia.GutShot {
 
     public GutShot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/HearthfireHobgoblin.java b/Mage.Sets/src/mage/sets/modernmasters2015/HearthfireHobgoblin.java
index 4bd61d7f05..70d37e1b2e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/HearthfireHobgoblin.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/HearthfireHobgoblin.java
@@ -37,7 +37,7 @@ public class HearthfireHobgoblin extends mage.sets.eventide.HearthfireHobgoblin
 
     public HearthfireHobgoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/HeliumSquirter.java b/Mage.Sets/src/mage/sets/modernmasters2015/HeliumSquirter.java
index d5115b189f..eac3dd506a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/HeliumSquirter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/HeliumSquirter.java
@@ -37,7 +37,7 @@ public class HeliumSquirter extends mage.sets.dissension.HeliumSquirter {
 
     public HeliumSquirter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/HellkiteCharger.java b/Mage.Sets/src/mage/sets/modernmasters2015/HellkiteCharger.java
index ab24b15ca9..505edb5bd2 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/HellkiteCharger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/HellkiteCharger.java
@@ -37,7 +37,7 @@ public class HellkiteCharger extends mage.sets.zendikar.HellkiteCharger {
 
     public HellkiteCharger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/HikariTwilightGuardian.java b/Mage.Sets/src/mage/sets/modernmasters2015/HikariTwilightGuardian.java
index 6eaa95a679..46d05a7526 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/HikariTwilightGuardian.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/HikariTwilightGuardian.java
@@ -38,7 +38,7 @@ public class HikariTwilightGuardian extends mage.sets.championsofkamigawa.Hikari
 
     public HikariTwilightGuardian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/HordeOfNotions.java b/Mage.Sets/src/mage/sets/modernmasters2015/HordeOfNotions.java
index e3a2832548..e1c12797a3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/HordeOfNotions.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/HordeOfNotions.java
@@ -37,7 +37,7 @@ public class HordeOfNotions extends mage.sets.lorwyn.HordeOfNotions {
 
     public HordeOfNotions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/HurkylsRecall.java b/Mage.Sets/src/mage/sets/modernmasters2015/HurkylsRecall.java
index 62546009ef..a442de60f3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/HurkylsRecall.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/HurkylsRecall.java
@@ -37,7 +37,7 @@ public class HurkylsRecall extends mage.sets.fifthedition.HurkylsRecall {
 
     public HurkylsRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/IncandescentSoulstoke.java b/Mage.Sets/src/mage/sets/modernmasters2015/IncandescentSoulstoke.java
index cb883655ba..1819de8b78 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/IncandescentSoulstoke.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/IncandescentSoulstoke.java
@@ -38,7 +38,7 @@ public class IncandescentSoulstoke extends mage.sets.lorwyn.IncandescentSoulstok
 
     public IncandescentSoulstoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/IndomitableArchangel.java b/Mage.Sets/src/mage/sets/modernmasters2015/IndomitableArchangel.java
index 61cf68fd8a..76d618344a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/IndomitableArchangel.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/IndomitableArchangel.java
@@ -38,7 +38,7 @@ public class IndomitableArchangel extends mage.sets.scarsofmirrodin.IndomitableA
 
     public IndomitableArchangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/InexorableTide.java b/Mage.Sets/src/mage/sets/modernmasters2015/InexorableTide.java
index 23372e7934..5c9985de88 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/InexorableTide.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/InexorableTide.java
@@ -37,7 +37,7 @@ public class InexorableTide extends mage.sets.scarsofmirrodin.InexorableTide {
 
     public InexorableTide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/InnerFlameIgniter.java b/Mage.Sets/src/mage/sets/modernmasters2015/InnerFlameIgniter.java
index 5fe4dcac8c..2c358bd1a5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/InnerFlameIgniter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/InnerFlameIgniter.java
@@ -38,7 +38,7 @@ public class InnerFlameIgniter extends mage.sets.lorwyn.InnerFlameIgniter {
 
     public InnerFlameIgniter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/InstillInfection.java b/Mage.Sets/src/mage/sets/modernmasters2015/InstillInfection.java
index 652a5319ac..eff8f8206e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/InstillInfection.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/InstillInfection.java
@@ -37,7 +37,7 @@ public class InstillInfection extends mage.sets.scarsofmirrodin.InstillInfection
 
     public InstillInfection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/sets/modernmasters2015/IonaShieldOfEmeria.java
index eff1b8f70b..927af1e418 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/IonaShieldOfEmeria.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/IonaShieldOfEmeria.java
@@ -37,7 +37,7 @@ public class IonaShieldOfEmeria extends mage.sets.zendikar.IonaShieldOfEmeria {
 
     public IonaShieldOfEmeria(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/modernmasters2015/IzzetBoilerworks.java
index dda306ee08..4120eb3630 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/IzzetBoilerworks.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/IzzetBoilerworks.java
@@ -38,7 +38,7 @@ public class IzzetBoilerworks extends mage.sets.guildpact.IzzetBoilerworks {
 
     public IzzetBoilerworks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KamiOfAncientLaw.java b/Mage.Sets/src/mage/sets/modernmasters2015/KamiOfAncientLaw.java
index 95bb237f01..9bd99b4b12 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KamiOfAncientLaw.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KamiOfAncientLaw.java
@@ -37,7 +37,7 @@ public class KamiOfAncientLaw extends mage.sets.championsofkamigawa.KamiOfAncien
 
     public KamiOfAncientLaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KarnLiberated.java b/Mage.Sets/src/mage/sets/modernmasters2015/KarnLiberated.java
index c418b49d2b..34dfa63f8d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KarnLiberated.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KarnLiberated.java
@@ -37,7 +37,7 @@ public class KarnLiberated extends mage.sets.newphyrexia.KarnLiberated {
 
     public KarnLiberated(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KavuPrimarch.java b/Mage.Sets/src/mage/sets/modernmasters2015/KavuPrimarch.java
index 18df35ab81..4d235d3d1e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KavuPrimarch.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KavuPrimarch.java
@@ -37,7 +37,7 @@ public class KavuPrimarch extends mage.sets.futuresight.KavuPrimarch {
 
     public KavuPrimarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/sets/modernmasters2015/KikiJikiMirrorBreaker.java
index 20ccef7bc8..3dc1eef7a0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KikiJikiMirrorBreaker.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KikiJikiMirrorBreaker.java
@@ -38,7 +38,7 @@ public class KikiJikiMirrorBreaker extends mage.sets.championsofkamigawa.KikiJik
 
     public KikiJikiMirrorBreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Kitesail.java b/Mage.Sets/src/mage/sets/modernmasters2015/Kitesail.java
index b668866689..16cfa09ab6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Kitesail.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Kitesail.java
@@ -37,7 +37,7 @@ public class Kitesail extends mage.sets.worldwake.Kitesail {
 
     public Kitesail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KorDuelist.java b/Mage.Sets/src/mage/sets/modernmasters2015/KorDuelist.java
index 99f57b4f85..435ec9eec0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KorDuelist.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KorDuelist.java
@@ -37,7 +37,7 @@ public class KorDuelist extends mage.sets.zendikar.KorDuelist {
 
     public KorDuelist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KozilekButcherOfTruth.java b/Mage.Sets/src/mage/sets/modernmasters2015/KozilekButcherOfTruth.java
index 839f47fac1..7c1a4be289 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KozilekButcherOfTruth.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KozilekButcherOfTruth.java
@@ -37,7 +37,7 @@ public class KozilekButcherOfTruth extends mage.sets.riseoftheeldrazi.KozilekBut
 
     public KozilekButcherOfTruth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/KozileksPredator.java b/Mage.Sets/src/mage/sets/modernmasters2015/KozileksPredator.java
index 221404d3a4..f9d6a97c2b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/KozileksPredator.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/KozileksPredator.java
@@ -37,7 +37,7 @@ public class KozileksPredator extends mage.sets.riseoftheeldrazi.KozileksPredato
 
     public KozileksPredator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/LeylineOfSanctity.java b/Mage.Sets/src/mage/sets/modernmasters2015/LeylineOfSanctity.java
index 56098a849f..bd061b9502 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/LeylineOfSanctity.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/LeylineOfSanctity.java
@@ -37,7 +37,7 @@ public class LeylineOfSanctity extends mage.sets.magic2011.LeylineOfSanctity {
 
     public LeylineOfSanctity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/LightningBolt.java b/Mage.Sets/src/mage/sets/modernmasters2015/LightningBolt.java
index 64e86bb13f..7e3dbbf530 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/LightningBolt.java
@@ -38,7 +38,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneGolem.java b/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneGolem.java
index f58dc9669c..65a15559eb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneGolem.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneGolem.java
@@ -37,7 +37,7 @@ public class LodestoneGolem extends mage.sets.worldwake.LodestoneGolem {
 
     public LodestoneGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneMyr.java b/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneMyr.java
index 262cd94bdb..1f88239148 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneMyr.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/LodestoneMyr.java
@@ -37,7 +37,7 @@ public class LodestoneMyr extends mage.sets.planechase.LodestoneMyr {
 
     public LodestoneMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/LongForgottenGohei.java b/Mage.Sets/src/mage/sets/modernmasters2015/LongForgottenGohei.java
index 2c052d7463..af17330ceb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/LongForgottenGohei.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/LongForgottenGohei.java
@@ -37,7 +37,7 @@ public class LongForgottenGohei extends mage.sets.championsofkamigawa.LongForgot
 
     public LongForgottenGohei(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/LorescaleCoatl.java b/Mage.Sets/src/mage/sets/modernmasters2015/LorescaleCoatl.java
index aac9053ee8..9f4ddaf5e9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/LorescaleCoatl.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/LorescaleCoatl.java
@@ -37,7 +37,7 @@ public class LorescaleCoatl extends mage.sets.alarareborn.LorescaleCoatl {
 
     public LorescaleCoatl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ManaLeak.java b/Mage.Sets/src/mage/sets/modernmasters2015/ManaLeak.java
index 6ed88be7fb..282b80e792 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MatcaRioters.java b/Mage.Sets/src/mage/sets/modernmasters2015/MatcaRioters.java
index 55417d1b6e..9e1c1d302a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MatcaRioters.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MatcaRioters.java
@@ -37,7 +37,7 @@ public class MatcaRioters extends mage.sets.conflux.MatcaRioters {
 
     public MatcaRioters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MidnightBanshee.java b/Mage.Sets/src/mage/sets/modernmasters2015/MidnightBanshee.java
index c531c21452..27623c0902 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MidnightBanshee.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MidnightBanshee.java
@@ -37,7 +37,7 @@ public class MidnightBanshee extends mage.sets.shadowmoor.MidnightBanshee {
 
     public MidnightBanshee(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MightyLeap.java b/Mage.Sets/src/mage/sets/modernmasters2015/MightyLeap.java
index 99dbc07c88..13cdb4988a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MightyLeap.java
@@ -37,7 +37,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MirranCrusader.java b/Mage.Sets/src/mage/sets/modernmasters2015/MirranCrusader.java
index 91e9c007f6..47e4d5165a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MirranCrusader.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MirranCrusader.java
@@ -37,7 +37,7 @@ public class MirranCrusader extends mage.sets.mirrodinbesieged.MirranCrusader {
 
     public MirranCrusader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MirrorEntity.java b/Mage.Sets/src/mage/sets/modernmasters2015/MirrorEntity.java
index 42f36405c3..5a69dd95ac 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MirrorEntity.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MirrorEntity.java
@@ -37,7 +37,7 @@ public class MirrorEntity extends mage.sets.lorwyn.MirrorEntity {
 
     public MirrorEntity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MoonlitStrider.java b/Mage.Sets/src/mage/sets/modernmasters2015/MoonlitStrider.java
index be0ab96e72..5fec8fc7cc 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MoonlitStrider.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MoonlitStrider.java
@@ -37,7 +37,7 @@ public class MoonlitStrider extends mage.sets.betrayersofkamigawa.MoonlitStrider
 
     public MoonlitStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Mortarpod.java b/Mage.Sets/src/mage/sets/modernmasters2015/Mortarpod.java
index 58920a055a..33281a27eb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Mortarpod.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Mortarpod.java
@@ -37,7 +37,7 @@ public class Mortarpod extends mage.sets.mirrodinbesieged.Mortarpod {
 
     public Mortarpod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MoxOpal.java b/Mage.Sets/src/mage/sets/modernmasters2015/MoxOpal.java
index c70553710e..38fd4e57c1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MoxOpal.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MoxOpal.java
@@ -37,7 +37,7 @@ public class MoxOpal extends mage.sets.scarsofmirrodin.MoxOpal {
 
     public MoxOpal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Mulldrifter.java b/Mage.Sets/src/mage/sets/modernmasters2015/Mulldrifter.java
index 1dd73f3e69..f0ee3eab19 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Mulldrifter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Mulldrifter.java
@@ -38,7 +38,7 @@ public class Mulldrifter extends mage.sets.commander.Mulldrifter {
 
     public Mulldrifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MutagenicGrowth.java b/Mage.Sets/src/mage/sets/modernmasters2015/MutagenicGrowth.java
index efc88044e1..6e16acb211 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MutagenicGrowth.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MutagenicGrowth.java
@@ -38,7 +38,7 @@ public class MutagenicGrowth extends mage.sets.newphyrexia.MutagenicGrowth {
 
     public MutagenicGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MyrEnforcer.java b/Mage.Sets/src/mage/sets/modernmasters2015/MyrEnforcer.java
index 16ef115024..1c8bb0d4c1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MyrEnforcer.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MyrEnforcer.java
@@ -37,7 +37,7 @@ public class MyrEnforcer extends mage.sets.planechase.MyrEnforcer {
 
     public MyrEnforcer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Myrsmith.java b/Mage.Sets/src/mage/sets/modernmasters2015/Myrsmith.java
index 6f2dc48e8b..b71f7d134f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Myrsmith.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Myrsmith.java
@@ -37,7 +37,7 @@ public class Myrsmith extends mage.sets.scarsofmirrodin.Myrsmith {
 
     public Myrsmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/MysticSnake.java b/Mage.Sets/src/mage/sets/modernmasters2015/MysticSnake.java
index 1799203a96..3ea2cb7e2a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/MysticSnake.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/MysticSnake.java
@@ -37,7 +37,7 @@ public class MysticSnake extends mage.sets.apocalypse.MysticSnake {
 
     public MysticSnake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/NamelessInversion.java b/Mage.Sets/src/mage/sets/modernmasters2015/NamelessInversion.java
index 4f3f1835b2..1d1198ef3d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/NamelessInversion.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/NamelessInversion.java
@@ -37,7 +37,7 @@ public class NamelessInversion extends mage.sets.lorwyn.NamelessInversion {
 
     public NamelessInversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Narcolepsy.java b/Mage.Sets/src/mage/sets/modernmasters2015/Narcolepsy.java
index 11dc71effe..7cac7ba736 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Narcolepsy.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Narcolepsy.java
@@ -37,7 +37,7 @@ public class Narcolepsy extends mage.sets.riseoftheeldrazi.Narcolepsy {
 
     public Narcolepsy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Necrogenesis.java b/Mage.Sets/src/mage/sets/modernmasters2015/Necrogenesis.java
index b3692d1916..bb28647c1f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Necrogenesis.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Necrogenesis.java
@@ -37,7 +37,7 @@ public class Necrogenesis extends mage.sets.shardsofalara.Necrogenesis {
 
     public Necrogenesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Necroskitter.java b/Mage.Sets/src/mage/sets/modernmasters2015/Necroskitter.java
index 7971b6547e..d561e1feba 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Necroskitter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Necroskitter.java
@@ -37,7 +37,7 @@ public class Necroskitter extends mage.sets.eventide.Necroskitter {
 
     public Necroskitter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/NestInvader.java b/Mage.Sets/src/mage/sets/modernmasters2015/NestInvader.java
index c4aa6e8177..ffdc072315 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/NestInvader.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/NestInvader.java
@@ -37,7 +37,7 @@ public class NestInvader extends mage.sets.riseoftheeldrazi.NestInvader {
 
     public NestInvader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/modernmasters2015/NivMizzetTheFiremind.java
index 1dc1909070..eb13e61f2d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/NivMizzetTheFiremind.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/NivMizzetTheFiremind.java
@@ -37,7 +37,7 @@ public class NivMizzetTheFiremind extends mage.sets.guildpact.NivMizzetTheFiremi
 
     public NivMizzetTheFiremind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/NobilisOfWar.java b/Mage.Sets/src/mage/sets/modernmasters2015/NobilisOfWar.java
index 488813c453..ada1d0aa56 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/NobilisOfWar.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/NobilisOfWar.java
@@ -37,7 +37,7 @@ public class NobilisOfWar extends mage.sets.eventide.NobilisOfWar {
 
     public NobilisOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/NobleHierarch.java b/Mage.Sets/src/mage/sets/modernmasters2015/NobleHierarch.java
index 216654f22a..5ef028fe54 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/NobleHierarch.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/NobleHierarch.java
@@ -37,7 +37,7 @@ public class NobleHierarch extends mage.sets.conflux.NobleHierarch {
 
     public NobleHierarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/NovijenSages.java b/Mage.Sets/src/mage/sets/modernmasters2015/NovijenSages.java
index fe990fce24..96ba6c5b13 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/NovijenSages.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/NovijenSages.java
@@ -38,7 +38,7 @@ public class NovijenSages extends mage.sets.dissension.NovijenSages {
 
     public NovijenSages(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/OblivionRing.java b/Mage.Sets/src/mage/sets/modernmasters2015/OblivionRing.java
index 32b11365b1..37a5da8e5e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/OblivionRing.java
@@ -38,7 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/OrzhovBasilica.java b/Mage.Sets/src/mage/sets/modernmasters2015/OrzhovBasilica.java
index 431d1ba2ae..aefedfcee4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/OrzhovBasilica.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/OrzhovBasilica.java
@@ -38,7 +38,7 @@ public class OrzhovBasilica extends mage.sets.guildpact.OrzhovBasilica {
 
     public OrzhovBasilica(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/modernmasters2015/OtherworldlyJourney.java
index 45cd1a9cb9..3a4b5dc9d7 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/OtherworldlyJourney.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/OtherworldlyJourney.java
@@ -38,7 +38,7 @@ public class OtherworldlyJourney extends mage.sets.championsofkamigawa.Otherworl
 
     public OtherworldlyJourney(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Overwhelm.java b/Mage.Sets/src/mage/sets/modernmasters2015/Overwhelm.java
index 6f7000d49f..9b1069b104 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Overwhelm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Overwhelm.java
@@ -37,7 +37,7 @@ public class Overwhelm extends mage.sets.ravnica.Overwhelm {
 
     public Overwhelm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/OverwhelmingStampede.java b/Mage.Sets/src/mage/sets/modernmasters2015/OverwhelmingStampede.java
index 5f7b7c21fc..92ec114bd9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/OverwhelmingStampede.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/OverwhelmingStampede.java
@@ -37,7 +37,7 @@ public class OverwhelmingStampede extends mage.sets.magic2011.OverwhelmingStampe
 
     public OverwhelmingStampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PelakkaWurm.java b/Mage.Sets/src/mage/sets/modernmasters2015/PelakkaWurm.java
index 922338fc42..f3acbe70ea 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PelakkaWurm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PelakkaWurm.java
@@ -37,7 +37,7 @@ public class PelakkaWurm extends mage.sets.riseoftheeldrazi.PelakkaWurm {
 
     public PelakkaWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/sets/modernmasters2015/PilloryOfTheSleepless.java
index 324a68c7a1..7efd644a64 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PilloryOfTheSleepless.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PilloryOfTheSleepless.java
@@ -38,7 +38,7 @@ public class PilloryOfTheSleepless extends mage.sets.guildpact.PilloryOfTheSleep
 
     public PilloryOfTheSleepless(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PlaguedRusalka.java b/Mage.Sets/src/mage/sets/modernmasters2015/PlaguedRusalka.java
index c9c24cc0ef..2f02dfb55e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PlaguedRusalka.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PlaguedRusalka.java
@@ -38,7 +38,7 @@ public class PlaguedRusalka extends mage.sets.guildpact.PlaguedRusalka {
 
     public PlaguedRusalka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PlaxcasterFrogling.java b/Mage.Sets/src/mage/sets/modernmasters2015/PlaxcasterFrogling.java
index a639c66062..0c30c0d1c0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PlaxcasterFrogling.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PlaxcasterFrogling.java
@@ -37,7 +37,7 @@ public class PlaxcasterFrogling extends mage.sets.dissension.PlaxcasterFrogling
 
     public PlaxcasterFrogling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Plummet.java b/Mage.Sets/src/mage/sets/modernmasters2015/Plummet.java
index da48237052..0e887f84d5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Plummet.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Plummet.java
@@ -37,7 +37,7 @@ public class Plummet extends mage.sets.magic2011.Plummet {
 
     public Plummet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PrecursorGolem.java b/Mage.Sets/src/mage/sets/modernmasters2015/PrecursorGolem.java
index 3704f491c5..1098354be5 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PrecursorGolem.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PrecursorGolem.java
@@ -37,7 +37,7 @@ public class PrecursorGolem extends mage.sets.scarsofmirrodin.PrecursorGolem {
 
     public PrecursorGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PrimevalTitan.java b/Mage.Sets/src/mage/sets/modernmasters2015/PrimevalTitan.java
index b809e0014e..15076a896b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PrimevalTitan.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PrimevalTitan.java
@@ -37,7 +37,7 @@ public class PrimevalTitan extends mage.sets.magic2011.PrimevalTitan {
 
     public PrimevalTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ProfaneCommand.java b/Mage.Sets/src/mage/sets/modernmasters2015/ProfaneCommand.java
index ec9d4c2c9e..09f047ef41 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ProfaneCommand.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ProfaneCommand.java
@@ -37,7 +37,7 @@ public class ProfaneCommand extends mage.sets.commander2014.ProfaneCommand {
 
     public ProfaneCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/PuppeteerClique.java b/Mage.Sets/src/mage/sets/modernmasters2015/PuppeteerClique.java
index a9b10929eb..c88bf55e76 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/PuppeteerClique.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/PuppeteerClique.java
@@ -37,7 +37,7 @@ public class PuppeteerClique extends mage.sets.shadowmoor.PuppeteerClique {
 
     public PuppeteerClique(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Qumulox.java b/Mage.Sets/src/mage/sets/modernmasters2015/Qumulox.java
index ea0a23cfaa..654726a7d7 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Qumulox.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Qumulox.java
@@ -37,7 +37,7 @@ public class Qumulox extends mage.sets.elspethvstezzeret.Qumulox {
 
     public Qumulox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/modernmasters2015/RaiseTheAlarm.java
index 341d3e00b8..6adcf2cb44 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RaiseTheAlarm.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RaiseTheAlarm.java
@@ -37,7 +37,7 @@ public class RaiseTheAlarm extends mage.sets.mirrodin.RaiseTheAlarm {
 
     public RaiseTheAlarm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/modernmasters2015/RakdosCarnarium.java
index bb3368b44d..d95f15e5d2 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RakdosCarnarium.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RakdosCarnarium.java
@@ -38,7 +38,7 @@ public class RakdosCarnarium extends mage.sets.dissension.RakdosCarnarium {
 
     public RakdosCarnarium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RampantGrowth.java b/Mage.Sets/src/mage/sets/modernmasters2015/RampantGrowth.java
index af3a7d1352..e2f9753dc0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/modernmasters2015/ReassemblingSkeleton.java
index f3a2b4e079..7539d4b9d0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ReassemblingSkeleton.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ReassemblingSkeleton.java
@@ -37,7 +37,7 @@ public class ReassemblingSkeleton extends mage.sets.magic2011.ReassemblingSkelet
 
     public ReassemblingSkeleton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Remand.java b/Mage.Sets/src/mage/sets/modernmasters2015/Remand.java
index 5da3b633b9..9226524941 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Remand.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Remand.java
@@ -37,7 +37,7 @@ public class Remand extends mage.sets.ravnica.Remand {
 
     public Remand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Repeal.java b/Mage.Sets/src/mage/sets/modernmasters2015/Repeal.java
index 74d527e5fd..d600d9cb9f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Repeal.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Repeal.java
@@ -37,7 +37,7 @@ public class Repeal extends mage.sets.guildpact.Repeal {
 
     public Repeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RestlessApparition.java b/Mage.Sets/src/mage/sets/modernmasters2015/RestlessApparition.java
index fa8e873edc..9f471f5cd8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RestlessApparition.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RestlessApparition.java
@@ -37,7 +37,7 @@ public class RestlessApparition extends mage.sets.eventide.RestlessApparition {
 
     public RestlessApparition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RootKinAlly.java b/Mage.Sets/src/mage/sets/modernmasters2015/RootKinAlly.java
index 0e8c93f711..52aaea042b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RootKinAlly.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RootKinAlly.java
@@ -37,7 +37,7 @@ public class RootKinAlly extends mage.sets.ravnica.RootKinAlly {
 
     public RootKinAlly(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RunedServitor.java b/Mage.Sets/src/mage/sets/modernmasters2015/RunedServitor.java
index 63fc5a6626..596280ed95 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RunedServitor.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RunedServitor.java
@@ -38,7 +38,7 @@ public class RunedServitor extends mage.sets.riseoftheeldrazi.RunedServitor {
 
     public RunedServitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/RustedRelic.java b/Mage.Sets/src/mage/sets/modernmasters2015/RustedRelic.java
index 75a16676c0..87c53f10da 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/RustedRelic.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/RustedRelic.java
@@ -38,7 +38,7 @@ public class RustedRelic extends mage.sets.scarsofmirrodin.RustedRelic {
 
     public RustedRelic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SavageTwister.java b/Mage.Sets/src/mage/sets/modernmasters2015/SavageTwister.java
index 456d1b2a88..bf66fcf6ef 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SavageTwister.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SavageTwister.java
@@ -37,7 +37,7 @@ public class SavageTwister extends mage.sets.commander2013.SavageTwister {
 
     public SavageTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ScatterTheSeeds.java b/Mage.Sets/src/mage/sets/modernmasters2015/ScatterTheSeeds.java
index dfd1c8f944..b58a2c19df 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ScatterTheSeeds.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ScatterTheSeeds.java
@@ -37,7 +37,7 @@ public class ScatterTheSeeds extends mage.sets.ravnica.ScatterTheSeeds {
 
     public ScatterTheSeeds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ScavengerDrake.java b/Mage.Sets/src/mage/sets/modernmasters2015/ScavengerDrake.java
index 3f556d19e0..bfde700676 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ScavengerDrake.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ScavengerDrake.java
@@ -37,7 +37,7 @@ public class ScavengerDrake extends mage.sets.shardsofalara.ScavengerDrake {
 
     public ScavengerDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ScionOfTheWild.java b/Mage.Sets/src/mage/sets/modernmasters2015/ScionOfTheWild.java
index c48b8ee9eb..cff72b2413 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ScionOfTheWild.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ScionOfTheWild.java
@@ -38,7 +38,7 @@ public class ScionOfTheWild extends mage.sets.ravnica.ScionOfTheWild {
 
     public ScionOfTheWild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ScuteMob.java b/Mage.Sets/src/mage/sets/modernmasters2015/ScuteMob.java
index f0cb995009..4f5eb01a62 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ScuteMob.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ScuteMob.java
@@ -37,7 +37,7 @@ public class ScuteMob extends mage.sets.zendikar.ScuteMob {
 
     public ScuteMob(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ScuttlingDeath.java b/Mage.Sets/src/mage/sets/modernmasters2015/ScuttlingDeath.java
index ffa3a41829..eb8a9153a1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ScuttlingDeath.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ScuttlingDeath.java
@@ -37,7 +37,7 @@ public class ScuttlingDeath extends mage.sets.championsofkamigawa.ScuttlingDeath
 
     public ScuttlingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaGuildmage.java b/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaGuildmage.java
index 904c75a78c..c1c9e09aad 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaGuildmage.java
@@ -37,7 +37,7 @@ public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
 
     public SelesnyaGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaSanctuary.java
index 8135172205..5fa56f5276 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaSanctuary.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SelesnyaSanctuary.java
@@ -38,7 +38,7 @@ public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
 
     public SelesnyaSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ShadowmageInfiltrator.java b/Mage.Sets/src/mage/sets/modernmasters2015/ShadowmageInfiltrator.java
index 26195a501b..eec9fed78a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ShadowmageInfiltrator.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ShadowmageInfiltrator.java
@@ -38,7 +38,7 @@ public class ShadowmageInfiltrator extends mage.sets.timeshifted.ShadowmageInfil
 
     public ShadowmageInfiltrator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ShrewdHatchling.java b/Mage.Sets/src/mage/sets/modernmasters2015/ShrewdHatchling.java
index 3eb1107891..31fb3aa217 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ShrewdHatchling.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ShrewdHatchling.java
@@ -37,7 +37,7 @@ public class ShrewdHatchling extends mage.sets.eventide.ShrewdHatchling {
 
     public ShrewdHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Shrivel.java b/Mage.Sets/src/mage/sets/modernmasters2015/Shrivel.java
index 4a8ce90474..cd475ca2ad 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Shrivel.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Shrivel.java
@@ -37,7 +37,7 @@ public class Shrivel extends mage.sets.riseoftheeldrazi.Shrivel {
 
     public Shrivel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SickleRipper.java b/Mage.Sets/src/mage/sets/modernmasters2015/SickleRipper.java
index 613dd4cacf..2fb0346b77 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SickleRipper.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SickleRipper.java
@@ -37,7 +37,7 @@ public class SickleRipper extends mage.sets.shadowmoor.SickleRipper {
 
     public SickleRipper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Sickleslicer.java b/Mage.Sets/src/mage/sets/modernmasters2015/Sickleslicer.java
index 075d394a8a..c475d2ab64 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Sickleslicer.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Sickleslicer.java
@@ -38,7 +38,7 @@ public class Sickleslicer extends mage.sets.newphyrexia.Sickleslicer {
 
     public Sickleslicer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SigilBlessing.java b/Mage.Sets/src/mage/sets/modernmasters2015/SigilBlessing.java
index 242b2d8304..d524a295c0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SigilBlessing.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SigilBlessing.java
@@ -38,7 +38,7 @@ public class SigilBlessing extends mage.sets.shardsofalara.SigilBlessing {
 
     public SigilBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SignInBlood.java b/Mage.Sets/src/mage/sets/modernmasters2015/SignInBlood.java
index f758d33b90..d3b01bd9d4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SignInBlood.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SignInBlood.java
@@ -37,7 +37,7 @@ public class SignInBlood extends mage.sets.magic2010.SignInBlood {
 
     public SignInBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SimicGrowthChamber.java b/Mage.Sets/src/mage/sets/modernmasters2015/SimicGrowthChamber.java
index c50c57abfc..0e51d630b8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SimicGrowthChamber.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SimicGrowthChamber.java
@@ -38,7 +38,7 @@ public class SimicGrowthChamber extends mage.sets.dissension.SimicGrowthChamber
 
     public SimicGrowthChamber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SimicInitiate.java b/Mage.Sets/src/mage/sets/modernmasters2015/SimicInitiate.java
index fd2258b580..0b5650a8a8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SimicInitiate.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SimicInitiate.java
@@ -37,7 +37,7 @@ public class SimicInitiate extends mage.sets.dissension.SimicInitiate {
 
     public SimicInitiate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SkarrganFirebird.java b/Mage.Sets/src/mage/sets/modernmasters2015/SkarrganFirebird.java
index 91fc86f73e..c68ea1b145 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SkarrganFirebird.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SkarrganFirebird.java
@@ -38,7 +38,7 @@ public class SkarrganFirebird extends mage.sets.heroesvsmonsters.SkarrganFirebir
 
     public SkarrganFirebird(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SkyhunterSkirmisher.java b/Mage.Sets/src/mage/sets/modernmasters2015/SkyhunterSkirmisher.java
index 981dd5d6de..c49f9ad4a7 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SkyhunterSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SkyhunterSkirmisher.java
@@ -38,7 +38,7 @@ public class SkyhunterSkirmisher extends mage.sets.tenthedition.SkyhunterSkirmis
 
     public SkyhunterSkirmisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SkyreachManta.java b/Mage.Sets/src/mage/sets/modernmasters2015/SkyreachManta.java
index 77d23138ca..7e4998b67f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SkyreachManta.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SkyreachManta.java
@@ -37,7 +37,7 @@ public class SkyreachManta extends mage.sets.fifthdawn.SkyreachManta {
 
     public SkyreachManta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SmashToSmithereens.java b/Mage.Sets/src/mage/sets/modernmasters2015/SmashToSmithereens.java
index 19db3527f9..1b79ce4a24 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SmashToSmithereens.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SmashToSmithereens.java
@@ -37,7 +37,7 @@ public class SmashToSmithereens extends mage.sets.shadowmoor.SmashToSmithereens
 
     public SmashToSmithereens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Smokebraider.java b/Mage.Sets/src/mage/sets/modernmasters2015/Smokebraider.java
index 9c7238e7d5..8ed71f2731 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Smokebraider.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Smokebraider.java
@@ -37,7 +37,7 @@ public class Smokebraider extends mage.sets.planechase.Smokebraider {
 
     public Smokebraider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SomberHoverguard.java b/Mage.Sets/src/mage/sets/modernmasters2015/SomberHoverguard.java
index 5bbfdb0aa8..3a3b696121 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SomberHoverguard.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SomberHoverguard.java
@@ -37,7 +37,7 @@ public class SomberHoverguard extends mage.sets.mirrodin.SomberHoverguard {
 
     public SomberHoverguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SoulbrightFlamekin.java b/Mage.Sets/src/mage/sets/modernmasters2015/SoulbrightFlamekin.java
index a0937b6e1f..433a9de0dd 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SoulbrightFlamekin.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SoulbrightFlamekin.java
@@ -37,7 +37,7 @@ public class SoulbrightFlamekin extends mage.sets.lorwyn.SoulbrightFlamekin {
 
     public SoulbrightFlamekin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SpectralProcession.java b/Mage.Sets/src/mage/sets/modernmasters2015/SpectralProcession.java
index 5661f8b542..03c4a7a4ec 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SpectralProcession.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SpectralProcession.java
@@ -37,7 +37,7 @@ public class SpectralProcession extends mage.sets.shadowmoor.SpectralProcession
 
     public SpectralProcession(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Spellskite.java b/Mage.Sets/src/mage/sets/modernmasters2015/Spellskite.java
index 05488d39fb..76a775772b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Spellskite.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Spellskite.java
@@ -37,7 +37,7 @@ public class Spellskite extends mage.sets.newphyrexia.Spellskite {
 
     public Spellskite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SphereOfTheSuns.java b/Mage.Sets/src/mage/sets/modernmasters2015/SphereOfTheSuns.java
index 32cf81e0d9..928a660b5f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SphereOfTheSuns.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SphereOfTheSuns.java
@@ -38,7 +38,7 @@ public class SphereOfTheSuns extends mage.sets.mirrodinbesieged.SphereOfTheSuns
 
     public SphereOfTheSuns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SpikeshotElder.java b/Mage.Sets/src/mage/sets/modernmasters2015/SpikeshotElder.java
index a89345711d..f823fd279d 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SpikeshotElder.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SpikeshotElder.java
@@ -37,7 +37,7 @@ public class SpikeshotElder extends mage.sets.scarsofmirrodin.SpikeshotElder {
 
     public SpikeshotElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Spitebellows.java b/Mage.Sets/src/mage/sets/modernmasters2015/Spitebellows.java
index 466c2c4bd2..d95ce5f53e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Spitebellows.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Spitebellows.java
@@ -37,7 +37,7 @@ public class Spitebellows extends mage.sets.commander.Spitebellows {
 
     public Spitebellows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SplinterTwin.java b/Mage.Sets/src/mage/sets/modernmasters2015/SplinterTwin.java
index 0b429e71dc..3ee9064f1b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SplinterTwin.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SplinterTwin.java
@@ -37,7 +37,7 @@ public class SplinterTwin extends mage.sets.riseoftheeldrazi.SplinterTwin {
 
     public SplinterTwin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SpreadTheSickness.java b/Mage.Sets/src/mage/sets/modernmasters2015/SpreadTheSickness.java
index 086d83d612..95335732ca 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SpreadTheSickness.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SpreadTheSickness.java
@@ -38,7 +38,7 @@ public class SpreadTheSickness extends mage.sets.mirrodinbesieged.SpreadTheSickn
 
     public SpreadTheSickness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SteadyProgress.java b/Mage.Sets/src/mage/sets/modernmasters2015/SteadyProgress.java
index f1f65c0e53..9de0a04dd9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SteadyProgress.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SteadyProgress.java
@@ -37,7 +37,7 @@ public class SteadyProgress extends mage.sets.scarsofmirrodin.SteadyProgress {
 
     public SteadyProgress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/StoicRebuttal.java b/Mage.Sets/src/mage/sets/modernmasters2015/StoicRebuttal.java
index 7ba4c162d1..51b5444d7e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/StoicRebuttal.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/StoicRebuttal.java
@@ -37,7 +37,7 @@ public class StoicRebuttal extends mage.sets.scarsofmirrodin.StoicRebuttal {
 
     public StoicRebuttal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/StormbloodBerserker.java b/Mage.Sets/src/mage/sets/modernmasters2015/StormbloodBerserker.java
index 3a82b36a6f..9bfc087cda 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/StormbloodBerserker.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/StormbloodBerserker.java
@@ -37,7 +37,7 @@ public class StormbloodBerserker extends mage.sets.magic2012.StormbloodBerserker
 
     public StormbloodBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SunderingVitae.java b/Mage.Sets/src/mage/sets/modernmasters2015/SunderingVitae.java
index a1f353005b..e2a7ca5164 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SunderingVitae.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SunderingVitae.java
@@ -37,7 +37,7 @@ public class SunderingVitae extends mage.sets.ravnica.SunderingVitae {
 
     public SunderingVitae(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Sunforger.java b/Mage.Sets/src/mage/sets/modernmasters2015/Sunforger.java
index 2475b0a364..1cad5b824b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Sunforger.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Sunforger.java
@@ -37,7 +37,7 @@ public class Sunforger extends mage.sets.ravnica.Sunforger {
 
     public Sunforger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Sunlance.java b/Mage.Sets/src/mage/sets/modernmasters2015/Sunlance.java
index fec141e44f..05737db4b0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Sunlance.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Sunlance.java
@@ -37,7 +37,7 @@ public class Sunlance extends mage.sets.planarchaos.Sunlance {
 
     public Sunlance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SunspearShikari.java b/Mage.Sets/src/mage/sets/modernmasters2015/SunspearShikari.java
index b96394b5d1..580cf480d8 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SunspearShikari.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SunspearShikari.java
@@ -37,7 +37,7 @@ public class SunspearShikari extends mage.sets.scarsofmirrodin.SunspearShikari {
 
     public SunspearShikari(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SurgicalExtraction.java b/Mage.Sets/src/mage/sets/modernmasters2015/SurgicalExtraction.java
index 62f377cf8a..14fdb87a6f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SurgicalExtraction.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SurgicalExtraction.java
@@ -37,7 +37,7 @@ public class SurgicalExtraction extends mage.sets.newphyrexia.SurgicalExtraction
 
     public SurgicalExtraction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SurrakarSpellblade.java b/Mage.Sets/src/mage/sets/modernmasters2015/SurrakarSpellblade.java
index 35869a478f..83896d4936 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SurrakarSpellblade.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SurrakarSpellblade.java
@@ -37,7 +37,7 @@ public class SurrakarSpellblade extends mage.sets.riseoftheeldrazi.SurrakarSpell
 
     public SurrakarSpellblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SwansOfBrynArgoll.java b/Mage.Sets/src/mage/sets/modernmasters2015/SwansOfBrynArgoll.java
index 1430b84507..84b56773f1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SwansOfBrynArgoll.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SwansOfBrynArgoll.java
@@ -37,7 +37,7 @@ public class SwansOfBrynArgoll extends mage.sets.shadowmoor.SwansOfBrynArgoll {
 
     public SwansOfBrynArgoll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/SylvanBounty.java b/Mage.Sets/src/mage/sets/modernmasters2015/SylvanBounty.java
index 9bed5a921e..eec7b665d4 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/SylvanBounty.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/SylvanBounty.java
@@ -37,7 +37,7 @@ public class SylvanBounty extends mage.sets.conflux.SylvanBounty {
 
     public SylvanBounty(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TajNarSwordsmith.java b/Mage.Sets/src/mage/sets/modernmasters2015/TajNarSwordsmith.java
index 7edaf17bb3..73d916ea28 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TajNarSwordsmith.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TajNarSwordsmith.java
@@ -37,7 +37,7 @@ public class TajNarSwordsmith extends mage.sets.mirrodin.TajNarSwordsmith {
 
     public TajNarSwordsmith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Tarmogoyf.java b/Mage.Sets/src/mage/sets/modernmasters2015/Tarmogoyf.java
index 4ed9f366ce..44e211542b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Tarmogoyf.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Tarmogoyf.java
@@ -38,7 +38,7 @@ public class Tarmogoyf extends mage.sets.futuresight.Tarmogoyf {
 
     public Tarmogoyf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TellingTime.java b/Mage.Sets/src/mage/sets/modernmasters2015/TellingTime.java
index cf2500be90..3323b3c015 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TellingTime.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TellingTime.java
@@ -37,7 +37,7 @@ public class TellingTime extends mage.sets.tenthedition.TellingTime {
 
     public TellingTime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TerashisGrasp.java b/Mage.Sets/src/mage/sets/modernmasters2015/TerashisGrasp.java
index b75570552f..41fdfe591e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TerashisGrasp.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TerashisGrasp.java
@@ -37,7 +37,7 @@ public class TerashisGrasp extends mage.sets.betrayersofkamigawa.TerashisGrasp {
 
     public TerashisGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretTheSeeker.java b/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretTheSeeker.java
index 9b32899b10..3032bcf31b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretTheSeeker.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretTheSeeker.java
@@ -37,7 +37,7 @@ public class TezzeretTheSeeker extends mage.sets.shardsofalara.TezzeretTheSeeker
 
     public TezzeretTheSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretsGambit.java b/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretsGambit.java
index c28cd4a733..6e93805e41 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretsGambit.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TezzeretsGambit.java
@@ -37,7 +37,7 @@ public class TezzeretsGambit extends mage.sets.newphyrexia.TezzeretsGambit {
 
     public TezzeretsGambit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ThiefOfHope.java b/Mage.Sets/src/mage/sets/modernmasters2015/ThiefOfHope.java
index de06a90e21..e548ce4f2f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ThiefOfHope.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ThiefOfHope.java
@@ -38,7 +38,7 @@ public class ThiefOfHope extends mage.sets.championsofkamigawa.ThiefOfHope {
 
     public ThiefOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Thoughtcast.java b/Mage.Sets/src/mage/sets/modernmasters2015/Thoughtcast.java
index e1c1473434..d44c0df9d6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Thoughtcast.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Thoughtcast.java
@@ -37,7 +37,7 @@ public class Thoughtcast extends mage.sets.elspethvstezzeret.Thoughtcast {
 
     public Thoughtcast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Thrive.java b/Mage.Sets/src/mage/sets/modernmasters2015/Thrive.java
index 04eccbe4a1..12f56f44c2 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Thrive.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Thrive.java
@@ -37,7 +37,7 @@ public class Thrive extends mage.sets.prophecy.Thrive {
 
     public Thrive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Thrummingbird.java b/Mage.Sets/src/mage/sets/modernmasters2015/Thrummingbird.java
index ec6e7cfc79..37b136d8b1 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Thrummingbird.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Thrummingbird.java
@@ -38,7 +38,7 @@ public class Thrummingbird extends mage.sets.scarsofmirrodin.Thrummingbird {
 
     public Thrummingbird(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Thunderblust.java b/Mage.Sets/src/mage/sets/modernmasters2015/Thunderblust.java
index 8a2b66797d..5316f7b123 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Thunderblust.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Thunderblust.java
@@ -37,7 +37,7 @@ public class Thunderblust extends mage.sets.eventide.Thunderblust {
 
     public Thunderblust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TribalFlames.java b/Mage.Sets/src/mage/sets/modernmasters2015/TribalFlames.java
index 130d0ee93b..3e9750ac42 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TribalFlames.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TribalFlames.java
@@ -37,7 +37,7 @@ public class TribalFlames extends mage.sets.invasion.TribalFlames {
 
     public TribalFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TukatongueThallid.java b/Mage.Sets/src/mage/sets/modernmasters2015/TukatongueThallid.java
index 1f9ed90328..aac6e41dbc 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TukatongueThallid.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TukatongueThallid.java
@@ -37,7 +37,7 @@ public class TukatongueThallid extends mage.sets.conflux.TukatongueThallid {
 
     public TukatongueThallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/TumbleMagnet.java b/Mage.Sets/src/mage/sets/modernmasters2015/TumbleMagnet.java
index 45f5fa32c5..4a473b0329 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/TumbleMagnet.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/TumbleMagnet.java
@@ -38,7 +38,7 @@ public class TumbleMagnet extends mage.sets.scarsofmirrodin.TumbleMagnet {
 
     public TumbleMagnet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/sets/modernmasters2015/UlamogTheInfiniteGyre.java
index 00ae8a5990..8f84807724 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/UlamogTheInfiniteGyre.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/UlamogTheInfiniteGyre.java
@@ -37,7 +37,7 @@ public class UlamogTheInfiniteGyre extends mage.sets.riseoftheeldrazi.UlamogTheI
 
     public UlamogTheInfiniteGyre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/UlamogsCrusher.java b/Mage.Sets/src/mage/sets/modernmasters2015/UlamogsCrusher.java
index 1dc9dcc62b..e270dd92c6 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/UlamogsCrusher.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/UlamogsCrusher.java
@@ -37,7 +37,7 @@ public class UlamogsCrusher extends mage.sets.riseoftheeldrazi.UlamogsCrusher {
 
     public UlamogsCrusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VampireLacerator.java b/Mage.Sets/src/mage/sets/modernmasters2015/VampireLacerator.java
index 92e4a7ff42..66e343a5e0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VampireLacerator.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VampireLacerator.java
@@ -37,7 +37,7 @@ public class VampireLacerator extends mage.sets.zendikar.VampireLacerator {
 
     public VampireLacerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VampireOutcasts.java b/Mage.Sets/src/mage/sets/modernmasters2015/VampireOutcasts.java
index 87ec1d4138..e824e09693 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VampireOutcasts.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VampireOutcasts.java
@@ -37,7 +37,7 @@ public class VampireOutcasts extends mage.sets.magic2012.VampireOutcasts {
 
     public VampireOutcasts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VaporSnag.java b/Mage.Sets/src/mage/sets/modernmasters2015/VaporSnag.java
index 4415f9e0b6..21c3bb6b05 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VaporSnag.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VaporSnag.java
@@ -37,7 +37,7 @@ public class VaporSnag extends mage.sets.newphyrexia.VaporSnag {
 
     public VaporSnag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VendilionClique.java b/Mage.Sets/src/mage/sets/modernmasters2015/VendilionClique.java
index 368e1b9569..83e9a005e3 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VendilionClique.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VendilionClique.java
@@ -38,7 +38,7 @@ public class VendilionClique extends mage.sets.morningtide.VendilionClique {
 
     public VendilionClique(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VengefulRebirth.java b/Mage.Sets/src/mage/sets/modernmasters2015/VengefulRebirth.java
index aad7b5fc2d..b51194a049 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VengefulRebirth.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VengefulRebirth.java
@@ -37,7 +37,7 @@ public class VengefulRebirth extends mage.sets.alarareborn.VengefulRebirth {
 
     public VengefulRebirth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/ViashinoSlaughtermaster.java b/Mage.Sets/src/mage/sets/modernmasters2015/ViashinoSlaughtermaster.java
index bdb95e57da..4e8c397225 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/ViashinoSlaughtermaster.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/ViashinoSlaughtermaster.java
@@ -38,7 +38,7 @@ public class ViashinoSlaughtermaster extends mage.sets.conflux.ViashinoSlaughter
 
     public ViashinoSlaughtermaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VigeanGraftmage.java b/Mage.Sets/src/mage/sets/modernmasters2015/VigeanGraftmage.java
index 5934da2906..c3d0c493bb 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VigeanGraftmage.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VigeanGraftmage.java
@@ -38,7 +38,7 @@ public class VigeanGraftmage extends mage.sets.dissension.VigeanGraftmage {
 
     public VigeanGraftmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/VinesOfVastwood.java b/Mage.Sets/src/mage/sets/modernmasters2015/VinesOfVastwood.java
index 8f801ce927..0fdee0a196 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/VinesOfVastwood.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/VinesOfVastwood.java
@@ -37,7 +37,7 @@ public class VinesOfVastwood extends mage.sets.zendikar.VinesOfVastwood {
 
     public VinesOfVastwood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WakingNightmare.java b/Mage.Sets/src/mage/sets/modernmasters2015/WakingNightmare.java
index 6ceb00bb36..5af5dbb78c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WakingNightmare.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WakingNightmare.java
@@ -37,7 +37,7 @@ public class WakingNightmare extends mage.sets.championsofkamigawa.WakingNightma
 
     public WakingNightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WaterServant.java b/Mage.Sets/src/mage/sets/modernmasters2015/WaterServant.java
index 38e9d2ce27..55dc21602c 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WaterServant.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WaterServant.java
@@ -37,7 +37,7 @@ public class WaterServant extends mage.sets.magic2011.WaterServant {
 
     public WaterServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WaxmaneBaku.java b/Mage.Sets/src/mage/sets/modernmasters2015/WaxmaneBaku.java
index e201d56b71..cb8300ea42 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WaxmaneBaku.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WaxmaneBaku.java
@@ -37,7 +37,7 @@ public class WaxmaneBaku extends mage.sets.betrayersofkamigawa.WaxmaneBaku {
 
     public WaxmaneBaku(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WayfarersBauble.java b/Mage.Sets/src/mage/sets/modernmasters2015/WayfarersBauble.java
index ee67bc30a8..d546beea44 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WayfarersBauble.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WayfarersBauble.java
@@ -37,7 +37,7 @@ public class WayfarersBauble extends mage.sets.commander2013.WayfarersBauble {
 
     public WayfarersBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/Wildfire.java b/Mage.Sets/src/mage/sets/modernmasters2015/Wildfire.java
index a3d772f0d4..73bddc4678 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/Wildfire.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/Wildfire.java
@@ -37,7 +37,7 @@ public class Wildfire extends mage.sets.urzassaga.Wildfire {
 
     public Wildfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WiltLeafLiege.java b/Mage.Sets/src/mage/sets/modernmasters2015/WiltLeafLiege.java
index 5f26b590a2..e01e25b038 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WiltLeafLiege.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WiltLeafLiege.java
@@ -37,7 +37,7 @@ public class WiltLeafLiege extends mage.sets.shadowmoor.WiltLeafLiege {
 
     public WiltLeafLiege(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WingsOfVelisVel.java b/Mage.Sets/src/mage/sets/modernmasters2015/WingsOfVelisVel.java
index 612557bc1b..02d73e6f65 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WingsOfVelisVel.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WingsOfVelisVel.java
@@ -37,7 +37,7 @@ public class WingsOfVelisVel extends mage.sets.lorwyn.WingsOfVelisVel {
 
     public WingsOfVelisVel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/modernmasters2015/WolfbriarElemental.java
index 1b57959c11..c4a98dab44 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WolfbriarElemental.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WolfbriarElemental.java
@@ -37,7 +37,7 @@ public class WolfbriarElemental extends mage.sets.worldwake.WolfbriarElemental {
 
     public WolfbriarElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WrapInFlames.java b/Mage.Sets/src/mage/sets/modernmasters2015/WrapInFlames.java
index b47736b68c..5b5270ad8e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WrapInFlames.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WrapInFlames.java
@@ -37,7 +37,7 @@ public class WrapInFlames extends mage.sets.riseoftheeldrazi.WrapInFlames {
 
     public WrapInFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "MM2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WreckingBall.java b/Mage.Sets/src/mage/sets/modernmasters2015/WreckingBall.java
index 7e98e3c796..3845a1a509 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WreckingBall.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WreckingBall.java
@@ -38,7 +38,7 @@ public class WreckingBall extends mage.sets.commander.WreckingBall {
 
     public WreckingBall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "MM2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/morningtide/AuntiesSnitch.java b/Mage.Sets/src/mage/sets/morningtide/AuntiesSnitch.java
index 59bc9be21c..c50e860053 100644
--- a/Mage.Sets/src/mage/sets/morningtide/AuntiesSnitch.java
+++ b/Mage.Sets/src/mage/sets/morningtide/AuntiesSnitch.java
@@ -38,7 +38,7 @@ public class AuntiesSnitch extends mage.sets.modernmasters.AuntiesSnitch {
 
     public AuntiesSnitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "MOR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/morningtide/BorderlandBehemoth.java b/Mage.Sets/src/mage/sets/morningtide/BorderlandBehemoth.java
index f4650f2c6a..c008ba3416 100644
--- a/Mage.Sets/src/mage/sets/morningtide/BorderlandBehemoth.java
+++ b/Mage.Sets/src/mage/sets/morningtide/BorderlandBehemoth.java
@@ -37,7 +37,7 @@ public class BorderlandBehemoth extends mage.sets.commander2015.BorderlandBehemo
 
     public BorderlandBehemoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/BurrentonBombardier.java b/Mage.Sets/src/mage/sets/morningtide/BurrentonBombardier.java
index b1a9227068..6793af5954 100644
--- a/Mage.Sets/src/mage/sets/morningtide/BurrentonBombardier.java
+++ b/Mage.Sets/src/mage/sets/morningtide/BurrentonBombardier.java
@@ -37,7 +37,7 @@ public class BurrentonBombardier extends mage.sets.elspethvstezzeret.BurrentonBo
 
     public BurrentonBombardier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/Disperse.java b/Mage.Sets/src/mage/sets/morningtide/Disperse.java
index 0fae4a3f8c..9435a2d779 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Disperse.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Disperse.java
@@ -37,7 +37,7 @@ public class Disperse extends mage.sets.scarsofmirrodin.Disperse {
 
     public Disperse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/DoorOfDestinies.java b/Mage.Sets/src/mage/sets/morningtide/DoorOfDestinies.java
index f4b46638c9..1ee0040a49 100644
--- a/Mage.Sets/src/mage/sets/morningtide/DoorOfDestinies.java
+++ b/Mage.Sets/src/mage/sets/morningtide/DoorOfDestinies.java
@@ -37,7 +37,7 @@ public class DoorOfDestinies extends mage.sets.magic2014.DoorOfDestinies {
 
     public DoorOfDestinies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/EarwigSquad.java b/Mage.Sets/src/mage/sets/morningtide/EarwigSquad.java
index e9d8ec64a5..7a2d5c8bb0 100644
--- a/Mage.Sets/src/mage/sets/morningtide/EarwigSquad.java
+++ b/Mage.Sets/src/mage/sets/morningtide/EarwigSquad.java
@@ -37,7 +37,7 @@ public class EarwigSquad extends mage.sets.modernmasters.EarwigSquad {
 
     public EarwigSquad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/Fertilid.java b/Mage.Sets/src/mage/sets/morningtide/Fertilid.java
index 3a9e5670b4..49cd55d52e 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Fertilid.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Fertilid.java
@@ -37,7 +37,7 @@ public class Fertilid extends mage.sets.commander.Fertilid {
 
     public Fertilid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java b/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java
index 1f3a411879..7c496b1999 100644
--- a/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java
+++ b/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java
@@ -38,7 +38,7 @@ public class FeudkillersVerdict extends mage.sets.modernmasters.FeudkillersVerdi
 
     public FeudkillersVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "MOR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/morningtide/KindledFury.java b/Mage.Sets/src/mage/sets/morningtide/KindledFury.java
index 394c3c6103..a2e30e72f0 100644
--- a/Mage.Sets/src/mage/sets/morningtide/KindledFury.java
+++ b/Mage.Sets/src/mage/sets/morningtide/KindledFury.java
@@ -37,7 +37,7 @@ public class KindledFury extends mage.sets.magic2010.KindledFury {
 
     public KindledFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/LatchkeyFaerie.java b/Mage.Sets/src/mage/sets/morningtide/LatchkeyFaerie.java
index 486c0f86db..90fe9b4336 100644
--- a/Mage.Sets/src/mage/sets/morningtide/LatchkeyFaerie.java
+++ b/Mage.Sets/src/mage/sets/morningtide/LatchkeyFaerie.java
@@ -37,7 +37,7 @@ public class LatchkeyFaerie extends mage.sets.modernmasters.LatchkeyFaerie {
 
     public LatchkeyFaerie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/MindShatter.java b/Mage.Sets/src/mage/sets/morningtide/MindShatter.java
index 4f169803a2..f6e52c7b2b 100644
--- a/Mage.Sets/src/mage/sets/morningtide/MindShatter.java
+++ b/Mage.Sets/src/mage/sets/morningtide/MindShatter.java
@@ -37,7 +37,7 @@ public class MindShatter extends mage.sets.magic2010.MindShatter {
 
     public MindShatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/MindSpring.java b/Mage.Sets/src/mage/sets/morningtide/MindSpring.java
index 3ffe942f2d..009d76bf2f 100644
--- a/Mage.Sets/src/mage/sets/morningtide/MindSpring.java
+++ b/Mage.Sets/src/mage/sets/morningtide/MindSpring.java
@@ -37,7 +37,7 @@ public class MindSpring extends mage.sets.magic2010.MindSpring {
 
     public MindSpring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/MosquitoGuard.java b/Mage.Sets/src/mage/sets/morningtide/MosquitoGuard.java
index ba3672c2bf..a5348e02c3 100644
--- a/Mage.Sets/src/mage/sets/morningtide/MosquitoGuard.java
+++ b/Mage.Sets/src/mage/sets/morningtide/MosquitoGuard.java
@@ -37,7 +37,7 @@ public class MosquitoGuard extends mage.sets.elspethvstezzeret.MosquitoGuard {
 
     public MosquitoGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/Negate.java b/Mage.Sets/src/mage/sets/morningtide/Negate.java
index 8717df49c0..3b192577ab 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Negate.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java b/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java
index 616d8fa1ac..3d3d080da2 100644
--- a/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java
+++ b/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java
@@ -38,7 +38,7 @@ public class ReachOfBranches extends mage.sets.modernmasters.ReachOfBranches {
 
     public ReachOfBranches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "MOR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/morningtide/RivalsDuel.java b/Mage.Sets/src/mage/sets/morningtide/RivalsDuel.java
index cb545141e4..ab4da6dc2b 100644
--- a/Mage.Sets/src/mage/sets/morningtide/RivalsDuel.java
+++ b/Mage.Sets/src/mage/sets/morningtide/RivalsDuel.java
@@ -37,7 +37,7 @@ public class RivalsDuel extends mage.sets.planechase2012.RivalsDuel {
 
     public RivalsDuel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/RusticClachan.java b/Mage.Sets/src/mage/sets/morningtide/RusticClachan.java
index 87a67df4eb..341246e108 100644
--- a/Mage.Sets/src/mage/sets/morningtide/RusticClachan.java
+++ b/Mage.Sets/src/mage/sets/morningtide/RusticClachan.java
@@ -37,7 +37,7 @@ public class RusticClachan extends mage.sets.elspethvstezzeret.RusticClachan {
 
     public RusticClachan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/Spitebellows.java b/Mage.Sets/src/mage/sets/morningtide/Spitebellows.java
index ce3e4c65ee..044baca6f1 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Spitebellows.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Spitebellows.java
@@ -37,7 +37,7 @@ public class Spitebellows extends mage.sets.commander.Spitebellows {
 
     public Spitebellows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/StonehewerGiant.java b/Mage.Sets/src/mage/sets/morningtide/StonehewerGiant.java
index 7fa36a6973..94ca8dd930 100644
--- a/Mage.Sets/src/mage/sets/morningtide/StonehewerGiant.java
+++ b/Mage.Sets/src/mage/sets/morningtide/StonehewerGiant.java
@@ -37,7 +37,7 @@ public class StonehewerGiant extends mage.sets.modernmasters.StonehewerGiant {
 
     public StonehewerGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/SwellOfCourage.java b/Mage.Sets/src/mage/sets/morningtide/SwellOfCourage.java
index 6674505494..290f6d5271 100644
--- a/Mage.Sets/src/mage/sets/morningtide/SwellOfCourage.java
+++ b/Mage.Sets/src/mage/sets/morningtide/SwellOfCourage.java
@@ -37,7 +37,7 @@ public class SwellOfCourage extends mage.sets.elspethvstezzeret.SwellOfCourage {
 
     public SwellOfCourage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/TaureanMauler.java b/Mage.Sets/src/mage/sets/morningtide/TaureanMauler.java
index 1c34322ad5..7904b42bd6 100644
--- a/Mage.Sets/src/mage/sets/morningtide/TaureanMauler.java
+++ b/Mage.Sets/src/mage/sets/morningtide/TaureanMauler.java
@@ -37,7 +37,7 @@ public class TaureanMauler extends mage.sets.planechase.TaureanMauler {
 
     public TaureanMauler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "MOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/WarrenWeirding.java b/Mage.Sets/src/mage/sets/morningtide/WarrenWeirding.java
index db8e45a6ca..bfb5d3ee41 100644
--- a/Mage.Sets/src/mage/sets/morningtide/WarrenWeirding.java
+++ b/Mage.Sets/src/mage/sets/morningtide/WarrenWeirding.java
@@ -38,7 +38,7 @@ public class WarrenWeirding extends mage.sets.modernmasters.WarrenWeirding {
 
     public WarrenWeirding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "MOR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/nemesis/AscendantEvincar.java b/Mage.Sets/src/mage/sets/nemesis/AscendantEvincar.java
index 567afc9c00..7ab47ffe4d 100644
--- a/Mage.Sets/src/mage/sets/nemesis/AscendantEvincar.java
+++ b/Mage.Sets/src/mage/sets/nemesis/AscendantEvincar.java
@@ -37,7 +37,7 @@ public class AscendantEvincar extends mage.sets.planechase.AscendantEvincar {
 
     public AscendantEvincar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/FlowstoneCrusher.java b/Mage.Sets/src/mage/sets/nemesis/FlowstoneCrusher.java
index b9b2793207..b0deebe89a 100644
--- a/Mage.Sets/src/mage/sets/nemesis/FlowstoneCrusher.java
+++ b/Mage.Sets/src/mage/sets/nemesis/FlowstoneCrusher.java
@@ -38,7 +38,7 @@ public class FlowstoneCrusher extends mage.sets.ninthedition.FlowstoneCrusher {
 
     public FlowstoneCrusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "NEM";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/nemesis/FlowstoneSlide.java b/Mage.Sets/src/mage/sets/nemesis/FlowstoneSlide.java
index 43cb2d8c36..1b1a7fe928 100644
--- a/Mage.Sets/src/mage/sets/nemesis/FlowstoneSlide.java
+++ b/Mage.Sets/src/mage/sets/nemesis/FlowstoneSlide.java
@@ -37,7 +37,7 @@ public class FlowstoneSlide extends mage.sets.tenthedition.FlowstoneSlide {
 
     public FlowstoneSlide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/PredatorFlagship.java b/Mage.Sets/src/mage/sets/nemesis/PredatorFlagship.java
index 24eb963b8c..f292f4c318 100644
--- a/Mage.Sets/src/mage/sets/nemesis/PredatorFlagship.java
+++ b/Mage.Sets/src/mage/sets/nemesis/PredatorFlagship.java
@@ -37,7 +37,7 @@ public class PredatorFlagship extends mage.sets.commander2014.PredatorFlagship {
 
     public PredatorFlagship(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/Rhox.java b/Mage.Sets/src/mage/sets/nemesis/Rhox.java
index fcee5276de..b40fff5aac 100644
--- a/Mage.Sets/src/mage/sets/nemesis/Rhox.java
+++ b/Mage.Sets/src/mage/sets/nemesis/Rhox.java
@@ -37,7 +37,7 @@ public class Rhox extends mage.sets.tenthedition.Rhox {
 
     public Rhox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/RootwaterCommando.java b/Mage.Sets/src/mage/sets/nemesis/RootwaterCommando.java
index 75fb3707a8..5d04ba940a 100644
--- a/Mage.Sets/src/mage/sets/nemesis/RootwaterCommando.java
+++ b/Mage.Sets/src/mage/sets/nemesis/RootwaterCommando.java
@@ -37,7 +37,7 @@ public class RootwaterCommando extends mage.sets.tenthedition.RootwaterCommando
 
     public RootwaterCommando(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/SaprolingBurst.java b/Mage.Sets/src/mage/sets/nemesis/SaprolingBurst.java
index c79f5af383..793f5fce20 100644
--- a/Mage.Sets/src/mage/sets/nemesis/SaprolingBurst.java
+++ b/Mage.Sets/src/mage/sets/nemesis/SaprolingBurst.java
@@ -37,7 +37,7 @@ public class SaprolingBurst extends mage.sets.vintagemasters.SaprolingBurst {
 
     public SaprolingBurst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfDoom.java b/Mage.Sets/src/mage/sets/nemesis/SealOfDoom.java
index 29c00fc353..7b7a3fbd41 100644
--- a/Mage.Sets/src/mage/sets/nemesis/SealOfDoom.java
+++ b/Mage.Sets/src/mage/sets/nemesis/SealOfDoom.java
@@ -37,7 +37,7 @@ public class SealOfDoom extends mage.sets.dissension.SealOfDoom {
 
     public SealOfDoom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/SpinelessThug.java b/Mage.Sets/src/mage/sets/nemesis/SpinelessThug.java
index c88f52607b..34016a3cdb 100644
--- a/Mage.Sets/src/mage/sets/nemesis/SpinelessThug.java
+++ b/Mage.Sets/src/mage/sets/nemesis/SpinelessThug.java
@@ -37,7 +37,7 @@ public class SpinelessThug extends mage.sets.tenthedition.SpinelessThug {
 
     public SpinelessThug(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/StrongholdDiscipline.java b/Mage.Sets/src/mage/sets/nemesis/StrongholdDiscipline.java
index 8baf339a3c..4b5bc73703 100644
--- a/Mage.Sets/src/mage/sets/nemesis/StrongholdDiscipline.java
+++ b/Mage.Sets/src/mage/sets/nemesis/StrongholdDiscipline.java
@@ -37,7 +37,7 @@ public class StrongholdDiscipline extends mage.sets.conspiracy.StrongholdDiscipl
 
     public StrongholdDiscipline(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/TerrainGenerator.java b/Mage.Sets/src/mage/sets/nemesis/TerrainGenerator.java
index ff65e7e82e..1c77ebf975 100644
--- a/Mage.Sets/src/mage/sets/nemesis/TerrainGenerator.java
+++ b/Mage.Sets/src/mage/sets/nemesis/TerrainGenerator.java
@@ -37,7 +37,7 @@ public class TerrainGenerator extends mage.sets.anthologyjacevschandra.TerrainGe
 
     public TerrainGenerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "NEM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AdarkarWastes.java b/Mage.Sets/src/mage/sets/ninthedition/AdarkarWastes.java
index 1ea80af233..9899a6b111 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AdarkarWastes.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AdarkarWastes.java
@@ -37,7 +37,7 @@ public class AdarkarWastes extends mage.sets.tenthedition.AdarkarWastes {
 
     public AdarkarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AirElemental.java b/Mage.Sets/src/mage/sets/ninthedition/AirElemental.java
index dcf7cdb0eb..bd4d2d0421 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/ninthedition/AladdinsRing.java
index ab49cd6393..dade4babc0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Anaconda.java b/Mage.Sets/src/mage/sets/ninthedition/Anaconda.java
index cdf3c93f99..d81fb2c464 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Anaconda.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Anaconda.java
@@ -37,7 +37,7 @@ public class Anaconda extends mage.sets.urzassaga.Anaconda {
 
     public Anaconda(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AncientSilverback.java b/Mage.Sets/src/mage/sets/ninthedition/AncientSilverback.java
index 079ace9b77..d5a4ebca5d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AncientSilverback.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AncientSilverback.java
@@ -37,7 +37,7 @@ public class AncientSilverback extends mage.sets.urzasdestiny.AncientSilverback
 
     public AncientSilverback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AngelOfMercy.java b/Mage.Sets/src/mage/sets/ninthedition/AngelOfMercy.java
index 5249368bf0..eaf0be101e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AngelicBlessing.java b/Mage.Sets/src/mage/sets/ninthedition/AngelicBlessing.java
index 4aa7178dd6..c35c59b257 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AngelsFeather.java b/Mage.Sets/src/mage/sets/ninthedition/AngelsFeather.java
index 5839402d90..a17f5535b1 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AngelsFeather.java
@@ -37,7 +37,7 @@ public class AngelsFeather extends mage.sets.tenthedition.AngelsFeather {
 
     public AngelsFeather(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Annex.java b/Mage.Sets/src/mage/sets/ninthedition/Annex.java
index 24779f9509..9cd8655d96 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Annex.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Annex.java
@@ -37,7 +37,7 @@ public class Annex extends mage.sets.onslaught.Annex {
 
     public Annex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Archivist.java b/Mage.Sets/src/mage/sets/ninthedition/Archivist.java
index 8a820f1b6b..62cbeea46c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Archivist.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Archivist.java
@@ -37,7 +37,7 @@ public class Archivist extends mage.sets.urzaslegacy.Archivist {
 
     public Archivist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/ninthedition/AvenCloudchaser.java
index 97bcd7bf55..0beed17401 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AvenCloudchaser.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AvenCloudchaser.java
@@ -37,7 +37,7 @@ public class AvenCloudchaser extends mage.sets.tenthedition.AvenCloudchaser {
 
     public AvenCloudchaser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenFisher.java b/Mage.Sets/src/mage/sets/ninthedition/AvenFisher.java
index a321953408..0fb6f90b1b 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AvenFisher.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AvenFisher.java
@@ -37,7 +37,7 @@ public class AvenFisher extends mage.sets.tenthedition.AvenFisher {
 
     public AvenFisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java b/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java
index 2692562079..34539312d1 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java
@@ -38,7 +38,7 @@ public class AzureDrake extends mage.sets.magic2011.AzureDrake {
 
     public AzureDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BallistaSquad.java b/Mage.Sets/src/mage/sets/ninthedition/BallistaSquad.java
index 81498ca875..b0af885cc8 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BallistaSquad.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BallistaSquad.java
@@ -37,7 +37,7 @@ public class BallistaSquad extends mage.sets.mercadianmasques.BallistaSquad {
 
     public BallistaSquad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BattlefieldForge.java b/Mage.Sets/src/mage/sets/ninthedition/BattlefieldForge.java
index 1ed15c7ce0..c79c73d02b 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BattlefieldForge.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BattlefieldForge.java
@@ -37,7 +37,7 @@ public class BattlefieldForge extends mage.sets.apocalypse.BattlefieldForge {
 
     public BattlefieldForge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Biorhythm.java b/Mage.Sets/src/mage/sets/ninthedition/Biorhythm.java
index e771fbef06..6520f7e26b 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Biorhythm.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Biorhythm.java
@@ -37,7 +37,7 @@ public class Biorhythm extends mage.sets.onslaught.Biorhythm {
 
     public Biorhythm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Blackmail.java b/Mage.Sets/src/mage/sets/ninthedition/Blackmail.java
index ac088639f0..11de1128e8 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Blackmail.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Blackmail.java
@@ -37,7 +37,7 @@ public class Blackmail extends mage.sets.onslaught.Blackmail {
 
     public Blackmail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/ninthedition/BlanchwoodArmor.java
index 68df8bee13..2039f1d457 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BlanchwoodArmor.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BlanchwoodArmor.java
@@ -37,7 +37,7 @@ public class BlanchwoodArmor extends mage.sets.tenthedition.BlanchwoodArmor {
 
     public BlanchwoodArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Blaze.java b/Mage.Sets/src/mage/sets/ninthedition/Blaze.java
index b0be98eb37..1c2a5563f1 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Blaze.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BlindingAngel.java b/Mage.Sets/src/mage/sets/ninthedition/BlindingAngel.java
index 963c263663..dcb85b330e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BlindingAngel.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BlindingAngel.java
@@ -37,7 +37,7 @@ public class BlindingAngel extends mage.sets.nemesis.BlindingAngel {
 
     public BlindingAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BloodfireColossus.java b/Mage.Sets/src/mage/sets/ninthedition/BloodfireColossus.java
index 39574b6efd..71eadd5d32 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BloodfireColossus.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BloodfireColossus.java
@@ -37,7 +37,7 @@ public class BloodfireColossus extends mage.sets.apocalypse.BloodfireColossus {
 
     public BloodfireColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BogImp.java b/Mage.Sets/src/mage/sets/ninthedition/BogImp.java
index 2ee1dc6495..db30e1e3e0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BogImp.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BogWraith.java b/Mage.Sets/src/mage/sets/ninthedition/BogWraith.java
index b550f36c01..ba630b5c99 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Boomerang.java b/Mage.Sets/src/mage/sets/ninthedition/Boomerang.java
index 0a2d2ceb9b..e4f9db38ad 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/BottleGnomes.java b/Mage.Sets/src/mage/sets/ninthedition/BottleGnomes.java
index cba67849bd..07328276aa 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Brushland.java b/Mage.Sets/src/mage/sets/ninthedition/Brushland.java
index 55da2b4adf..b2ddf9f124 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Brushland.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Brushland.java
@@ -37,7 +37,7 @@ public class Brushland extends mage.sets.tenthedition.Brushland {
 
     public Brushland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CavesOfKoilos.java b/Mage.Sets/src/mage/sets/ninthedition/CavesOfKoilos.java
index f80aa8ddee..dd941db604 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CavesOfKoilos.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CavesOfKoilos.java
@@ -37,7 +37,7 @@ public class CavesOfKoilos extends mage.sets.apocalypse.CavesOfKoilos {
 
     public CavesOfKoilos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java
index c4aae71cc3..8cd2b1e6e0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java
index b2433d7238..6ef92d463d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java
@@ -38,7 +38,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Clone.java b/Mage.Sets/src/mage/sets/ninthedition/Clone.java
index 29f135dc5d..8780a8a562 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Clone.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Clone.java
@@ -37,7 +37,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CoatOfArms.java b/Mage.Sets/src/mage/sets/ninthedition/CoatOfArms.java
index 687a153773..60693704c1 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Coercion.java b/Mage.Sets/src/mage/sets/ninthedition/Coercion.java
index ba4ca3afde..2094c3cf5c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Coercion.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Coercion.java
@@ -37,7 +37,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Confiscate.java b/Mage.Sets/src/mage/sets/ninthedition/Confiscate.java
index e31ac3a654..27f03f5c5c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Confiscate.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Confiscate.java
@@ -37,7 +37,7 @@ public class Confiscate extends mage.sets.urzassaga.Confiscate {
 
     public Confiscate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/ninthedition/ConsumeSpirit.java
index 27ba7848c1..de83551495 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ConsumeSpirit.java
@@ -37,7 +37,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CoralEel.java b/Mage.Sets/src/mage/sets/ninthedition/CoralEel.java
index fdda9ae6ab..63db8735eb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CoralEel.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CoralEel.java
@@ -37,7 +37,7 @@ public class CoralEel extends mage.sets.eighthedition.CoralEel {
 
     public CoralEel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CounselOfTheSoratami.java b/Mage.Sets/src/mage/sets/ninthedition/CounselOfTheSoratami.java
index d9637d42b2..74ad51b18e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CounselOfTheSoratami.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CounselOfTheSoratami.java
@@ -37,7 +37,7 @@ public class CounselOfTheSoratami extends mage.sets.championsofkamigawa.CounselO
 
     public CounselOfTheSoratami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CraftyPathmage.java b/Mage.Sets/src/mage/sets/ninthedition/CraftyPathmage.java
index 678c766687..6a74ca46e6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CraftyPathmage.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CraftyPathmage.java
@@ -37,7 +37,7 @@ public class CraftyPathmage extends mage.sets.tenthedition.CraftyPathmage {
 
     public CraftyPathmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CrawWurm.java b/Mage.Sets/src/mage/sets/ninthedition/CrawWurm.java
index a1caccbd24..293dda082e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CreepingMold.java b/Mage.Sets/src/mage/sets/ninthedition/CreepingMold.java
index 09f4efdf7d..19e9b9c80b 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CreepingMold.java
@@ -37,7 +37,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/CruelEdict.java b/Mage.Sets/src/mage/sets/ninthedition/CruelEdict.java
index 84265d5613..0fc3ee3e05 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/CruelEdict.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/CruelEdict.java
@@ -37,7 +37,7 @@ public class CruelEdict extends mage.sets.tenthedition.CruelEdict {
 
     public CruelEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DarkBanishing.java b/Mage.Sets/src/mage/sets/ninthedition/DarkBanishing.java
index c8ba7bf04f..d2261ed15f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DeathPitsOfRath.java b/Mage.Sets/src/mage/sets/ninthedition/DeathPitsOfRath.java
index b77594003a..7a4a28f2ba 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DeathPitsOfRath.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DeathPitsOfRath.java
@@ -37,7 +37,7 @@ public class DeathPitsOfRath extends mage.sets.tempest.DeathPitsOfRath {
 
     public DeathPitsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Dehydration.java b/Mage.Sets/src/mage/sets/ninthedition/Dehydration.java
index 9947eb57fd..391e320472 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Dehydration.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Dehydration.java
@@ -37,7 +37,7 @@ public class Dehydration extends mage.sets.tenthedition.Dehydration {
 
     public Dehydration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Demolish.java b/Mage.Sets/src/mage/sets/ninthedition/Demolish.java
index c26789ed47..cb4cd1c5ab 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Demolish.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Demolish.java
@@ -38,7 +38,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DemonsHorn.java b/Mage.Sets/src/mage/sets/ninthedition/DemonsHorn.java
index ebc65548d5..285237ab73 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DemonsHorn.java
@@ -37,7 +37,7 @@ public class DemonsHorn extends mage.sets.tenthedition.DemonsHorn {
 
     public DemonsHorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Demystify.java b/Mage.Sets/src/mage/sets/ninthedition/Demystify.java
index 6e6df1df4c..efab64543a 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Demystify.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Demystify.java
@@ -37,7 +37,7 @@ public class Demystify extends mage.sets.tenthedition.Demystify {
 
     public Demystify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DiabolicTutor.java b/Mage.Sets/src/mage/sets/ninthedition/DiabolicTutor.java
index 6e93311b78..a01320b12b 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DiabolicTutor.java
@@ -37,7 +37,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/ninthedition/DisruptingScepter.java
index 32265c0b0a..2055727db0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DragonsClaw.java b/Mage.Sets/src/mage/sets/ninthedition/DragonsClaw.java
index 8523d2e7d4..880f277755 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DragonsClaw.java
@@ -37,7 +37,7 @@ public class DragonsClaw extends mage.sets.tenthedition.DragonsClaw {
 
     public DragonsClaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DreamProwler.java b/Mage.Sets/src/mage/sets/ninthedition/DreamProwler.java
index c177154c6b..712169f45c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DreamProwler.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DreamProwler.java
@@ -37,7 +37,7 @@ public class DreamProwler extends mage.sets.tempestremastered.DreamProwler {
 
     public DreamProwler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java
index 9fecd08baf..039d00368d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java
@@ -38,7 +38,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/EagerCadet.java b/Mage.Sets/src/mage/sets/ninthedition/EagerCadet.java
index fec4e84bb1..f86ae58ec9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/EagerCadet.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/EagerCadet.java
@@ -37,7 +37,7 @@ public class EagerCadet extends mage.sets.seventhedition.EagerCadet {
 
     public EagerCadet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ElvishChampion.java b/Mage.Sets/src/mage/sets/ninthedition/ElvishChampion.java
index db8082307b..bfd8c81040 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ElvishChampion.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ElvishChampion.java
@@ -37,7 +37,7 @@ public class ElvishChampion extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ElvishPiper.java b/Mage.Sets/src/mage/sets/ninthedition/ElvishPiper.java
index 9b62289189..883daef90c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ElvishPiper.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ElvishPiper.java
@@ -37,7 +37,7 @@ public class ElvishPiper extends mage.sets.magic2010.ElvishPiper {
 
     public ElvishPiper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ElvishWarrior.java b/Mage.Sets/src/mage/sets/ninthedition/ElvishWarrior.java
index ebe25e19c2..a90e16ec01 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ElvishWarrior.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ElvishWarrior.java
@@ -37,7 +37,7 @@ public class ElvishWarrior extends mage.sets.morningtide.ElvishWarrior {
 
     public ElvishWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Enfeeblement.java b/Mage.Sets/src/mage/sets/ninthedition/Enfeeblement.java
index 49ecb246d5..b9d3e5be5e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Enfeeblement.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Enfeeblement.java
@@ -37,7 +37,7 @@ public class Enfeeblement extends mage.sets.tempest.Enfeeblement {
 
     public Enfeeblement(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/EnormousBaloth.java b/Mage.Sets/src/mage/sets/ninthedition/EnormousBaloth.java
index eaabdf15df..8dac27c1a2 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/EnormousBaloth.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/EnormousBaloth.java
@@ -37,7 +37,7 @@ public class EnormousBaloth extends mage.sets.magic2010.EnormousBaloth {
 
     public EnormousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Evacuation.java b/Mage.Sets/src/mage/sets/ninthedition/Evacuation.java
index 6bfa3ff4b0..7cd1c80fd9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Evacuation.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Evacuation.java
@@ -37,7 +37,7 @@ public class Evacuation extends mage.sets.stronghold.Evacuation {
 
     public Evacuation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Exhaustion.java b/Mage.Sets/src/mage/sets/ninthedition/Exhaustion.java
index 6fe767702d..58da64c2e4 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Exhaustion.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Exhaustion.java
@@ -38,7 +38,7 @@ public class Exhaustion extends mage.sets.portalthreekingdoms.Exhaustion {
 
     public Exhaustion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Fear.java b/Mage.Sets/src/mage/sets/ninthedition/Fear.java
index 13b0800cc4..6b913210c7 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Fear.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FesteringGoblin.java b/Mage.Sets/src/mage/sets/ninthedition/FesteringGoblin.java
index 1bf943c3a6..cf3f50fc20 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FesteringGoblin.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FesteringGoblin.java
@@ -37,7 +37,7 @@ public class FesteringGoblin extends mage.sets.planechase.FesteringGoblin {
 
     public FesteringGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FinalPunishment.java b/Mage.Sets/src/mage/sets/ninthedition/FinalPunishment.java
index bd37340f85..84d43310ac 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FinalPunishment.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FinalPunishment.java
@@ -37,7 +37,7 @@ public class FinalPunishment extends mage.sets.scourge.FinalPunishment {
 
     public FinalPunishment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Firebreathing.java b/Mage.Sets/src/mage/sets/ninthedition/Firebreathing.java
index bb51f8b0c3..758a70f480 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FishliverOil.java b/Mage.Sets/src/mage/sets/ninthedition/FishliverOil.java
index f10d10bc85..b12400bdbb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FishliverOil.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FishliverOil.java
@@ -36,7 +36,7 @@ public class FishliverOil extends mage.sets.arabiannights.FishliverOil1 {
 
     public FishliverOil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Flashfires.java b/Mage.Sets/src/mage/sets/ninthedition/Flashfires.java
index d89bdb3448..d8b47ddc02 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Flight.java b/Mage.Sets/src/mage/sets/ninthedition/Flight.java
index f9b8ab6b0d..149b7dcdda 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Flight.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FlowstoneSlide.java b/Mage.Sets/src/mage/sets/ninthedition/FlowstoneSlide.java
index e0726ef3ca..82fe526fa2 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FlowstoneSlide.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FlowstoneSlide.java
@@ -37,7 +37,7 @@ public class FlowstoneSlide extends mage.sets.tenthedition.FlowstoneSlide {
 
     public FlowstoneSlide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ForceOfNature.java b/Mage.Sets/src/mage/sets/ninthedition/ForceOfNature.java
index 010ac74158..7d106d54fe 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FormOfTheDragon.java b/Mage.Sets/src/mage/sets/ninthedition/FormOfTheDragon.java
index 2dcbbbc2d1..976df5a58e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FormOfTheDragon.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FormOfTheDragon.java
@@ -37,7 +37,7 @@ public class FormOfTheDragon extends mage.sets.scourge.FormOfTheDragon {
 
     public FormOfTheDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FoulImp.java b/Mage.Sets/src/mage/sets/ninthedition/FoulImp.java
index 8e5f36223c..30cbaa7957 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FoulImp.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FoulImp.java
@@ -37,7 +37,7 @@ public class FoulImp extends mage.sets.stronghold.FoulImp {
 
     public FoulImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FugitiveWizard.java b/Mage.Sets/src/mage/sets/ninthedition/FugitiveWizard.java
index c7f5e38355..051c7889d5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FugitiveWizard.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FugitiveWizard.java
@@ -37,7 +37,7 @@ public class FugitiveWizard extends mage.sets.tenthedition.FugitiveWizard {
 
     public FugitiveWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/FurnaceOfRath.java b/Mage.Sets/src/mage/sets/ninthedition/FurnaceOfRath.java
index 953f3f3a5f..54968d01f5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/FurnaceOfRath.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/FurnaceOfRath.java
@@ -37,7 +37,7 @@ public class FurnaceOfRath extends mage.sets.tempest.FurnaceOfRath {
 
     public FurnaceOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/ninthedition/GiantGrowth.java
index d6a9cd294c..7fbadd81b5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/ninthedition/GiantSpider.java
index fba2d2d272..e333bb7647 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GiftOfEstates.java b/Mage.Sets/src/mage/sets/ninthedition/GiftOfEstates.java
index a863d439f6..8729d793ac 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GiftOfEstates.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GiftOfEstates.java
@@ -37,7 +37,7 @@ public class GiftOfEstates extends mage.sets.commander2014.GiftOfEstates {
 
     public GiftOfEstates(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GloriousAnthem.java b/Mage.Sets/src/mage/sets/ninthedition/GloriousAnthem.java
index e21d08ae2a..66b83706a5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GloriousAnthem.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GloriousAnthem.java
@@ -37,7 +37,7 @@ public class GloriousAnthem extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GlorySeeker.java b/Mage.Sets/src/mage/sets/ninthedition/GlorySeeker.java
index 06cf49e52a..0e7730ad66 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GlorySeeker.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GlorySeeker.java
@@ -37,7 +37,7 @@ public class GlorySeeker extends mage.sets.riseoftheeldrazi.GlorySeeker {
 
     public GlorySeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GluttonousZombie.java b/Mage.Sets/src/mage/sets/ninthedition/GluttonousZombie.java
index 014424e007..d072ffe375 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GluttonousZombie.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GluttonousZombie.java
@@ -37,7 +37,7 @@ public class GluttonousZombie extends mage.sets.onslaught.GluttonousZombie {
 
     public GluttonousZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java
index c5517f5489..75350cf0c9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java
@@ -38,7 +38,7 @@ public class GoblinBalloonBrigade extends mage.sets.magic2011.GoblinBalloonBriga
 
     public GoblinBalloonBrigade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinKing.java
index 85ff4e8e0a..990124be36 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinMountaineer.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinMountaineer.java
index f69d208107..95f7bcc047 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GoblinMountaineer.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinMountaineer.java
@@ -37,7 +37,7 @@ public class GoblinMountaineer extends mage.sets.shardsofalara.GoblinMountaineer
 
     public GoblinMountaineer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinPiker.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinPiker.java
index b3e92f0a78..0a35ce62d5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GoblinPiker.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinPiker.java
@@ -37,7 +37,7 @@ public class GoblinPiker extends mage.sets.tenthedition.GoblinPiker {
 
     public GoblinPiker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinSkyRaider.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinSkyRaider.java
index 62519d23c3..16e6d15de0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GoblinSkyRaider.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinSkyRaider.java
@@ -37,7 +37,7 @@ public class GoblinSkyRaider extends mage.sets.tenthedition.GoblinSkyRaider {
 
     public GoblinSkyRaider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Gravedigger.java b/Mage.Sets/src/mage/sets/ninthedition/Gravedigger.java
index aba4fdc0c7..eb60d60ee6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/ninthedition/GrizzlyBears.java
index b20cba0439..f706ef7e99 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HighwayRobber.java b/Mage.Sets/src/mage/sets/ninthedition/HighwayRobber.java
index 22dd866183..ad12598a72 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HighwayRobber.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HighwayRobber.java
@@ -37,7 +37,7 @@ public class HighwayRobber extends mage.sets.tenthedition.HighwayRobber {
 
     public HighwayRobber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HillGiant.java b/Mage.Sets/src/mage/sets/ninthedition/HillGiant.java
index d7b4bd731c..6ee8d28356 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HollowDogs.java b/Mage.Sets/src/mage/sets/ninthedition/HollowDogs.java
index 0486951ab4..8b40c816e7 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HollowDogs.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HollowDogs.java
@@ -37,7 +37,7 @@ public class HollowDogs extends mage.sets.urzassaga.HollowDogs {
 
     public HollowDogs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HolyDay.java b/Mage.Sets/src/mage/sets/ninthedition/HolyDay.java
index 25275b9df9..8c1b035213 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HolyDay.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HolyDay.java
@@ -37,7 +37,7 @@ public class HolyDay extends mage.sets.invasion.HolyDay {
 
     public HolyDay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HolyStrength.java b/Mage.Sets/src/mage/sets/ninthedition/HolyStrength.java
index 88c3daf4fd..fc95077a29 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HonorGuard.java b/Mage.Sets/src/mage/sets/ninthedition/HonorGuard.java
index 5f71ab7d54..ea0ae99c38 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HonorGuard.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HonorGuard.java
@@ -37,7 +37,7 @@ public class HonorGuard extends mage.sets.tenthedition.HonorGuard {
 
     public HonorGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HornedTurtle.java b/Mage.Sets/src/mage/sets/ninthedition/HornedTurtle.java
index c36d3fc895..f42f9d361c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HorrorOfHorrors.java b/Mage.Sets/src/mage/sets/ninthedition/HorrorOfHorrors.java
index cd45985779..0b314603a9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HorrorOfHorrors.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HorrorOfHorrors.java
@@ -37,7 +37,7 @@ public class HorrorOfHorrors extends mage.sets.legends.HorrorOfHorrors {
 
     public HorrorOfHorrors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/ninthedition/HowlingMine.java
index 9e04141c81..7caef72fa6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/ninthedition/HypnoticSpecter.java
index f50af7046f..deb24e1ace 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/HypnoticSpecter.java
@@ -37,7 +37,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/IcyManipulator.java b/Mage.Sets/src/mage/sets/ninthedition/IcyManipulator.java
index c835352a1e..97b8ae5c81 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ImaginaryPet.java b/Mage.Sets/src/mage/sets/ninthedition/ImaginaryPet.java
index a0e985a47d..842a415a81 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ImaginaryPet.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ImaginaryPet.java
@@ -37,7 +37,7 @@ public class ImaginaryPet extends mage.sets.urzassaga.ImaginaryPet {
 
     public ImaginaryPet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Index.java b/Mage.Sets/src/mage/sets/ninthedition/Index.java
index 76316266b3..92fbe3da1f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Index.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Index.java
@@ -37,7 +37,7 @@ public class Index extends mage.sets.apocalypse.Index {
 
     public Index(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/InfantryVeteran.java b/Mage.Sets/src/mage/sets/ninthedition/InfantryVeteran.java
index b3ec3e2f8b..8ae4692d9e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/InfantryVeteran.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/InfantryVeteran.java
@@ -37,7 +37,7 @@ public class InfantryVeteran extends mage.sets.magic2011.InfantryVeteran {
 
     public InfantryVeteran(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Inspirit.java b/Mage.Sets/src/mage/sets/ninthedition/Inspirit.java
index 59c8b2b7a0..c8f629450e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Inspirit.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Inspirit.java
@@ -37,7 +37,7 @@ public class Inspirit extends mage.sets.onslaught.Inspirit {
 
     public Inspirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/JestersCap.java b/Mage.Sets/src/mage/sets/ninthedition/JestersCap.java
index 5d663c6b10..bac208d3e4 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/JestersCap.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/JestersCap.java
@@ -37,7 +37,7 @@ public class JestersCap extends mage.sets.fifthedition.JestersCap {
 
     public JestersCap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/KamiOfOldStone.java b/Mage.Sets/src/mage/sets/ninthedition/KamiOfOldStone.java
index 44c4460159..2d4513de3e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/KamiOfOldStone.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/KamiOfOldStone.java
@@ -37,7 +37,7 @@ public class KamiOfOldStone extends mage.sets.championsofkamigawa.KamiOfOldStone
 
     public KamiOfOldStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/KarplusanForest.java b/Mage.Sets/src/mage/sets/ninthedition/KarplusanForest.java
index 5175f22fc0..656fec7f63 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/KarplusanForest.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/KarplusanForest.java
@@ -37,7 +37,7 @@ public class KarplusanForest extends mage.sets.tenthedition.KarplusanForest {
 
     public KarplusanForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/KarplusanYeti.java b/Mage.Sets/src/mage/sets/ninthedition/KarplusanYeti.java
index 0457497215..bdbd01cdce 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/KarplusanYeti.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/KarplusanYeti.java
@@ -37,7 +37,7 @@ public class KarplusanYeti extends mage.sets.iceage.KarplusanYeti {
 
     public KarplusanYeti(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/KavuClimber.java b/Mage.Sets/src/mage/sets/ninthedition/KavuClimber.java
index ef0c478391..3c480999b7 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/KavuClimber.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/KavuClimber.java
@@ -37,7 +37,7 @@ public class KavuClimber extends mage.sets.tenthedition.KavuClimber {
 
     public KavuClimber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/KrakensEye.java b/Mage.Sets/src/mage/sets/ninthedition/KrakensEye.java
index 60da94816c..bdec596bdb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/KrakensEye.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/KrakensEye.java
@@ -37,7 +37,7 @@ public class KrakensEye extends mage.sets.tenthedition.KrakensEye {
 
     public KrakensEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LavaAxe.java b/Mage.Sets/src/mage/sets/ninthedition/LavaAxe.java
index 39ddabe19e..fb54168808 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/ninthedition/LeoninSkyhunter.java
index d49e13b7c3..34b17d01b3 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LeoninSkyhunter.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LeoninSkyhunter.java
@@ -37,7 +37,7 @@ public class LeoninSkyhunter extends mage.sets.mirrodin.LeoninSkyhunter {
 
     public LeoninSkyhunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Levitation.java b/Mage.Sets/src/mage/sets/ninthedition/Levitation.java
index 4567c63405..3a672dfe77 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Levitation.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Levitation.java
@@ -37,7 +37,7 @@ public class Levitation extends mage.sets.magic2012.Levitation {
 
     public Levitation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LeyDruid.java b/Mage.Sets/src/mage/sets/ninthedition/LeyDruid.java
index 9e82e897e6..85eed0c39c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LeyDruid.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LeyDruid.java
@@ -38,7 +38,7 @@ public class LeyDruid extends mage.sets.limitedalpha.LeyDruid {
 
     public LeyDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LightningElemental.java b/Mage.Sets/src/mage/sets/ninthedition/LightningElemental.java
index 8ff0eec729..805c3d9a30 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LightningElemental.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LightningElemental.java
@@ -37,7 +37,7 @@ public class LightningElemental extends mage.sets.tenthedition.LightningElementa
 
     public LightningElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/ninthedition/LlanowarElves.java
index de06df376f..49aa4e7698 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LlanowarWastes.java b/Mage.Sets/src/mage/sets/ninthedition/LlanowarWastes.java
index 9eeccd7c7b..6d2e7c1fb9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LlanowarWastes.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LlanowarWastes.java
@@ -37,7 +37,7 @@ public class LlanowarWastes extends mage.sets.apocalypse.LlanowarWastes {
 
     public LlanowarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LoomingShade.java b/Mage.Sets/src/mage/sets/ninthedition/LoomingShade.java
index d0c0bff1c5..dbd6552dfe 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LoomingShade.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LoomingShade.java
@@ -37,7 +37,7 @@ public class LoomingShade extends mage.sets.magic2010.LoomingShade {
 
     public LoomingShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LordOfTheUndead.java b/Mage.Sets/src/mage/sets/ninthedition/LordOfTheUndead.java
index 535c4154b5..e6b9e88ccb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LordOfTheUndead.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LordOfTheUndead.java
@@ -37,7 +37,7 @@ public class LordOfTheUndead extends mage.sets.tenthedition.LordOfTheUndead {
 
     public LordOfTheUndead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/ninthedition/LoxodonWarhammer.java
index 8174367968..a97114529e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LoxodonWarhammer.java
@@ -37,7 +37,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
 
     public LoxodonWarhammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/LumengridWarden.java b/Mage.Sets/src/mage/sets/ninthedition/LumengridWarden.java
index 8399d30a93..1fa54833ea 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/LumengridWarden.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/LumengridWarden.java
@@ -37,7 +37,7 @@ public class LumengridWarden extends mage.sets.tenthedition.LumengridWarden {
 
     public LumengridWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/ninthedition/MahamotiDjinn.java
index 137bcf78cf..00175edf58 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ManaClash.java b/Mage.Sets/src/mage/sets/ninthedition/ManaClash.java
index 88a81c6e5e..6b715f2462 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ManaClash.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ManaClash.java
@@ -37,7 +37,7 @@ public class ManaClash extends mage.sets.fourthedition.ManaClash {
 
     public ManaClash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ManaLeak.java b/Mage.Sets/src/mage/sets/ninthedition/ManaLeak.java
index 2f4544c781..1cf54fecb8 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/MarbleTitan.java b/Mage.Sets/src/mage/sets/ninthedition/MarbleTitan.java
index 2b29c52708..c091ee7adc 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/MarbleTitan.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/MarbleTitan.java
@@ -37,7 +37,7 @@ public class MarbleTitan extends mage.sets.tempest.MarbleTitan {
 
     public MarbleTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/MasterDecoy.java b/Mage.Sets/src/mage/sets/ninthedition/MasterDecoy.java
index 8c24bff283..727525405f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/MasterDecoy.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/MasterDecoy.java
@@ -37,7 +37,7 @@ public class MasterDecoy extends mage.sets.tempest.MasterDecoy {
 
     public MasterDecoy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Megrim.java b/Mage.Sets/src/mage/sets/ninthedition/Megrim.java
index ba61656fe8..20983e0ad6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Megrim.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Megrim.java
@@ -37,7 +37,7 @@ public class Megrim extends mage.sets.tenthedition.Megrim {
 
     public Megrim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/MendingHands.java b/Mage.Sets/src/mage/sets/ninthedition/MendingHands.java
index ec0621f5a6..72c03b4a7a 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/MendingHands.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/MendingHands.java
@@ -37,7 +37,7 @@ public class MendingHands extends mage.sets.betrayersofkamigawa.MendingHands {
 
     public MendingHands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/MightOfOaks.java b/Mage.Sets/src/mage/sets/ninthedition/MightOfOaks.java
index 11ec240500..11dd13370e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/MightOfOaks.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/MightOfOaks.java
@@ -37,7 +37,7 @@ public class MightOfOaks extends mage.sets.magic2010.MightOfOaks {
 
     public MightOfOaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Millstone.java b/Mage.Sets/src/mage/sets/ninthedition/Millstone.java
index c6d26d7c62..34e6ac5876 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/MindRot.java b/Mage.Sets/src/mage/sets/ninthedition/MindRot.java
index 10013b0812..a5da01947e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/MindRot.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Mortivore.java b/Mage.Sets/src/mage/sets/ninthedition/Mortivore.java
index 61a8b4cce0..e15515ecb0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Mortivore.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Mortivore.java
@@ -37,7 +37,7 @@ public class Mortivore extends mage.sets.tenthedition.Mortivore {
 
     public Mortivore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/NantukoHusk.java b/Mage.Sets/src/mage/sets/ninthedition/NantukoHusk.java
index dc447e97a4..9966f73105 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/NantukoHusk.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/NantukoHusk.java
@@ -37,7 +37,7 @@ public class NantukoHusk extends mage.sets.tenthedition.NantukoHusk {
 
     public NantukoHusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/NaturalSpring.java b/Mage.Sets/src/mage/sets/ninthedition/NaturalSpring.java
index a8e78f4a3e..f2c5449eb2 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/NaturalSpring.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/NaturalSpring.java
@@ -37,7 +37,7 @@ public class NaturalSpring extends mage.sets.tempest.NaturalSpring {
 
     public NaturalSpring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Naturalize.java b/Mage.Sets/src/mage/sets/ninthedition/Naturalize.java
index f01ed65d1a..2dc766f56d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/NeedleStorm.java b/Mage.Sets/src/mage/sets/ninthedition/NeedleStorm.java
index 6388625288..e0cc8ea858 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/NeedleStorm.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/NeedleStorm.java
@@ -37,7 +37,7 @@ public class NeedleStorm extends mage.sets.tempest.NeedleStorm {
 
     public NeedleStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Nightmare.java b/Mage.Sets/src/mage/sets/ninthedition/Nightmare.java
index 04db57dcc3..ee0adf0e6d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/OraclesAttendants.java b/Mage.Sets/src/mage/sets/ninthedition/OraclesAttendants.java
index c4f5dd586f..2f4c87e844 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/OraclesAttendants.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/OraclesAttendants.java
@@ -37,7 +37,7 @@ public class OraclesAttendants extends mage.sets.nemesis.OraclesAttendants {
 
     public OraclesAttendants(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/ninthedition/OrcishArtillery.java
index 58e51b71b0..fc13bfbf66 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/OrderOfTheSacredBell.java b/Mage.Sets/src/mage/sets/ninthedition/OrderOfTheSacredBell.java
index 8ebbddabe8..81d0ff311d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/OrderOfTheSacredBell.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/OrderOfTheSacredBell.java
@@ -37,7 +37,7 @@ public class OrderOfTheSacredBell extends mage.sets.championsofkamigawa.OrderOfT
 
     public OrderOfTheSacredBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Ornithopter.java b/Mage.Sets/src/mage/sets/ninthedition/Ornithopter.java
index d82de3ba15..0808ed6002 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Ornithopter.java
@@ -37,7 +37,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Overgrowth.java b/Mage.Sets/src/mage/sets/ninthedition/Overgrowth.java
index 1d355687c0..c8abbf29f9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Overgrowth.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Overgrowth.java
@@ -37,7 +37,7 @@ public class Overgrowth extends mage.sets.stronghold.Overgrowth {
 
     public Overgrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Pacifism.java b/Mage.Sets/src/mage/sets/ninthedition/Pacifism.java
index 278ffcde34..c6f09bb332 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PanicAttack.java b/Mage.Sets/src/mage/sets/ninthedition/PanicAttack.java
index 409e5555fe..1099e717b6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PanicAttack.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PanicAttack.java
@@ -37,7 +37,7 @@ public class PanicAttack extends mage.sets.magic2010.PanicAttack {
 
     public PanicAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PegasusCharger.java b/Mage.Sets/src/mage/sets/ninthedition/PegasusCharger.java
index 38305f7d1f..77eb1cca11 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PegasusCharger.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PegasusCharger.java
@@ -37,7 +37,7 @@ public class PegasusCharger extends mage.sets.urzassaga.PegasusCharger {
 
     public PegasusCharger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Persecute.java b/Mage.Sets/src/mage/sets/ninthedition/Persecute.java
index d644312640..cb42b92c02 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Persecute.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Persecute.java
@@ -37,7 +37,7 @@ public class Persecute extends mage.sets.urzassaga.Persecute {
 
     public Persecute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PhantomWarrior.java b/Mage.Sets/src/mage/sets/ninthedition/PhantomWarrior.java
index 1a5e92af47..224a4dd199 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianArena.java b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianArena.java
index 72b2b9b2cc..6628aa9ca5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianArena.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianArena.java
@@ -37,7 +37,7 @@ public class PhyrexianArena extends mage.sets.apocalypse.PhyrexianArena {
 
     public PhyrexianArena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianGargantua.java
index 15b805c90c..ee5d7af7ec 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianGargantua.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianGargantua.java
@@ -37,7 +37,7 @@ public class PhyrexianGargantua extends mage.sets.apocalypse.PhyrexianGargantua
 
     public PhyrexianGargantua(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java
index b05a7075d7..ceb3d84748 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PlagueBeetle.java b/Mage.Sets/src/mage/sets/ninthedition/PlagueBeetle.java
index 75ef5e33b9..7ace63a3ae 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PlagueBeetle.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PlagueBeetle.java
@@ -37,7 +37,7 @@ public class PlagueBeetle extends mage.sets.tenthedition.PlagueBeetle {
 
     public PlagueBeetle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/PlagueWind.java b/Mage.Sets/src/mage/sets/ninthedition/PlagueWind.java
index eeb031c60f..b98bc33a09 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/PlagueWind.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/PlagueWind.java
@@ -37,7 +37,7 @@ public class PlagueWind extends mage.sets.prophecy.PlagueWind {
 
     public PlagueWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Polymorph.java b/Mage.Sets/src/mage/sets/ninthedition/Polymorph.java
index 92a8f90b90..b9d09c6a4c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Polymorph.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Polymorph.java
@@ -37,7 +37,7 @@ public class Polymorph extends mage.sets.magic2010.Polymorph {
 
     public Polymorph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Puppeteer.java b/Mage.Sets/src/mage/sets/ninthedition/Puppeteer.java
index c071ff3d81..a022bc3831 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Puppeteer.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Puppeteer.java
@@ -37,7 +37,7 @@ public class Puppeteer extends mage.sets.tenthedition.Puppeteer {
 
     public Puppeteer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Pyroclasm.java b/Mage.Sets/src/mage/sets/ninthedition/Pyroclasm.java
index c9cbc8965b..18edbdcf5b 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Pyroclasm.java
@@ -37,7 +37,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Quicksand.java b/Mage.Sets/src/mage/sets/ninthedition/Quicksand.java
index f57a9a926b..b15f2e69fb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Quicksand.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Quicksand.java
@@ -37,7 +37,7 @@ public class Quicksand extends mage.sets.tenthedition.Quicksand {
 
     public Quicksand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RagingGoblin.java b/Mage.Sets/src/mage/sets/ninthedition/RagingGoblin.java
index 08425bd145..b2a6f61fbe 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RaiseDead.java b/Mage.Sets/src/mage/sets/ninthedition/RaiseDead.java
index 77ad624327..0c3579e9fe 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RampantGrowth.java b/Mage.Sets/src/mage/sets/ninthedition/RampantGrowth.java
index 67ef040618..b47d3e6981 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RavenousRats.java b/Mage.Sets/src/mage/sets/ninthedition/RavenousRats.java
index e39d5a55ae..cb1e3081c4 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Reclaim.java b/Mage.Sets/src/mage/sets/ninthedition/Reclaim.java
index a31b285206..fa97ad16e2 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Reclaim.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Reclaim.java
@@ -37,7 +37,7 @@ public class Reclaim extends mage.sets.magic2012.Reclaim {
 
     public Reclaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Reflexes.java b/Mage.Sets/src/mage/sets/ninthedition/Reflexes.java
index 5af49b58d3..0dd50ee90a 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Reflexes.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Reflexes.java
@@ -37,7 +37,7 @@ public class Reflexes extends mage.sets.urzassaga.Reflexes {
 
     public Reflexes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java b/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java
index 9a79d77249..05b95473cc 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java
@@ -38,7 +38,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/ninthedition/RelentlessAssault.java
index d5b7ee20d0..b09ca1f806 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Reminisce.java b/Mage.Sets/src/mage/sets/ninthedition/Reminisce.java
index 2f4eb0b3f7..8e5075fd3c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Reminisce.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Reminisce.java
@@ -37,7 +37,7 @@ public class Reminisce extends mage.sets.onslaught.Reminisce {
 
     public Reminisce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/ninthedition/RemoveSoul.java
index 6472a9afab..89cbaf6615 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ReverseDamage.java b/Mage.Sets/src/mage/sets/ninthedition/ReverseDamage.java
index 1b8e662197..974b17fa30 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Rewind.java b/Mage.Sets/src/mage/sets/ninthedition/Rewind.java
index a3bd5f13ed..a4aa6291bc 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Rewind.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Rewind.java
@@ -38,7 +38,7 @@ public class Rewind extends mage.sets.urzassaga.Rewind {
 
     public Rewind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Righteousness.java b/Mage.Sets/src/mage/sets/ninthedition/Righteousness.java
index 94325fd4f5..327a660321 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/ninthedition/RodOfRuin.java
index 19418425ce..b164acb1fe 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java b/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java
index 7f2d312ccc..313df75286 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java
@@ -38,7 +38,7 @@ public class RootbreakerWurm extends mage.sets.tempest.RootbreakerWurm {
 
     public RootbreakerWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Rootwalla.java b/Mage.Sets/src/mage/sets/ninthedition/Rootwalla.java
index 0db3a2b752..a89d170378 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Rootwalla.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Rootwalla.java
@@ -37,7 +37,7 @@ public class Rootwalla extends mage.sets.tempest.Rootwalla {
 
     public Rootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RoyalAssassin.java b/Mage.Sets/src/mage/sets/ninthedition/RoyalAssassin.java
index 81fd9d3947..8000c6c282 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/RukhEgg.java b/Mage.Sets/src/mage/sets/ninthedition/RukhEgg.java
index 4afbb0214e..ef10892540 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/RukhEgg.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/RukhEgg.java
@@ -38,7 +38,7 @@ public class RukhEgg extends mage.sets.arabiannights.RukhEgg1 {
 
     public RukhEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SacredGround.java b/Mage.Sets/src/mage/sets/ninthedition/SacredGround.java
index 4eda302d31..4703b13854 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SacredGround.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SacredGround.java
@@ -37,7 +37,7 @@ public class SacredGround extends mage.sets.stronghold.SacredGround {
 
     public SacredGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/ninthedition/SamiteHealer.java
index 59f3c16b39..41890ab76e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SandstoneWarrior.java b/Mage.Sets/src/mage/sets/ninthedition/SandstoneWarrior.java
index d24361b54c..60157b21bb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SandstoneWarrior.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SandstoneWarrior.java
@@ -37,7 +37,7 @@ public class SandstoneWarrior extends mage.sets.tempest.SandstoneWarrior {
 
     public SandstoneWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SavannahLions.java b/Mage.Sets/src/mage/sets/ninthedition/SavannahLions.java
index 9c3b330ae6..4d95ab6890 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SavannahLions.java
@@ -37,7 +37,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/ninthedition/ScatheZombies.java
index b727fbeb83..9e31d706ca 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SeaMonster.java b/Mage.Sets/src/mage/sets/ninthedition/SeaMonster.java
index 768998b649..90d76b4793 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SeaMonster.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SeaMonster.java
@@ -37,7 +37,7 @@ public class SeaMonster extends mage.sets.tempest.SeaMonster {
 
     public SeaMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SeasClaim.java b/Mage.Sets/src/mage/sets/ninthedition/SeasClaim.java
index ffcaeb7502..9f083b1294 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SeasClaim.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SeasClaim.java
@@ -37,7 +37,7 @@ public class SeasClaim extends mage.sets.onslaught.SeasClaim {
 
     public SeasClaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/ninthedition/SeasonedMarshal.java
index 506ddcc209..69791c4b95 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SeasonedMarshal.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SeasonedMarshal.java
@@ -37,7 +37,7 @@ public class SeasonedMarshal extends mage.sets.elspethvstezzeret.SeasonedMarshal
 
     public SeasonedMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SeethingSong.java b/Mage.Sets/src/mage/sets/ninthedition/SeethingSong.java
index 2577f7a74c..01ffdca0d0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SeethingSong.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SeethingSong.java
@@ -37,7 +37,7 @@ public class SeethingSong extends mage.sets.mirrodin.SeethingSong {
 
     public SeethingSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SengirVampire.java b/Mage.Sets/src/mage/sets/ninthedition/SengirVampire.java
index 2b3d4280bc..27fa30f9d9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SengirVampire.java
@@ -37,7 +37,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SerpentWarrior.java b/Mage.Sets/src/mage/sets/ninthedition/SerpentWarrior.java
index 6767a69c7a..0bedbd1d89 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SerpentWarrior.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SerpentWarrior.java
@@ -37,7 +37,7 @@ public class SerpentWarrior extends mage.sets.stronghold.SerpentWarrior {
 
     public SerpentWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SerraAngel.java b/Mage.Sets/src/mage/sets/ninthedition/SerraAngel.java
index 4b3eb327fb..34a80dea2f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SerraAngel.java
@@ -37,7 +37,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ShardPhoenix.java b/Mage.Sets/src/mage/sets/ninthedition/ShardPhoenix.java
index bade537e79..b2aca4999d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ShardPhoenix.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ShardPhoenix.java
@@ -38,7 +38,7 @@ public class ShardPhoenix extends mage.sets.tempestremastered.ShardPhoenix {
 
     public ShardPhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Shatter.java b/Mage.Sets/src/mage/sets/ninthedition/Shatter.java
index e059eac971..d4d7585c09 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ShivanDragon.java b/Mage.Sets/src/mage/sets/ninthedition/ShivanDragon.java
index 44f4f4d24c..a654913188 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ShivanReef.java b/Mage.Sets/src/mage/sets/ninthedition/ShivanReef.java
index c7dead56aa..db4b2a6f20 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ShivanReef.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ShivanReef.java
@@ -37,7 +37,7 @@ public class ShivanReef extends mage.sets.apocalypse.ShivanReef {
 
     public ShivanReef(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Shock.java b/Mage.Sets/src/mage/sets/ninthedition/Shock.java
index a42b3b7759..13c204393f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Shock.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Sift.java b/Mage.Sets/src/mage/sets/ninthedition/Sift.java
index 9011f59567..9ddf8d216c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Sift.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Sift.java
@@ -37,7 +37,7 @@ public class Sift extends mage.sets.tenthedition.Sift {
 
     public Sift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SilklashSpider.java b/Mage.Sets/src/mage/sets/ninthedition/SilklashSpider.java
index c0dd8ce544..296285df03 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SilklashSpider.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SilklashSpider.java
@@ -37,7 +37,7 @@ public class SilklashSpider extends mage.sets.onslaught.SilklashSpider {
 
     public SilklashSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SkyhunterProwler.java b/Mage.Sets/src/mage/sets/ninthedition/SkyhunterProwler.java
index 7cb6d10ae7..8aae2edef0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SkyhunterProwler.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SkyhunterProwler.java
@@ -37,7 +37,7 @@ public class SkyhunterProwler extends mage.sets.tenthedition.SkyhunterProwler {
 
     public SkyhunterProwler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SlateOfAncestry.java b/Mage.Sets/src/mage/sets/ninthedition/SlateOfAncestry.java
index f9ad38c5b5..d8a4297c12 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SlateOfAncestry.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SlateOfAncestry.java
@@ -37,7 +37,7 @@ public class SlateOfAncestry extends mage.sets.onslaught.SlateOfAncestry {
 
     public SlateOfAncestry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SoulFeast.java b/Mage.Sets/src/mage/sets/ninthedition/SoulFeast.java
index b4c71d3eab..4d93d8a03a 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SoulFeast.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SoulFeast.java
@@ -37,7 +37,7 @@ public class SoulFeast extends mage.sets.tenthedition.SoulFeast {
 
     public SoulFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java b/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java
index 8eed45a05a..05627903a0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java
@@ -38,7 +38,7 @@ public class SoulWarden extends mage.sets.magic2010.SoulWarden {
 
     public SoulWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Spellbook.java b/Mage.Sets/src/mage/sets/ninthedition/Spellbook.java
index bb37a6f912..ef0365cc70 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Spellbook.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Spellbook.java
@@ -37,7 +37,7 @@ public class Spellbook extends mage.sets.magic2010.Spellbook {
 
     public Spellbook(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SpinedWurm.java b/Mage.Sets/src/mage/sets/ninthedition/SpinedWurm.java
index c8492fec4f..3849c385e3 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SpinelessThug.java b/Mage.Sets/src/mage/sets/ninthedition/SpinelessThug.java
index 9c16367dec..9e98ed3d84 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SpinelessThug.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SpinelessThug.java
@@ -37,7 +37,7 @@ public class SpinelessThug extends mage.sets.tenthedition.SpinelessThug {
 
     public SpinelessThug(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/ninthedition/SpiritLink.java
index ff2d206d1a..23cc5a032e 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/StoneRain.java b/Mage.Sets/src/mage/sets/ninthedition/StoneRain.java
index 92df3f98a9..0c61a47674 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/StoryCircle.java b/Mage.Sets/src/mage/sets/ninthedition/StoryCircle.java
index a0124603f0..5056945db0 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/StoryCircle.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/StoryCircle.java
@@ -39,7 +39,7 @@ public class StoryCircle extends mage.sets.mercadianmasques.StoryCircle {
 
     public StoryCircle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java
index 81687844c9..a7e7ec1faf 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java
@@ -38,7 +38,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SuddenImpact.java b/Mage.Sets/src/mage/sets/ninthedition/SuddenImpact.java
index 44a2d4d500..c1559ad2dd 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SuddenImpact.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SuddenImpact.java
@@ -37,7 +37,7 @@ public class SuddenImpact extends mage.sets.seventhedition.SuddenImpact {
 
     public SuddenImpact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SulfurousSprings.java b/Mage.Sets/src/mage/sets/ninthedition/SulfurousSprings.java
index 69ef308f27..aaee878c6f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SulfurousSprings.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SulfurousSprings.java
@@ -37,7 +37,7 @@ public class SulfurousSprings extends mage.sets.tenthedition.SulfurousSprings {
 
     public SulfurousSprings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/SuntailHawk.java b/Mage.Sets/src/mage/sets/ninthedition/SuntailHawk.java
index 14dee387a2..3b8e912762 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/SuntailHawk.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/SuntailHawk.java
@@ -37,7 +37,7 @@ public class SuntailHawk extends mage.sets.tenthedition.SuntailHawk {
 
     public SuntailHawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java b/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java
index 2c532e1c00..737cdda883 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java
@@ -38,7 +38,7 @@ public class Tanglebloom extends mage.sets.mirrodin.Tanglebloom {
 
     public Tanglebloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Telepathy.java b/Mage.Sets/src/mage/sets/ninthedition/Telepathy.java
index 8b7735e050..f6e23fb847 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Telepathy.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Telepathy.java
@@ -36,7 +36,7 @@ public class Telepathy extends mage.sets.urzassaga.Telepathy {
 
     public Telepathy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/TempestOfLight.java b/Mage.Sets/src/mage/sets/ninthedition/TempestOfLight.java
index f59a08ed68..24343d7e7f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/TempestOfLight.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/TempestOfLight.java
@@ -37,7 +37,7 @@ public class TempestOfLight extends mage.sets.magic2010.TempestOfLight {
 
     public TempestOfLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java b/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java
index 327b04157d..b1e5eabcb1 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java
@@ -38,7 +38,7 @@ public class ThranGolem extends mage.sets.magic2012.ThranGolem {
 
     public ThranGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Threaten.java b/Mage.Sets/src/mage/sets/ninthedition/Threaten.java
index 43fc0054d4..80fcf347eb 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Threaten.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Threaten.java
@@ -37,7 +37,7 @@ public class Threaten extends mage.sets.tenthedition.Threaten {
 
     public Threaten(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Thundermare.java b/Mage.Sets/src/mage/sets/ninthedition/Thundermare.java
index ba29f13f36..4b8824eb96 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Thundermare.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Thundermare.java
@@ -37,7 +37,7 @@ public class Thundermare extends mage.sets.portal.Thundermare {
 
     public Thundermare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Tidings.java b/Mage.Sets/src/mage/sets/ninthedition/Tidings.java
index b5076e200a..b58e2675c5 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Tidings.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Tidings.java
@@ -37,7 +37,7 @@ public class Tidings extends mage.sets.tenthedition.Tidings {
 
     public Tidings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/TimeEbb.java b/Mage.Sets/src/mage/sets/ninthedition/TimeEbb.java
index 3f4fb522be..ad0d1ec4e4 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/TrainedArmodon.java b/Mage.Sets/src/mage/sets/ninthedition/TrainedArmodon.java
index 9237a80c40..0e35a00ac6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/TrainedArmodon.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/TrainedArmodon.java
@@ -37,7 +37,7 @@ public class TrainedArmodon extends mage.sets.tempest.TrainedArmodon {
 
     public TrainedArmodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Traumatize.java b/Mage.Sets/src/mage/sets/ninthedition/Traumatize.java
index 479143290c..78875ed43c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Traumatize.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Traumatize.java
@@ -37,7 +37,7 @@ public class Traumatize extends mage.sets.tenthedition.Traumatize {
 
     public Traumatize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java b/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java
index f0edc6f95f..4dcee5c0ca 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java
@@ -38,7 +38,7 @@ public class TreetopBracers extends mage.sets.nemesis.TreetopBracers {
 
     public TreetopBracers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UndergroundRiver.java b/Mage.Sets/src/mage/sets/ninthedition/UndergroundRiver.java
index 1a7e6d2048..23aa658233 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UndergroundRiver.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UndergroundRiver.java
@@ -37,7 +37,7 @@ public class UndergroundRiver extends mage.sets.tenthedition.UndergroundRiver {
 
     public UndergroundRiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 326;
+        this.cardNumber = "326";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UnderworldDreams.java b/Mage.Sets/src/mage/sets/ninthedition/UnderworldDreams.java
index a8becebedc..be7919a5f8 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UnderworldDreams.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UnderworldDreams.java
@@ -37,7 +37,7 @@ public class UnderworldDreams extends mage.sets.magic2010.UnderworldDreams {
 
     public UnderworldDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UnholyStrength.java b/Mage.Sets/src/mage/sets/ninthedition/UnholyStrength.java
index 79208a400d..26645db80f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java b/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java
index 932b1f23b3..5e15be2ccf 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java
@@ -38,7 +38,7 @@ public class UrGolemsEye extends mage.sets.darksteel.UrGolemsEye {
 
     public UrGolemsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UrzasMine.java b/Mage.Sets/src/mage/sets/ninthedition/UrzasMine.java
index e3b466eeb2..e706bc9b53 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UrzasMine.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UrzasMine.java
@@ -37,7 +37,7 @@ public class UrzasMine extends mage.sets.fifthedition.UrzasMine {
 
     public UrzasMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 327;
+        this.cardNumber = "327";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UrzasPowerPlant.java b/Mage.Sets/src/mage/sets/ninthedition/UrzasPowerPlant.java
index 8bf90b3947..cd6cc1781c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UrzasPowerPlant.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UrzasPowerPlant.java
@@ -37,7 +37,7 @@ public class UrzasPowerPlant extends mage.sets.fifthedition.UrzasPowerPlant {
 
     public UrzasPowerPlant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 328;
+        this.cardNumber = "328";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UrzasTower.java b/Mage.Sets/src/mage/sets/ninthedition/UrzasTower.java
index e584e1cddb..67520ac1ce 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UrzasTower.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UrzasTower.java
@@ -37,7 +37,7 @@ public class UrzasTower extends mage.sets.fifthedition.UrzasTower {
 
     public UrzasTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 329;
+        this.cardNumber = "329";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/UtopiaTree.java b/Mage.Sets/src/mage/sets/ninthedition/UtopiaTree.java
index 98163f7e06..5c74e08bd6 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/UtopiaTree.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/UtopiaTree.java
@@ -37,7 +37,7 @@ public class UtopiaTree extends mage.sets.invasion.UtopiaTree {
 
     public UtopiaTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/VenerableMonk.java b/Mage.Sets/src/mage/sets/ninthedition/VenerableMonk.java
index 94b3e16c86..1b869bca80 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Vengeance.java b/Mage.Sets/src/mage/sets/ninthedition/Vengeance.java
index b2bbaee444..92baeadc31 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Vengeance.java
@@ -37,7 +37,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance {
 
     public Vengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/VerdantForce.java b/Mage.Sets/src/mage/sets/ninthedition/VerdantForce.java
index 56573a3a0f..f74515a862 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/VerdantForce.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/VerdantForce.java
@@ -37,7 +37,7 @@ public class VerdantForce extends mage.sets.tempest.VerdantForce {
 
     public VerdantForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/ninthedition/VerduranEnchantress.java
index 86f0a7fefd..89e9070cd2 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ViridianShaman.java b/Mage.Sets/src/mage/sets/ninthedition/ViridianShaman.java
index 016b876687..9aed69f437 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ViridianShaman.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ViridianShaman.java
@@ -37,7 +37,7 @@ public class ViridianShaman extends mage.sets.tenthedition.ViridianShaman {
 
     public ViridianShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Vizzerdrix.java b/Mage.Sets/src/mage/sets/ninthedition/Vizzerdrix.java
index 9addd5baea..2b4142d992 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Vizzerdrix.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Vizzerdrix.java
@@ -37,7 +37,7 @@ public class Vizzerdrix extends mage.sets.seventhedition.Vizzerdrix {
 
     public Vizzerdrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java b/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java
index 498b2a46ff..94c716643f 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java
@@ -38,7 +38,7 @@ public class VulshokMorningstar extends mage.sets.darksteel.VulshokMorningstar {
 
     public VulshokMorningstar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WarriorsHonor.java b/Mage.Sets/src/mage/sets/ninthedition/WarriorsHonor.java
index 21846b25b8..efe0b3e071 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WarriorsHonor.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WarriorsHonor.java
@@ -37,7 +37,7 @@ public class WarriorsHonor extends mage.sets.tenthedition.WarriorsHonor {
 
     public WarriorsHonor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WeatheredWayfarer.java b/Mage.Sets/src/mage/sets/ninthedition/WeatheredWayfarer.java
index 410005dede..bbc98dd47d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WeatheredWayfarer.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WeatheredWayfarer.java
@@ -37,7 +37,7 @@ public class WeatheredWayfarer extends mage.sets.onslaught.WeatheredWayfarer {
 
     public WeatheredWayfarer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Web.java b/Mage.Sets/src/mage/sets/ninthedition/Web.java
index 3b1c6ba002..5a583c3f11 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Web.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Web.java
@@ -39,7 +39,7 @@ public class Web extends mage.sets.limitedalpha.Web {
 
     public Web(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "9ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WeirdHarvest.java b/Mage.Sets/src/mage/sets/ninthedition/WeirdHarvest.java
index d80d1392f7..db2bbef796 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WeirdHarvest.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WeirdHarvest.java
@@ -37,7 +37,7 @@ public class WeirdHarvest extends mage.sets.onslaught.WeirdHarvest {
 
     public WeirdHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WhipSergeant.java b/Mage.Sets/src/mage/sets/ninthedition/WhipSergeant.java
index a3fea56c26..591df88cd9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WhipSergeant.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WhipSergeant.java
@@ -37,7 +37,7 @@ public class WhipSergeant extends mage.sets.prophecy.WhipSergeant {
 
     public WhipSergeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Wildfire.java b/Mage.Sets/src/mage/sets/ninthedition/Wildfire.java
index 3d9d5bf1f6..69ad23e91a 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Wildfire.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Wildfire.java
@@ -37,7 +37,7 @@ public class Wildfire extends mage.sets.urzassaga.Wildfire {
 
     public Wildfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WillOTheWisp.java b/Mage.Sets/src/mage/sets/ninthedition/WillOTheWisp.java
index 7c09ba6f01..37e59aaac9 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WillOTheWisp.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WillOTheWisp.java
@@ -37,7 +37,7 @@ public class WillOTheWisp extends mage.sets.limitedalpha.WillOTheWisp {
 
     public WillOTheWisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WindDrake.java b/Mage.Sets/src/mage/sets/ninthedition/WindDrake.java
index eaf4ba8304..471df318ed 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WitheringGaze.java b/Mage.Sets/src/mage/sets/ninthedition/WitheringGaze.java
index 9027e85181..9414eeb46d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WitheringGaze.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WitheringGaze.java
@@ -38,7 +38,7 @@ public class WitheringGaze extends mage.sets.portal.WitheringGaze {
 
     public WitheringGaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Worship.java b/Mage.Sets/src/mage/sets/ninthedition/Worship.java
index 54aff434f9..9d6d38c088 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Worship.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Worship.java
@@ -38,7 +38,7 @@ public class Worship extends mage.sets.urzassaga.Worship {
 
     public Worship(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/ninthedition/WrathOfGod.java
index f6ff83fddf..75358a98b2 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/WurmsTooth.java b/Mage.Sets/src/mage/sets/ninthedition/WurmsTooth.java
index 2954cb1447..fd4db6b2bf 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/WurmsTooth.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/WurmsTooth.java
@@ -37,7 +37,7 @@ public class WurmsTooth extends mage.sets.tenthedition.WurmsTooth {
 
     public WurmsTooth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/YavimayaCoast.java b/Mage.Sets/src/mage/sets/ninthedition/YavimayaCoast.java
index 937395af29..df6b157fd7 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/YavimayaCoast.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/YavimayaCoast.java
@@ -37,7 +37,7 @@ public class YavimayaCoast extends mage.sets.apocalypse.YavimayaCoast {
 
     public YavimayaCoast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 330;
+        this.cardNumber = "330";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/ninthedition/YavimayaEnchantress.java
index 516651f975..048fba6d0d 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/YavimayaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/YavimayaEnchantress.java
@@ -37,7 +37,7 @@ public class YavimayaEnchantress extends mage.sets.tenthedition.YavimayaEnchantr
 
     public YavimayaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ZursWeirding.java b/Mage.Sets/src/mage/sets/ninthedition/ZursWeirding.java
index bc05aa8f53..80e99733ce 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ZursWeirding.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ZursWeirding.java
@@ -37,7 +37,7 @@ public class ZursWeirding extends mage.sets.iceage.ZursWeirding {
 
     public ZursWeirding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "9ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/BoneSaw.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/BoneSaw.java
index 8300bc8c7c..76f83a29b2 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/BoneSaw.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/BoneSaw.java
@@ -37,7 +37,7 @@ public class BoneSaw extends mage.sets.conflux.BoneSaw {
 
     public BoneSaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "OGW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/GraspOfDarkness.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/GraspOfDarkness.java
index 11191f35f9..65bb964073 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/GraspOfDarkness.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/GraspOfDarkness.java
@@ -38,7 +38,7 @@ public class GraspOfDarkness extends mage.sets.scarsofmirrodin.GraspOfDarkness {
 
     public GraspOfDarkness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "OGW";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/MightyLeap.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/MightyLeap.java
index 89387a2931..e634444895 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/MightyLeap.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/MightyLeap.java
@@ -37,7 +37,7 @@ public class MightyLeap extends mage.sets.magic2011.MightyLeap {
 
     public MightyLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "OGW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/Negate.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/Negate.java
index 069782b75e..112aa3dc06 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/Negate.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/Negate.java
@@ -37,7 +37,7 @@ public class Negate extends mage.sets.magic2010.Negate {
 
     public Negate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "OGW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/NetcasterSpider.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/NetcasterSpider.java
index 2dd39b5f67..40b1b1bf67 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/NetcasterSpider.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/NetcasterSpider.java
@@ -37,7 +37,7 @@ public class NetcasterSpider extends mage.sets.magic2015.NetcasterSpider {
 
     public NetcasterSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "OGW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/StriderHarness.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/StriderHarness.java
index ba35ddc093..182d152c53 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/StriderHarness.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/StriderHarness.java
@@ -38,7 +38,7 @@ public class StriderHarness extends mage.sets.scarsofmirrodin.StriderHarness {
 
     public StriderHarness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "OGW";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/UnknownShores.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/UnknownShores.java
index 1a8a97f9f1..6527f6e31b 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/UnknownShores.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/UnknownShores.java
@@ -37,7 +37,7 @@ public class UnknownShores extends mage.sets.theros.UnknownShores {
 
     public UnknownShores(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "OGW";
     }
 
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/Wastes2.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/Wastes2.java
index 68fa14eb9f..e3dae161bb 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/Wastes2.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/Wastes2.java
@@ -37,7 +37,7 @@ public class Wastes2 extends mage.sets.oathofthegatewatch.Wastes1 {
 
     public Wastes2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
     }
 
     public Wastes2(final Wastes2 card) {
diff --git a/Mage.Sets/src/mage/sets/odyssey/Afflict.java b/Mage.Sets/src/mage/sets/odyssey/Afflict.java
index b92f382cd4..5d5c0cf3c7 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Afflict.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Afflict.java
@@ -37,7 +37,7 @@ public class Afflict extends mage.sets.tenthedition.Afflict {
 
     public Afflict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Anarchist.java b/Mage.Sets/src/mage/sets/odyssey/Anarchist.java
index f1d3be2f0e..e1e5c89fac 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Anarchist.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Anarchist.java
@@ -38,7 +38,7 @@ public class Anarchist extends mage.sets.ninthedition.Anarchist {
 
     public Anarchist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/AngelicWall.java b/Mage.Sets/src/mage/sets/odyssey/AngelicWall.java
index 58cd5e1c11..9a275f389c 100644
--- a/Mage.Sets/src/mage/sets/odyssey/AngelicWall.java
+++ b/Mage.Sets/src/mage/sets/odyssey/AngelicWall.java
@@ -37,7 +37,7 @@ public class AngelicWall extends mage.sets.tenthedition.AngelicWall {
 
     public AngelicWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/AuraGraft.java b/Mage.Sets/src/mage/sets/odyssey/AuraGraft.java
index dbffe22f68..d7fd30d434 100644
--- a/Mage.Sets/src/mage/sets/odyssey/AuraGraft.java
+++ b/Mage.Sets/src/mage/sets/odyssey/AuraGraft.java
@@ -37,7 +37,7 @@ public class AuraGraft extends mage.sets.tenthedition.AuraGraft {
 
     public AuraGraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Auramancer.java b/Mage.Sets/src/mage/sets/odyssey/Auramancer.java
index 03b41881dc..732168bbdd 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Auramancer.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Auramancer.java
@@ -37,7 +37,7 @@ public class Auramancer extends mage.sets.magic2012.Auramancer {
 
     public Auramancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/odyssey/AvenCloudchaser.java
index 7e81426d0f..58422a98bd 100644
--- a/Mage.Sets/src/mage/sets/odyssey/AvenCloudchaser.java
+++ b/Mage.Sets/src/mage/sets/odyssey/AvenCloudchaser.java
@@ -37,7 +37,7 @@ public class AvenCloudchaser extends mage.sets.tenthedition.AvenCloudchaser {
 
     public AvenCloudchaser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/AvenFisher.java b/Mage.Sets/src/mage/sets/odyssey/AvenFisher.java
index 7562123d04..1cc2bde986 100644
--- a/Mage.Sets/src/mage/sets/odyssey/AvenFisher.java
+++ b/Mage.Sets/src/mage/sets/odyssey/AvenFisher.java
@@ -37,7 +37,7 @@ public class AvenFisher extends mage.sets.tenthedition.AvenFisher {
 
     public AvenFisher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/AvenFlock.java b/Mage.Sets/src/mage/sets/odyssey/AvenFlock.java
index f1643b33ee..c270fa085c 100644
--- a/Mage.Sets/src/mage/sets/odyssey/AvenFlock.java
+++ b/Mage.Sets/src/mage/sets/odyssey/AvenFlock.java
@@ -37,7 +37,7 @@ public class AvenFlock extends mage.sets.ninthedition.AvenFlock {
 
     public AvenFlock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/AvenWindreader.java b/Mage.Sets/src/mage/sets/odyssey/AvenWindreader.java
index 03f947347f..dffcc457ac 100644
--- a/Mage.Sets/src/mage/sets/odyssey/AvenWindreader.java
+++ b/Mage.Sets/src/mage/sets/odyssey/AvenWindreader.java
@@ -37,7 +37,7 @@ public class AvenWindreader extends mage.sets.ninthedition.AvenWindreader {
 
     public AvenWindreader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/BattleOfWits.java b/Mage.Sets/src/mage/sets/odyssey/BattleOfWits.java
index b4c7ae993c..1e32de7f3b 100644
--- a/Mage.Sets/src/mage/sets/odyssey/BattleOfWits.java
+++ b/Mage.Sets/src/mage/sets/odyssey/BattleOfWits.java
@@ -37,7 +37,7 @@ public class BattleOfWits extends mage.sets.ninthedition.BattleOfWits {
 
     public BattleOfWits(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/BlessedOrator.java b/Mage.Sets/src/mage/sets/odyssey/BlessedOrator.java
index 5e954868c6..ab75a095ab 100644
--- a/Mage.Sets/src/mage/sets/odyssey/BlessedOrator.java
+++ b/Mage.Sets/src/mage/sets/odyssey/BlessedOrator.java
@@ -37,7 +37,7 @@ public class BlessedOrator extends mage.sets.ninthedition.BlessedOrator {
 
     public BlessedOrator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/BuriedAlive.java b/Mage.Sets/src/mage/sets/odyssey/BuriedAlive.java
index 158736dfeb..ec04e2a2f5 100644
--- a/Mage.Sets/src/mage/sets/odyssey/BuriedAlive.java
+++ b/Mage.Sets/src/mage/sets/odyssey/BuriedAlive.java
@@ -37,7 +37,7 @@ public class BuriedAlive extends mage.sets.commander.BuriedAlive {
 
     public BuriedAlive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java b/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java
index 7129bf0693..c226a0fd8e 100644
--- a/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java
+++ b/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java
@@ -38,7 +38,7 @@ public class CallOfTheHerd extends mage.sets.timeshifted.CallOfTheHerd {
 
     public CallOfTheHerd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/Cartographer.java b/Mage.Sets/src/mage/sets/odyssey/Cartographer.java
index 96cf15a7c6..c8fbe23fdc 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Cartographer.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Cartographer.java
@@ -38,7 +38,7 @@ public class Cartographer extends mage.sets.exodus.Cartographer {
 
     public Cartographer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/CryptCreeper.java b/Mage.Sets/src/mage/sets/odyssey/CryptCreeper.java
index fbd3bd48b8..38d8b0a7b5 100644
--- a/Mage.Sets/src/mage/sets/odyssey/CryptCreeper.java
+++ b/Mage.Sets/src/mage/sets/odyssey/CryptCreeper.java
@@ -37,7 +37,7 @@ public class CryptCreeper extends mage.sets.avacynrestored.CryptCreeper {
 
     public CryptCreeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Deluge.java b/Mage.Sets/src/mage/sets/odyssey/Deluge.java
index 13258e44f0..bff1eef4db 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Deluge.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Deluge.java
@@ -37,7 +37,7 @@ public class Deluge extends mage.sets.tenthedition.Deluge {
 
     public Deluge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Demolish.java b/Mage.Sets/src/mage/sets/odyssey/Demolish.java
index 8b1cba8f35..04f75fc7c9 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Demolish.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Demolish.java
@@ -38,7 +38,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/DiabolicTutor.java b/Mage.Sets/src/mage/sets/odyssey/DiabolicTutor.java
index 96e48d1206..361101ebb6 100644
--- a/Mage.Sets/src/mage/sets/odyssey/DiabolicTutor.java
+++ b/Mage.Sets/src/mage/sets/odyssey/DiabolicTutor.java
@@ -37,7 +37,7 @@ public class DiabolicTutor extends mage.sets.tenthedition.DiabolicTutor {
 
     public DiabolicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/DuskImp.java b/Mage.Sets/src/mage/sets/odyssey/DuskImp.java
index 56ba57b101..0142c95f0a 100644
--- a/Mage.Sets/src/mage/sets/odyssey/DuskImp.java
+++ b/Mage.Sets/src/mage/sets/odyssey/DuskImp.java
@@ -37,7 +37,7 @@ public class DuskImp extends mage.sets.tenthedition.DuskImp {
 
     public DuskImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/EmberBeast.java b/Mage.Sets/src/mage/sets/odyssey/EmberBeast.java
index b1ef141ea5..bb63bfe0a2 100644
--- a/Mage.Sets/src/mage/sets/odyssey/EmberBeast.java
+++ b/Mage.Sets/src/mage/sets/odyssey/EmberBeast.java
@@ -37,7 +37,7 @@ public class EmberBeast extends mage.sets.gatecrash.EmberBeast {
 
     public EmberBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Execute.java b/Mage.Sets/src/mage/sets/odyssey/Execute.java
index 0207f43def..656237860b 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Execute.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Execute.java
@@ -37,7 +37,7 @@ public class Execute extends mage.sets.ninthedition.Execute {
 
     public Execute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Gallantry.java b/Mage.Sets/src/mage/sets/odyssey/Gallantry.java
index 5c70b88e33..8dbcbcbc68 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Gallantry.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Gallantry.java
@@ -37,7 +37,7 @@ public class Gallantry extends mage.sets.tempest.Gallantry {
 
     public Gallantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Gravedigger.java b/Mage.Sets/src/mage/sets/odyssey/Gravedigger.java
index c5fd8a6d71..05fda7a4b6 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/GroundSeal.java b/Mage.Sets/src/mage/sets/odyssey/GroundSeal.java
index ab29401c00..2aed6108af 100644
--- a/Mage.Sets/src/mage/sets/odyssey/GroundSeal.java
+++ b/Mage.Sets/src/mage/sets/odyssey/GroundSeal.java
@@ -37,7 +37,7 @@ public class GroundSeal extends mage.sets.magic2013.GroundSeal {
 
     public GroundSeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/HauntingEchoes.java b/Mage.Sets/src/mage/sets/odyssey/HauntingEchoes.java
index c78daa9c05..cb6450ad54 100644
--- a/Mage.Sets/src/mage/sets/odyssey/HauntingEchoes.java
+++ b/Mage.Sets/src/mage/sets/odyssey/HauntingEchoes.java
@@ -37,7 +37,7 @@ public class HauntingEchoes extends mage.sets.magic2010.HauntingEchoes {
 
     public HauntingEchoes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/InnocentBlood.java b/Mage.Sets/src/mage/sets/odyssey/InnocentBlood.java
index 3ec3ac7939..832ce5f901 100644
--- a/Mage.Sets/src/mage/sets/odyssey/InnocentBlood.java
+++ b/Mage.Sets/src/mage/sets/odyssey/InnocentBlood.java
@@ -37,7 +37,7 @@ public class InnocentBlood extends mage.sets.planechase.InnocentBlood {
 
     public InnocentBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/IvyElemental.java b/Mage.Sets/src/mage/sets/odyssey/IvyElemental.java
index f2b4c57a00..eb8a20a788 100644
--- a/Mage.Sets/src/mage/sets/odyssey/IvyElemental.java
+++ b/Mage.Sets/src/mage/sets/odyssey/IvyElemental.java
@@ -37,7 +37,7 @@ public class IvyElemental extends mage.sets.planechase.IvyElemental {
 
     public IvyElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/KamahlPitFighter.java b/Mage.Sets/src/mage/sets/odyssey/KamahlPitFighter.java
index 7ec9afe357..9f0fb70e7e 100644
--- a/Mage.Sets/src/mage/sets/odyssey/KamahlPitFighter.java
+++ b/Mage.Sets/src/mage/sets/odyssey/KamahlPitFighter.java
@@ -37,7 +37,7 @@ public class KamahlPitFighter extends mage.sets.tenthedition.KamahlPitFighter {
 
     public KamahlPitFighter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/KirtarsWrath.java b/Mage.Sets/src/mage/sets/odyssey/KirtarsWrath.java
index 362533085e..81c99c20cf 100644
--- a/Mage.Sets/src/mage/sets/odyssey/KirtarsWrath.java
+++ b/Mage.Sets/src/mage/sets/odyssey/KirtarsWrath.java
@@ -37,7 +37,7 @@ public class KirtarsWrath extends mage.sets.commander2013.KirtarsWrath {
 
     public KirtarsWrath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Magnivore.java b/Mage.Sets/src/mage/sets/odyssey/Magnivore.java
index 6f0102b267..707e6a57a9 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Magnivore.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Magnivore.java
@@ -37,7 +37,7 @@ public class Magnivore extends mage.sets.ninthedition.Magnivore {
 
     public Magnivore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Mindslicer.java b/Mage.Sets/src/mage/sets/odyssey/Mindslicer.java
index 67b1e73e05..479279f289 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Mindslicer.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Mindslicer.java
@@ -37,7 +37,7 @@ public class Mindslicer extends mage.sets.ninthedition.Mindslicer {
 
     public Mindslicer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Mirari.java b/Mage.Sets/src/mage/sets/odyssey/Mirari.java
index b175a1d862..b69767c9d2 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Mirari.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Mirari.java
@@ -37,7 +37,7 @@ public class Mirari extends mage.sets.commander2013.Mirari {
 
     public Mirari(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Mortivore.java b/Mage.Sets/src/mage/sets/odyssey/Mortivore.java
index f2d9864124..45fb4ab797 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Mortivore.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Mortivore.java
@@ -37,7 +37,7 @@ public class Mortivore extends mage.sets.tenthedition.Mortivore {
 
     public Mortivore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticEnforcer.java b/Mage.Sets/src/mage/sets/odyssey/MysticEnforcer.java
index 0f2445a22a..7f6de7a2bb 100644
--- a/Mage.Sets/src/mage/sets/odyssey/MysticEnforcer.java
+++ b/Mage.Sets/src/mage/sets/odyssey/MysticEnforcer.java
@@ -38,7 +38,7 @@ public class MysticEnforcer extends mage.sets.timeshifted.MysticEnforcer {
 
     public MysticEnforcer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/Overrun.java b/Mage.Sets/src/mage/sets/odyssey/Overrun.java
index b7921edeeb..4448dfbfac 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Overrun.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/PatchworkGnomes.java b/Mage.Sets/src/mage/sets/odyssey/PatchworkGnomes.java
index fb6718a3a2..0b3a9719ec 100644
--- a/Mage.Sets/src/mage/sets/odyssey/PatchworkGnomes.java
+++ b/Mage.Sets/src/mage/sets/odyssey/PatchworkGnomes.java
@@ -37,7 +37,7 @@ public class PatchworkGnomes extends mage.sets.tempest.PatchworkGnomes {
 
     public PatchworkGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Peek.java b/Mage.Sets/src/mage/sets/odyssey/Peek.java
index 819847d6a4..24911bba04 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Peek.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Peek.java
@@ -37,7 +37,7 @@ public class Peek extends mage.sets.tenthedition.Peek {
 
     public Peek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Persuasion.java b/Mage.Sets/src/mage/sets/odyssey/Persuasion.java
index 02583320bd..97ead19415 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Persuasion.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Persuasion.java
@@ -38,7 +38,7 @@ public class Persuasion extends mage.sets.tenthedition.Persuasion {
 
     public Persuasion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/Psychatog.java b/Mage.Sets/src/mage/sets/odyssey/Psychatog.java
index 716ead7cea..18bf6b9d62 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Psychatog.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Psychatog.java
@@ -37,7 +37,7 @@ public class Psychatog extends mage.sets.vintagemasters.Psychatog {
 
     public Psychatog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Puppeteer.java b/Mage.Sets/src/mage/sets/odyssey/Puppeteer.java
index 42c5907e89..779c060f9e 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Puppeteer.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Puppeteer.java
@@ -37,7 +37,7 @@ public class Puppeteer extends mage.sets.tenthedition.Puppeteer {
 
     public Puppeteer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/RecklessCharge.java b/Mage.Sets/src/mage/sets/odyssey/RecklessCharge.java
index ed204bf8ef..b57c2ccdc3 100644
--- a/Mage.Sets/src/mage/sets/odyssey/RecklessCharge.java
+++ b/Mage.Sets/src/mage/sets/odyssey/RecklessCharge.java
@@ -37,7 +37,7 @@ public class RecklessCharge extends mage.sets.planechase.RecklessCharge {
 
     public RecklessCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Scrivener.java b/Mage.Sets/src/mage/sets/odyssey/Scrivener.java
index a5a4c9ea94..1266c34180 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Scrivener.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Scrivener.java
@@ -39,7 +39,7 @@ public class Scrivener extends mage.sets.exodus.Scrivener {
 
     public Scrivener(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java b/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java
index c1ea53d6f6..9a875b7b29 100644
--- a/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java
+++ b/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java
@@ -38,7 +38,7 @@ public class ShadowmageInfiltrator extends mage.sets.timeshifted.ShadowmageInfil
 
     public ShadowmageInfiltrator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/SquirrelNest.java b/Mage.Sets/src/mage/sets/odyssey/SquirrelNest.java
index 62c93dcb3e..a281fc7513 100644
--- a/Mage.Sets/src/mage/sets/odyssey/SquirrelNest.java
+++ b/Mage.Sets/src/mage/sets/odyssey/SquirrelNest.java
@@ -37,7 +37,7 @@ public class SquirrelNest extends mage.sets.conspiracy.SquirrelNest {
 
     public SquirrelNest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Syncopate.java b/Mage.Sets/src/mage/sets/odyssey/Syncopate.java
index e9fb700ed2..b0c357bf1d 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Syncopate.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Syncopate.java
@@ -38,7 +38,7 @@ public class Syncopate extends mage.sets.returntoravnica.Syncopate {
 
     public Syncopate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "ODY";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/TimeStretch.java b/Mage.Sets/src/mage/sets/odyssey/TimeStretch.java
index 318a956b43..8bc559500f 100644
--- a/Mage.Sets/src/mage/sets/odyssey/TimeStretch.java
+++ b/Mage.Sets/src/mage/sets/odyssey/TimeStretch.java
@@ -37,7 +37,7 @@ public class TimeStretch extends mage.sets.tenthedition.TimeStretch {
 
     public TimeStretch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Traumatize.java b/Mage.Sets/src/mage/sets/odyssey/Traumatize.java
index 8a42764504..0333adcfa4 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Traumatize.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Traumatize.java
@@ -37,7 +37,7 @@ public class Traumatize extends mage.sets.tenthedition.Traumatize {
 
     public Traumatize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/VampiricDragon.java b/Mage.Sets/src/mage/sets/odyssey/VampiricDragon.java
index 42d2ba7bca..db40be640c 100644
--- a/Mage.Sets/src/mage/sets/odyssey/VampiricDragon.java
+++ b/Mage.Sets/src/mage/sets/odyssey/VampiricDragon.java
@@ -37,7 +37,7 @@ public class VampiricDragon extends mage.sets.archenemy.VampiricDragon {
 
     public VampiricDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/ZombieInfestation.java b/Mage.Sets/src/mage/sets/odyssey/ZombieInfestation.java
index 2ddc2cf8dd..7b629ae1c4 100644
--- a/Mage.Sets/src/mage/sets/odyssey/ZombieInfestation.java
+++ b/Mage.Sets/src/mage/sets/odyssey/ZombieInfestation.java
@@ -37,7 +37,7 @@ public class ZombieInfestation extends mage.sets.magic2012.ZombieInfestation {
 
     public ZombieInfestation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/Zombify.java b/Mage.Sets/src/mage/sets/odyssey/Zombify.java
index df0038f69d..7704d5a6a5 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Zombify.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Zombify.java
@@ -37,7 +37,7 @@ public class Zombify extends mage.sets.ninthedition.Zombify {
 
     public Zombify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "ODY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/AkromasVengeance.java b/Mage.Sets/src/mage/sets/onslaught/AkromasVengeance.java
index 1e452bc8f1..ded92ec11d 100644
--- a/Mage.Sets/src/mage/sets/onslaught/AkromasVengeance.java
+++ b/Mage.Sets/src/mage/sets/onslaught/AkromasVengeance.java
@@ -37,7 +37,7 @@ public class AkromasVengeance extends mage.sets.planechase.AkromasVengeance {
 
     public AkromasVengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/sets/onslaught/ArcanisTheOmnipotent.java
index 1703b6b530..c4aac9bab2 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ArcanisTheOmnipotent.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ArcanisTheOmnipotent.java
@@ -37,7 +37,7 @@ public class ArcanisTheOmnipotent extends mage.sets.tenthedition.ArcanisTheOmnip
 
     public ArcanisTheOmnipotent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/BatteringCraghorn.java b/Mage.Sets/src/mage/sets/onslaught/BatteringCraghorn.java
index 264e88a0b4..2462bd750e 100644
--- a/Mage.Sets/src/mage/sets/onslaught/BatteringCraghorn.java
+++ b/Mage.Sets/src/mage/sets/onslaught/BatteringCraghorn.java
@@ -37,7 +37,7 @@ public class BatteringCraghorn extends mage.sets.archenemy.BatteringCraghorn {
 
     public BatteringCraghorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Clone.java b/Mage.Sets/src/mage/sets/onslaught/Clone.java
index 83b2c1e6bc..6a327983ef 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Clone.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Clone.java
@@ -37,7 +37,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/CraftyPathmage.java b/Mage.Sets/src/mage/sets/onslaught/CraftyPathmage.java
index 87e5c3041c..cd2acd5aa1 100644
--- a/Mage.Sets/src/mage/sets/onslaught/CraftyPathmage.java
+++ b/Mage.Sets/src/mage/sets/onslaught/CraftyPathmage.java
@@ -37,7 +37,7 @@ public class CraftyPathmage extends mage.sets.tenthedition.CraftyPathmage {
 
     public CraftyPathmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/DaruEncampment.java b/Mage.Sets/src/mage/sets/onslaught/DaruEncampment.java
index 737da7bae5..7acc488525 100644
--- a/Mage.Sets/src/mage/sets/onslaught/DaruEncampment.java
+++ b/Mage.Sets/src/mage/sets/onslaught/DaruEncampment.java
@@ -37,7 +37,7 @@ public class DaruEncampment extends mage.sets.elspethvstezzeret.DaruEncampment {
 
     public DaruEncampment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Demystify.java b/Mage.Sets/src/mage/sets/onslaught/Demystify.java
index 5bcabb98a4..bc2fd79943 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Demystify.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Demystify.java
@@ -37,7 +37,7 @@ public class Demystify extends mage.sets.tenthedition.Demystify {
 
     public Demystify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/DiscipleOfGrace.java b/Mage.Sets/src/mage/sets/onslaught/DiscipleOfGrace.java
index df323ea8bd..15412b90a7 100644
--- a/Mage.Sets/src/mage/sets/onslaught/DiscipleOfGrace.java
+++ b/Mage.Sets/src/mage/sets/onslaught/DiscipleOfGrace.java
@@ -37,7 +37,7 @@ public class DiscipleOfGrace extends mage.sets.urzassaga.DiscipleOfGrace {
 
     public DiscipleOfGrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Discombobulate.java b/Mage.Sets/src/mage/sets/onslaught/Discombobulate.java
index 20074d0850..6c33fffd21 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Discombobulate.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Discombobulate.java
@@ -37,7 +37,7 @@ public class Discombobulate extends mage.sets.tenthedition.Discombobulate {
 
     public Discombobulate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/DoomedNecromancer.java b/Mage.Sets/src/mage/sets/onslaught/DoomedNecromancer.java
index df0186836f..c864c517cb 100644
--- a/Mage.Sets/src/mage/sets/onslaught/DoomedNecromancer.java
+++ b/Mage.Sets/src/mage/sets/onslaught/DoomedNecromancer.java
@@ -37,7 +37,7 @@ public class DoomedNecromancer extends mage.sets.tenthedition.DoomedNecromancer
 
     public DoomedNecromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/DragonRoost.java b/Mage.Sets/src/mage/sets/onslaught/DragonRoost.java
index 8ab2791c41..ae35c62989 100644
--- a/Mage.Sets/src/mage/sets/onslaught/DragonRoost.java
+++ b/Mage.Sets/src/mage/sets/onslaught/DragonRoost.java
@@ -37,7 +37,7 @@ public class DragonRoost extends mage.sets.tenthedition.DragonRoost {
 
     public DragonRoost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvishWarrior.java b/Mage.Sets/src/mage/sets/onslaught/ElvishWarrior.java
index d5a2206cb7..b4b260d81c 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ElvishWarrior.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ElvishWarrior.java
@@ -37,7 +37,7 @@ public class ElvishWarrior extends mage.sets.morningtide.ElvishWarrior {
 
     public ElvishWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/ErraticExplosion.java b/Mage.Sets/src/mage/sets/onslaught/ErraticExplosion.java
index d41a0f9f88..2d167acfa8 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ErraticExplosion.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ErraticExplosion.java
@@ -37,7 +37,7 @@ public class ErraticExplosion extends mage.sets.planechase2012.ErraticExplosion
 
     public ErraticExplosion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/onslaught/ExplosiveVegetation.java
index 942413980c..58f0ae9fef 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ExplosiveVegetation.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ExplosiveVegetation.java
@@ -37,7 +37,7 @@ public class ExplosiveVegetation extends mage.sets.planechase.ExplosiveVegetatio
 
     public ExplosiveVegetation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/FesteringGoblin.java b/Mage.Sets/src/mage/sets/onslaught/FesteringGoblin.java
index 494a25d572..dac1f2a0f1 100644
--- a/Mage.Sets/src/mage/sets/onslaught/FesteringGoblin.java
+++ b/Mage.Sets/src/mage/sets/onslaught/FesteringGoblin.java
@@ -37,7 +37,7 @@ public class FesteringGoblin extends mage.sets.planechase.FesteringGoblin {
 
     public FesteringGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/GlorySeeker.java b/Mage.Sets/src/mage/sets/onslaught/GlorySeeker.java
index 3763478ad0..93a87eaea2 100644
--- a/Mage.Sets/src/mage/sets/onslaught/GlorySeeker.java
+++ b/Mage.Sets/src/mage/sets/onslaught/GlorySeeker.java
@@ -37,7 +37,7 @@ public class GlorySeeker extends mage.sets.riseoftheeldrazi.GlorySeeker {
 
     public GlorySeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinSkyRaider.java b/Mage.Sets/src/mage/sets/onslaught/GoblinSkyRaider.java
index ec85783e1e..726e2698e6 100644
--- a/Mage.Sets/src/mage/sets/onslaught/GoblinSkyRaider.java
+++ b/Mage.Sets/src/mage/sets/onslaught/GoblinSkyRaider.java
@@ -37,7 +37,7 @@ public class GoblinSkyRaider extends mage.sets.tenthedition.GoblinSkyRaider {
 
     public GoblinSkyRaider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/GustcloakHarrier.java b/Mage.Sets/src/mage/sets/onslaught/GustcloakHarrier.java
index 43772e80ab..630747d5a9 100644
--- a/Mage.Sets/src/mage/sets/onslaught/GustcloakHarrier.java
+++ b/Mage.Sets/src/mage/sets/onslaught/GustcloakHarrier.java
@@ -37,7 +37,7 @@ public class GustcloakHarrier extends mage.sets.vintagemasters.GustcloakHarrier
 
     public GustcloakHarrier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Infest.java b/Mage.Sets/src/mage/sets/onslaught/Infest.java
index a57fd593f2..7ea4c3d12a 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Infest.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Infest.java
@@ -37,7 +37,7 @@ public class Infest extends mage.sets.shardsofalara.Infest {
 
     public Infest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/KrosanTusker.java b/Mage.Sets/src/mage/sets/onslaught/KrosanTusker.java
index 78f1784f3c..3bb223f2a9 100644
--- a/Mage.Sets/src/mage/sets/onslaught/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/onslaught/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/LayWaste.java b/Mage.Sets/src/mage/sets/onslaught/LayWaste.java
index 58cae69125..22f1229cbd 100644
--- a/Mage.Sets/src/mage/sets/onslaught/LayWaste.java
+++ b/Mage.Sets/src/mage/sets/onslaught/LayWaste.java
@@ -37,7 +37,7 @@ public class LayWaste extends mage.sets.urzassaga.LayWaste {
 
     public LayWaste(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Mobilization.java b/Mage.Sets/src/mage/sets/onslaught/Mobilization.java
index 0e5d2569e0..3435c08d8b 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Mobilization.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Mobilization.java
@@ -37,7 +37,7 @@ public class Mobilization extends mage.sets.tenthedition.Mobilization {
 
     public Mobilization(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java b/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java
index 1f7499a71b..179d87c2fd 100644
--- a/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java
+++ b/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java
@@ -38,7 +38,7 @@ public class NantukoHusk extends mage.sets.tenthedition.NantukoHusk {
 
     public NantukoHusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "ONS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/onslaught/Naturalize.java b/Mage.Sets/src/mage/sets/onslaught/Naturalize.java
index 7860eec057..eea19604b9 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Pacifism.java b/Mage.Sets/src/mage/sets/onslaught/Pacifism.java
index 553b531e98..01543c978e 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/QuicksilverDragon.java b/Mage.Sets/src/mage/sets/onslaught/QuicksilverDragon.java
index 231047198d..6053ef9647 100644
--- a/Mage.Sets/src/mage/sets/onslaught/QuicksilverDragon.java
+++ b/Mage.Sets/src/mage/sets/onslaught/QuicksilverDragon.java
@@ -37,7 +37,7 @@ public class QuicksilverDragon extends mage.sets.jacevschandra.QuicksilverDragon
 
     public QuicksilverDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/RighteousCause.java b/Mage.Sets/src/mage/sets/onslaught/RighteousCause.java
index ed8d456d22..697c1d3585 100644
--- a/Mage.Sets/src/mage/sets/onslaught/RighteousCause.java
+++ b/Mage.Sets/src/mage/sets/onslaught/RighteousCause.java
@@ -37,7 +37,7 @@ public class RighteousCause extends mage.sets.commander.RighteousCause {
 
     public RighteousCause(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/RorixBladewing.java b/Mage.Sets/src/mage/sets/onslaught/RorixBladewing.java
index 33c550dfd9..d81fc79276 100644
--- a/Mage.Sets/src/mage/sets/onslaught/RorixBladewing.java
+++ b/Mage.Sets/src/mage/sets/onslaught/RorixBladewing.java
@@ -37,7 +37,7 @@ public class RorixBladewing extends mage.sets.planechase.RorixBladewing {
 
     public RorixBladewing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/SageAven.java b/Mage.Sets/src/mage/sets/onslaught/SageAven.java
index 61e7941d77..ab8d38b90e 100644
--- a/Mage.Sets/src/mage/sets/onslaught/SageAven.java
+++ b/Mage.Sets/src/mage/sets/onslaught/SageAven.java
@@ -37,7 +37,7 @@ public class SageAven extends mage.sets.ninthedition.SageAven {
 
     public SageAven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/ScreamingSeahawk.java b/Mage.Sets/src/mage/sets/onslaught/ScreamingSeahawk.java
index 889fe6088d..6254e8e37e 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ScreamingSeahawk.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ScreamingSeahawk.java
@@ -37,7 +37,7 @@ public class ScreamingSeahawk extends mage.sets.conspiracy.ScreamingSeahawk {
 
     public ScreamingSeahawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/SeveredLegion.java b/Mage.Sets/src/mage/sets/onslaught/SeveredLegion.java
index a9c4b82d78..d3cb916e3f 100644
--- a/Mage.Sets/src/mage/sets/onslaught/SeveredLegion.java
+++ b/Mage.Sets/src/mage/sets/onslaught/SeveredLegion.java
@@ -37,7 +37,7 @@ public class SeveredLegion extends mage.sets.tenthedition.SeveredLegion {
 
     public SeveredLegion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Shock.java b/Mage.Sets/src/mage/sets/onslaught/Shock.java
index 0ca0dec21c..912c3b6dcd 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Shock.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Smother.java b/Mage.Sets/src/mage/sets/onslaught/Smother.java
index c816b29d4e..2221c5558b 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Smother.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Smother.java
@@ -37,7 +37,7 @@ public class Smother extends mage.sets.worldwake.Smother {
 
     public Smother(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/SyphonSoul.java b/Mage.Sets/src/mage/sets/onslaught/SyphonSoul.java
index 27315c09cb..972a9dcc79 100644
--- a/Mage.Sets/src/mage/sets/onslaught/SyphonSoul.java
+++ b/Mage.Sets/src/mage/sets/onslaught/SyphonSoul.java
@@ -37,7 +37,7 @@ public class SyphonSoul extends mage.sets.planechase.SyphonSoul {
 
     public SyphonSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Threaten.java b/Mage.Sets/src/mage/sets/onslaught/Threaten.java
index 2b7d06d978..78b39951a5 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Threaten.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Threaten.java
@@ -37,7 +37,7 @@ public class Threaten extends mage.sets.tenthedition.Threaten {
 
     public Threaten(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "ONS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/BallLightning.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/BallLightning.java
index 8e735f45d3..42f7ffee29 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/BallLightning.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/BallLightning.java
@@ -37,7 +37,7 @@ public class BallLightning extends mage.sets.magic2010.BallLightning {
 
     public BallLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/BarbarianRing.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/BarbarianRing.java
index 2080a66cc2..004f399d9d 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/BarbarianRing.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/BarbarianRing.java
@@ -37,7 +37,7 @@ public class BarbarianRing extends mage.sets.odyssey.BarbarianRing {
 
     public BarbarianRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/BoggartRamGang.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/BoggartRamGang.java
index 348792daeb..2dabe3e8dc 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/BoggartRamGang.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/BoggartRamGang.java
@@ -37,7 +37,7 @@ public class BoggartRamGang extends mage.sets.shadowmoor.BoggartRamGang {
 
     public BoggartRamGang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/Browbeat.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/Browbeat.java
index 4f1db3c0ea..9d7eec1517 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/Browbeat.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/Browbeat.java
@@ -37,7 +37,7 @@ public class Browbeat extends mage.sets.judgment.Browbeat {
 
     public Browbeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/ChainLightning.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/ChainLightning.java
index 2d8dbd3cca..57dc6f83b7 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/ChainLightning.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/ChainLightning.java
@@ -37,7 +37,7 @@ public class ChainLightning extends mage.sets.legends.ChainLightning {
 
     public ChainLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/CinderPyromancer.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/CinderPyromancer.java
index d5ef8de495..28f06cafa1 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/CinderPyromancer.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/CinderPyromancer.java
@@ -37,7 +37,7 @@ public class CinderPyromancer extends mage.sets.eventide.CinderPyromancer {
 
     public CinderPyromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/FigureOfDestiny.java
index 20ac798e3c..433732a8d6 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/FigureOfDestiny.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/FigureOfDestiny.java
@@ -37,7 +37,7 @@ public class FigureOfDestiny extends mage.sets.eventide.FigureOfDestiny {
 
     public FigureOfDestiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/FireServant.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/FireServant.java
index 4b0a1c5cdc..d76fbb3eed 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/FireServant.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/FireServant.java
@@ -37,7 +37,7 @@ public class FireServant extends mage.sets.magic2011.FireServant {
 
     public FireServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireball.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireball.java
index 7fbf0e5b61..7a84c8e1f6 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireball.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireball.java
@@ -37,7 +37,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireblast.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireblast.java
index 12ed9ff106..bd6f055720 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireblast.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/Fireblast.java
@@ -37,7 +37,7 @@ public class Fireblast extends mage.sets.visions.Fireblast {
 
     public Fireblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/FlamesOfTheBloodHand.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/FlamesOfTheBloodHand.java
index 437eaf2004..5ef2817028 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/FlamesOfTheBloodHand.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/FlamesOfTheBloodHand.java
@@ -37,7 +37,7 @@ public class FlamesOfTheBloodHand extends mage.sets.betrayersofkamigawa.FlamesOf
 
     public FlamesOfTheBloodHand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/GhituEncampment.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/GhituEncampment.java
index 9510b33ba2..3f3ddd03fe 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/GhituEncampment.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/GhituEncampment.java
@@ -37,7 +37,7 @@ public class GhituEncampment extends mage.sets.tenthedition.GhituEncampment {
 
     public GhituEncampment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/GrimLavamancer.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/GrimLavamancer.java
index 44e8a0066a..d643344413 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/GrimLavamancer.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/GrimLavamancer.java
@@ -37,7 +37,7 @@ public class GrimLavamancer extends mage.sets.magic2012.GrimLavamancer {
 
     public GrimLavamancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/HammerOfBogardan.java
index 6eb476a969..0962d0d15b 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/HammerOfBogardan.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/HammerOfBogardan.java
@@ -37,7 +37,7 @@ public class HammerOfBogardan extends mage.sets.mirage.HammerOfBogardan {
 
     public HammerOfBogardan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/HellsparkElemental.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/HellsparkElemental.java
index 9ef63131d8..aca7f3ceb8 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/HellsparkElemental.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/HellsparkElemental.java
@@ -37,7 +37,7 @@ public class HellsparkElemental extends mage.sets.conflux.HellsparkElemental {
 
     public HellsparkElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/JackalPup.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/JackalPup.java
index 2574296881..cc5617defc 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/JackalPup.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/JackalPup.java
@@ -37,7 +37,7 @@ public class JackalPup extends mage.sets.tempest.JackalPup {
 
     public JackalPup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/JayaBallardTaskMage.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/JayaBallardTaskMage.java
index d5f1cd8573..1464041b50 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/JayaBallardTaskMage.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/JayaBallardTaskMage.java
@@ -37,7 +37,7 @@ public class JayaBallardTaskMage extends mage.sets.timespiral.JayaBallardTaskMag
 
     public JayaBallardTaskMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonChampion.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonChampion.java
index a093ab79e4..b93699118d 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonChampion.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonChampion.java
@@ -37,7 +37,7 @@ public class KeldonChampion extends mage.sets.planechase.KeldonChampion {
 
     public KeldonChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonMarauders.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonMarauders.java
index 89a01b3da4..4ad307e42c 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonMarauders.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/KeldonMarauders.java
@@ -37,7 +37,7 @@ public class KeldonMarauders extends mage.sets.planarchaos.KeldonMarauders {
 
     public KeldonMarauders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/LightningBolt.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/LightningBolt.java
index d819301cc6..1c3ee0793b 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFanatic.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFanatic.java
index 96ddf589b3..f1f027cb63 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "PD2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFlunkies.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFlunkies.java
index 49d348d033..4253bf9bfc 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFlunkies.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/MoggFlunkies.java
@@ -37,7 +37,7 @@ public class MoggFlunkies extends mage.sets.magic2013.MoggFlunkies {
 
     public MoggFlunkies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/Pillage.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/Pillage.java
index 4b17d25907..6c6fe66193 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/Pillage.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/Pillage.java
@@ -37,7 +37,7 @@ public class Pillage extends mage.sets.seventhedition.Pillage {
 
     public Pillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/PriceOfProgress.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/PriceOfProgress.java
index 1c41a76ed3..62d8084b85 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/PriceOfProgress.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/PriceOfProgress.java
@@ -37,7 +37,7 @@ public class PriceOfProgress extends mage.sets.exodus.PriceOfProgress {
 
     public PriceOfProgress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/Reverberate.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/Reverberate.java
index 6b0764e3cb..c7415d1ed3 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/Reverberate.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/Reverberate.java
@@ -37,7 +37,7 @@ public class Reverberate extends mage.sets.magic2011.Reverberate {
 
     public Reverberate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/SparkElemental.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/SparkElemental.java
index ed3ef9a6e5..886b8e6eb3 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/SparkElemental.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/SparkElemental.java
@@ -37,7 +37,7 @@ public class SparkElemental extends mage.sets.tenthedition.SparkElemental {
 
     public SparkElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/SuddenImpact.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/SuddenImpact.java
index 12cda5b7f3..ab77a1dfe3 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/SuddenImpact.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/SuddenImpact.java
@@ -37,7 +37,7 @@ public class SuddenImpact extends mage.sets.seventhedition.SuddenImpact {
 
     public SuddenImpact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/TeeteringPeaks.java
index 95bb23895f..9360e092cf 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/TeeteringPeaks.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/TeeteringPeaks.java
@@ -37,7 +37,7 @@ public class TeeteringPeaks extends mage.sets.zendikar.TeeteringPeaks {
 
     public TeeteringPeaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/Thunderbolt.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/Thunderbolt.java
index 0f989bf885..1faea9cae7 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/Thunderbolt.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/Thunderbolt.java
@@ -37,7 +37,7 @@ public class Thunderbolt extends mage.sets.avacynrestored.Thunderbolt {
 
     public Thunderbolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsfireandlightning/VulshokSorcerer.java b/Mage.Sets/src/mage/sets/pdsfireandlightning/VulshokSorcerer.java
index 76e9c7c609..27f5c93760 100644
--- a/Mage.Sets/src/mage/sets/pdsfireandlightning/VulshokSorcerer.java
+++ b/Mage.Sets/src/mage/sets/pdsfireandlightning/VulshokSorcerer.java
@@ -37,7 +37,7 @@ public class VulshokSorcerer extends mage.sets.fifthdawn.VulshokSorcerer {
 
     public VulshokSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "PD2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/AnimateDead.java b/Mage.Sets/src/mage/sets/pdsgraveborn/AnimateDead.java
index e01d121ce4..37551bd81d 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/AvatarOfWoe.java b/Mage.Sets/src/mage/sets/pdsgraveborn/AvatarOfWoe.java
index 118212253a..2156960b81 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/AvatarOfWoe.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/AvatarOfWoe.java
@@ -37,7 +37,7 @@ public class AvatarOfWoe extends mage.sets.archenemy.AvatarOfWoe {
 
     public AvatarOfWoe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/BlazingArchon.java b/Mage.Sets/src/mage/sets/pdsgraveborn/BlazingArchon.java
index 0e73f2d635..b47a180c1e 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/BlazingArchon.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/BlazingArchon.java
@@ -37,7 +37,7 @@ public class BlazingArchon extends mage.sets.ravnica.BlazingArchon {
 
     public BlazingArchon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/BuriedAlive.java b/Mage.Sets/src/mage/sets/pdsgraveborn/BuriedAlive.java
index 5f0355dbc0..4d24a8681a 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/BuriedAlive.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/BuriedAlive.java
@@ -37,7 +37,7 @@ public class BuriedAlive extends mage.sets.commander.BuriedAlive {
 
     public BuriedAlive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/CabalTherapy.java b/Mage.Sets/src/mage/sets/pdsgraveborn/CabalTherapy.java
index 7a445f0484..f084d8fa24 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/CabalTherapy.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/CabalTherapy.java
@@ -37,7 +37,7 @@ public class CabalTherapy extends mage.sets.judgment.CabalTherapy {
 
     public CabalTherapy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/CrosisThePurger.java b/Mage.Sets/src/mage/sets/pdsgraveborn/CrosisThePurger.java
index 97adce02bc..221f93ec9c 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/CrosisThePurger.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/CrosisThePurger.java
@@ -38,7 +38,7 @@ public class CrosisThePurger extends mage.sets.invasion.CrosisThePurger {
 
     public CrosisThePurger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/CrystalVein.java b/Mage.Sets/src/mage/sets/pdsgraveborn/CrystalVein.java
index 9ed0f7a85a..abc26e40eb 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/CrystalVein.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/CrystalVein.java
@@ -37,7 +37,7 @@ public class CrystalVein extends mage.sets.mirage.CrystalVein {
 
     public CrystalVein(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/DiabolicServitude.java b/Mage.Sets/src/mage/sets/pdsgraveborn/DiabolicServitude.java
index fffe3c7322..5a08ebb6bc 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/DiabolicServitude.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/DiabolicServitude.java
@@ -37,7 +37,7 @@ public class DiabolicServitude extends mage.sets.urzassaga.DiabolicServitude {
 
     public DiabolicServitude(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/DreadReturn.java b/Mage.Sets/src/mage/sets/pdsgraveborn/DreadReturn.java
index 1b4d2e5421..3e2c60319e 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/DreadReturn.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/DreadReturn.java
@@ -37,7 +37,7 @@ public class DreadReturn extends mage.sets.timespiral.DreadReturn {
 
     public DreadReturn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/Duress.java b/Mage.Sets/src/mage/sets/pdsgraveborn/Duress.java
index 5a1baf61c1..69056a2e6a 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/Duress.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/EbonStronghold.java b/Mage.Sets/src/mage/sets/pdsgraveborn/EbonStronghold.java
index e976d201da..3a5b82a7ee 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/EbonStronghold.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/EbonStronghold.java
@@ -37,7 +37,7 @@ public class EbonStronghold extends mage.sets.fallenempires.EbonStronghold {
 
     public EbonStronghold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/Entomb.java b/Mage.Sets/src/mage/sets/pdsgraveborn/Entomb.java
index 5beefb3c3f..de46841564 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/Entomb.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/Entomb.java
@@ -37,7 +37,7 @@ public class Entomb extends mage.sets.odyssey.Entomb {
 
     public Entomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/Exhume.java b/Mage.Sets/src/mage/sets/pdsgraveborn/Exhume.java
index e8532228bf..66844cc26d 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/Exhume.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/Exhume.java
@@ -37,7 +37,7 @@ public class Exhume extends mage.sets.urzassaga.Exhume {
 
     public Exhume(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/FacelessButcher.java b/Mage.Sets/src/mage/sets/pdsgraveborn/FacelessButcher.java
index 3f6e12c795..238f38bdf9 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/FacelessButcher.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/FacelessButcher.java
@@ -38,7 +38,7 @@ public class FacelessButcher extends mage.sets.timeshifted.FacelessButcher {
 
     public FacelessButcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "PD3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/HiddenHorror.java b/Mage.Sets/src/mage/sets/pdsgraveborn/HiddenHorror.java
index 707d37b66b..f0b57fb861 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/HiddenHorror.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/HiddenHorror.java
@@ -37,7 +37,7 @@ public class HiddenHorror extends mage.sets.tenthedition.HiddenHorror {
 
     public HiddenHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/pdsgraveborn/InkwellLeviathan.java
index 5b0a49bab0..c23321f4a1 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/InkwellLeviathan.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/InkwellLeviathan.java
@@ -37,7 +37,7 @@ public class InkwellLeviathan extends mage.sets.conflux.InkwellLeviathan {
 
     public InkwellLeviathan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/PollutedMire.java b/Mage.Sets/src/mage/sets/pdsgraveborn/PollutedMire.java
index 56a8f70e02..716f6278ca 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/PollutedMire.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/PollutedMire.java
@@ -37,7 +37,7 @@ public class PollutedMire extends mage.sets.urzassaga.PollutedMire {
 
     public PollutedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/PutridImp.java b/Mage.Sets/src/mage/sets/pdsgraveborn/PutridImp.java
index cfa787e8d1..58e5fb58aa 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/PutridImp.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/PutridImp.java
@@ -37,7 +37,7 @@ public class PutridImp extends mage.sets.torment.PutridImp {
 
     public PutridImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/Reanimate.java b/Mage.Sets/src/mage/sets/pdsgraveborn/Reanimate.java
index 16d27acee1..6c1cb25f74 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/Reanimate.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/Reanimate.java
@@ -37,7 +37,7 @@ public class Reanimate extends mage.sets.tempest.Reanimate {
 
     public Reanimate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/SphinxOfTheSteelWind.java b/Mage.Sets/src/mage/sets/pdsgraveborn/SphinxOfTheSteelWind.java
index de9746c030..c5e4b0275d 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/SphinxOfTheSteelWind.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/SphinxOfTheSteelWind.java
@@ -37,7 +37,7 @@ public class SphinxOfTheSteelWind extends mage.sets.alarareborn.SphinxOfTheSteel
 
     public SphinxOfTheSteelWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/Terastodon.java b/Mage.Sets/src/mage/sets/pdsgraveborn/Terastodon.java
index e69d4624a5..1ff4acbf10 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/Terastodon.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/Terastodon.java
@@ -37,7 +37,7 @@ public class Terastodon extends mage.sets.worldwake.Terastodon {
 
     public Terastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/TwistedAbomination.java b/Mage.Sets/src/mage/sets/pdsgraveborn/TwistedAbomination.java
index 974c98eef3..5cb9619b23 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/TwistedAbomination.java
@@ -38,7 +38,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "PD3";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/VerdantForce.java b/Mage.Sets/src/mage/sets/pdsgraveborn/VerdantForce.java
index 98b28df3f4..c7c90bbcd1 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/VerdantForce.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/VerdantForce.java
@@ -37,7 +37,7 @@ public class VerdantForce extends mage.sets.tempest.VerdantForce {
 
     public VerdantForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsgraveborn/ZombieInfestation.java b/Mage.Sets/src/mage/sets/pdsgraveborn/ZombieInfestation.java
index 242aabe523..fe61b32925 100644
--- a/Mage.Sets/src/mage/sets/pdsgraveborn/ZombieInfestation.java
+++ b/Mage.Sets/src/mage/sets/pdsgraveborn/ZombieInfestation.java
@@ -37,7 +37,7 @@ public class ZombieInfestation extends mage.sets.magic2012.ZombieInfestation {
 
     public ZombieInfestation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "PD3";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/AcidicSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/AcidicSliver.java
index 09bba1140d..650377fd7a 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/AcidicSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/AcidicSliver.java
@@ -37,7 +37,7 @@ public class AcidicSliver extends mage.sets.stronghold.AcidicSliver {
 
     public AcidicSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/AmoeboidChangeling.java b/Mage.Sets/src/mage/sets/pdsslivers/AmoeboidChangeling.java
index f12bc65d44..ac2185a0b5 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/AmoeboidChangeling.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/AmoeboidChangeling.java
@@ -37,7 +37,7 @@ public class AmoeboidChangeling extends mage.sets.lorwyn.AmoeboidChangeling {
 
     public AmoeboidChangeling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/AncientZiggurat.java b/Mage.Sets/src/mage/sets/pdsslivers/AncientZiggurat.java
index 873c43ace0..cb5d9f86dc 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/AncientZiggurat.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/AncientZiggurat.java
@@ -37,7 +37,7 @@ public class AncientZiggurat extends mage.sets.conflux.AncientZiggurat {
 
     public AncientZiggurat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/AphettoDredging.java b/Mage.Sets/src/mage/sets/pdsslivers/AphettoDredging.java
index 9ffb4395ed..c3c48222b8 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/AphettoDredging.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/AphettoDredging.java
@@ -37,7 +37,7 @@ public class AphettoDredging extends mage.sets.onslaught.AphettoDredging {
 
     public AphettoDredging(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/ArmorSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/ArmorSliver.java
index d261fe3d06..34dfed2e80 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/ArmorSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/ArmorSliver.java
@@ -37,7 +37,7 @@ public class ArmorSliver extends mage.sets.tempest.ArmorSliver {
 
     public ArmorSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/BarbedSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/BarbedSliver.java
index 00d7f6e371..d37892bd18 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/BarbedSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/BarbedSliver.java
@@ -37,7 +37,7 @@ public class BarbedSliver extends mage.sets.tempest.BarbedSliver {
 
     public BarbedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/BroodSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/BroodSliver.java
index 24170da885..dde2865c1d 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/BroodSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/BroodSliver.java
@@ -37,7 +37,7 @@ public class BroodSliver extends mage.sets.legions.BroodSliver {
 
     public BroodSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/ClotSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/ClotSliver.java
index b3a471bdfb..2865075d33 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/ClotSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/ClotSliver.java
@@ -37,7 +37,7 @@ public class ClotSliver extends mage.sets.tempest.ClotSliver {
 
     public ClotSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/CoatOfArms.java b/Mage.Sets/src/mage/sets/pdsslivers/CoatOfArms.java
index e2757c2a7b..be8567b785 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/CrystallineSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/CrystallineSliver.java
index 4028302134..a8f1e5127f 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/CrystallineSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/CrystallineSliver.java
@@ -37,7 +37,7 @@ public class CrystallineSliver extends mage.sets.stronghold.CrystallineSliver {
 
     public CrystallineSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/DistantMelody.java b/Mage.Sets/src/mage/sets/pdsslivers/DistantMelody.java
index b783e1812a..6752c07468 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/DistantMelody.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/DistantMelody.java
@@ -37,7 +37,7 @@ public class DistantMelody extends mage.sets.morningtide.DistantMelody {
 
     public DistantMelody(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/FrenzySliver.java b/Mage.Sets/src/mage/sets/pdsslivers/FrenzySliver.java
index 34d6466160..321a6f6c5d 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/FrenzySliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/FrenzySliver.java
@@ -37,7 +37,7 @@ public class FrenzySliver extends mage.sets.futuresight.FrenzySliver {
 
     public FrenzySliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/FungusSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/FungusSliver.java
index 55abea8e31..eaf78f6022 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/FungusSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/FungusSliver.java
@@ -37,7 +37,7 @@ public class FungusSliver extends mage.sets.timespiral.FungusSliver {
 
     public FungusSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/FurySliver.java b/Mage.Sets/src/mage/sets/pdsslivers/FurySliver.java
index 3ad7bc702f..eda10dfdc6 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/FurySliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/FurySliver.java
@@ -37,7 +37,7 @@ public class FurySliver extends mage.sets.timespiral.FurySliver {
 
     public FurySliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/GemhideSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/GemhideSliver.java
index 8ddd21d2eb..879aadb393 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/GemhideSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/GemhideSliver.java
@@ -37,7 +37,7 @@ public class GemhideSliver extends mage.sets.timespiral.GemhideSliver {
 
     public GemhideSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/HeartSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/HeartSliver.java
index ccb2690f2d..7efd17b438 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/HeartSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/HeartSliver.java
@@ -37,7 +37,7 @@ public class HeartSliver extends mage.sets.tempest.HeartSliver {
 
     public HeartSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/Heartstone.java b/Mage.Sets/src/mage/sets/pdsslivers/Heartstone.java
index 4a9fc207bb..2f94db0666 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/Heartstone.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/Heartstone.java
@@ -37,7 +37,7 @@ public class Heartstone extends mage.sets.stronghold.Heartstone {
 
     public Heartstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/HibernationSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/HibernationSliver.java
index 905c3e3ca4..373718a1bd 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/HibernationSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/HibernationSliver.java
@@ -37,7 +37,7 @@ public class HibernationSliver extends mage.sets.stronghold.HibernationSliver {
 
     public HibernationSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/HomingSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/HomingSliver.java
index 7938d27772..8768355fe6 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/HomingSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/HomingSliver.java
@@ -37,7 +37,7 @@ public class HomingSliver extends mage.sets.futuresight.HomingSliver {
 
     public HomingSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/MetallicSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/MetallicSliver.java
index 952c2c4a62..5700e51049 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/MetallicSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/MetallicSliver.java
@@ -37,7 +37,7 @@ public class MetallicSliver extends mage.sets.tempest.MetallicSliver {
 
     public MetallicSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/MightSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/MightSliver.java
index 08c04d4069..64259d7c30 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/MightSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/MightSliver.java
@@ -37,7 +37,7 @@ public class MightSliver extends mage.sets.timespiral.MightSliver {
 
     public MightSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/MuscleSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/MuscleSliver.java
index 6e26871fc9..d8436946b3 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/MuscleSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/MuscleSliver.java
@@ -37,7 +37,7 @@ public class MuscleSliver extends mage.sets.tempest.MuscleSliver {
 
     public MuscleSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/NecroticSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/NecroticSliver.java
index bc2e2a2313..e20873a5f6 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/NecroticSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/NecroticSliver.java
@@ -37,7 +37,7 @@ public class NecroticSliver extends mage.sets.planarchaos.NecroticSliver {
 
     public NecroticSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/QuickSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/QuickSliver.java
index e408a24de7..0c417e2de6 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/QuickSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/QuickSliver.java
@@ -37,7 +37,7 @@ public class QuickSliver extends mage.sets.legions.QuickSliver {
 
     public QuickSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/RootboundCrag.java b/Mage.Sets/src/mage/sets/pdsslivers/RootboundCrag.java
index 40d26ad48c..799345c96e 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/RootboundCrag.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/RootboundCrag.java
@@ -37,7 +37,7 @@ public class RootboundCrag extends mage.sets.magic2010.RootboundCrag {
 
     public RootboundCrag(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/RuptureSpire.java b/Mage.Sets/src/mage/sets/pdsslivers/RuptureSpire.java
index d2797c53d3..5e437c95e7 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/RuptureSpire.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/RuptureSpire.java
@@ -37,7 +37,7 @@ public class RuptureSpire extends mage.sets.conflux.RuptureSpire {
 
     public RuptureSpire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/SliverOverlord.java b/Mage.Sets/src/mage/sets/pdsslivers/SliverOverlord.java
index 1a71f387e2..78e8e0d358 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/SliverOverlord.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/SliverOverlord.java
@@ -38,7 +38,7 @@ public class SliverOverlord extends mage.sets.scourge.SliverOverlord {
 
     public SliverOverlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "H09";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/SpectralSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/SpectralSliver.java
index a9fe06446c..de78844a0d 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/SpectralSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/SpectralSliver.java
@@ -37,7 +37,7 @@ public class SpectralSliver extends mage.sets.legions.SpectralSliver {
 
     public SpectralSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/SpinedSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/SpinedSliver.java
index a1967e5129..31c75c6b4f 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/SpinedSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/SpinedSliver.java
@@ -37,7 +37,7 @@ public class SpinedSliver extends mage.sets.stronghold.SpinedSliver {
 
     public SpinedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/pdsslivers/TerramorphicExpanse.java
index 5f6f66a6af..c1fbd2b130 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/VictualSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/VictualSliver.java
index 612d8b038d..c832b3bc2a 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/VictualSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/VictualSliver.java
@@ -37,7 +37,7 @@ public class VictualSliver extends mage.sets.stronghold.VictualSliver {
 
     public VictualSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/VirulentSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/VirulentSliver.java
index 3aa47e5d88..d3a66fa216 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/VirulentSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/VirulentSliver.java
@@ -37,7 +37,7 @@ public class VirulentSliver extends mage.sets.futuresight.VirulentSliver {
 
     public VirulentSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/VividCreek.java b/Mage.Sets/src/mage/sets/pdsslivers/VividCreek.java
index 564e99bbed..ed7d69ac98 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/VividCreek.java
@@ -37,7 +37,7 @@ public class VividCreek extends mage.sets.lorwyn.VividCreek {
 
     public VividCreek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/VividGrove.java b/Mage.Sets/src/mage/sets/pdsslivers/VividGrove.java
index 330202bbad..e481d214d4 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/VividGrove.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/VividGrove.java
@@ -37,7 +37,7 @@ public class VividGrove extends mage.sets.lorwyn.VividGrove {
 
     public VividGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/WildPair.java b/Mage.Sets/src/mage/sets/pdsslivers/WildPair.java
index 700d6dbf9f..63ff4cdb49 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/WildPair.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/WildPair.java
@@ -37,7 +37,7 @@ public class WildPair extends mage.sets.planarchaos.WildPair {
 
     public WildPair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/pdsslivers/WingedSliver.java b/Mage.Sets/src/mage/sets/pdsslivers/WingedSliver.java
index b25cd33ce0..d7018f3c75 100644
--- a/Mage.Sets/src/mage/sets/pdsslivers/WingedSliver.java
+++ b/Mage.Sets/src/mage/sets/pdsslivers/WingedSliver.java
@@ -37,7 +37,7 @@ public class WingedSliver extends mage.sets.tempest.WingedSliver {
 
     public WingedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "H09";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/AlliedStrategies.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/AlliedStrategies.java
index c2f161e000..72e0ce8ec9 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/AlliedStrategies.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/AlliedStrategies.java
@@ -37,7 +37,7 @@ public class AlliedStrategies extends mage.sets.planeshift.AlliedStrategies {
 
     public AlliedStrategies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ArmadilloCloak.java
index b3623ec811..39c4fa3f8a 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ArmadilloCloak.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ArmadilloCloak.java
@@ -37,7 +37,7 @@ public class ArmadilloCloak extends mage.sets.invasion.ArmadilloCloak {
 
     public ArmadilloCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/BoneShredder.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/BoneShredder.java
index 0a72936502..37f0d62675 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/BoneShredder.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/BoneShredder.java
@@ -37,7 +37,7 @@ public class BoneShredder extends mage.sets.urzaslegacy.BoneShredder {
 
     public BoneShredder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CarrionFeeder.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CarrionFeeder.java
index e799bb3e25..9be5c5bfb4 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CarrionFeeder.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CarrionFeeder.java
@@ -37,7 +37,7 @@ public class CarrionFeeder extends mage.sets.scourge.CarrionFeeder {
 
     public CarrionFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ChargingTroll.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ChargingTroll.java
index 7f7ab56b2b..f68ba93b2b 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ChargingTroll.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ChargingTroll.java
@@ -37,7 +37,7 @@ public class ChargingTroll extends mage.sets.invasion.ChargingTroll {
 
     public ChargingTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CoalitionRelic.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CoalitionRelic.java
index 732adf1ec0..0138ff7f99 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CoalitionRelic.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/CoalitionRelic.java
@@ -37,7 +37,7 @@ public class CoalitionRelic extends mage.sets.futuresight.CoalitionRelic {
 
     public CoalitionRelic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarigaazsCharm.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarigaazsCharm.java
index f9b513ed30..63dfd17152 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarigaazsCharm.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarigaazsCharm.java
@@ -37,7 +37,7 @@ public class DarigaazsCharm extends mage.sets.planeshift.DarigaazsCharm {
 
     public DarigaazsCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarkRitual.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarkRitual.java
index 51c7432fe1..68b9724a7b 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ElfhamePalace.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ElfhamePalace.java
index b5a28f536d..de1ecc8575 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ElfhamePalace.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ElfhamePalace.java
@@ -37,7 +37,7 @@ public class ElfhamePalace extends mage.sets.invasion.ElfhamePalace {
 
     public ElfhamePalace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/EvasiveAction.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/EvasiveAction.java
index 3850103c92..057ddd51ee 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/EvasiveAction.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/EvasiveAction.java
@@ -37,7 +37,7 @@ public class EvasiveAction extends mage.sets.apocalypse.EvasiveAction {
 
     public EvasiveAction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/FertileGround.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/FertileGround.java
index 5ef0050762..346ed556a3 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/FertileGround.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/FertileGround.java
@@ -37,7 +37,7 @@ public class FertileGround extends mage.sets.urzassaga.FertileGround {
 
     public FertileGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/GerrardCapashen.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/GerrardCapashen.java
index af690b3ab3..6c0440f560 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/GerrardCapashen.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/GerrardCapashen.java
@@ -37,7 +37,7 @@ public class GerrardCapashen extends mage.sets.apocalypse.GerrardCapashen {
 
     public GerrardCapashen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Harrow.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Harrow.java
index fb7f5d721c..cc8661ffc7 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Harrow.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Harrow.java
@@ -37,7 +37,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/HideousEnd.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/HideousEnd.java
index ea1f14f271..03954bfe78 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/HideousEnd.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/HideousEnd.java
@@ -37,7 +37,7 @@ public class HideousEnd extends mage.sets.zendikar.HideousEnd {
 
     public HideousEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LightningGreaves.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LightningGreaves.java
index 792ce9ef06..96bb30a5ff 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LightningGreaves.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LightningGreaves.java
@@ -37,7 +37,7 @@ public class LightningGreaves extends mage.sets.mirrodin.LightningGreaves {
 
     public LightningGreaves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LivingDeath.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LivingDeath.java
index 1b0a872d0e..84f6ce7551 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LivingDeath.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/LivingDeath.java
@@ -37,7 +37,7 @@ public class LivingDeath extends mage.sets.tempest.LivingDeath {
 
     public LivingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NarrowEscape.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NarrowEscape.java
index a602b663fd..209edbdadb 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NarrowEscape.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NarrowEscape.java
@@ -37,7 +37,7 @@ public class NarrowEscape extends mage.sets.zendikar.NarrowEscape {
 
     public NarrowEscape(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NomadicElf.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NomadicElf.java
index 94f5944934..871a3135b5 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NomadicElf.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/NomadicElf.java
@@ -37,7 +37,7 @@ public class NomadicElf extends mage.sets.invasion.NomadicElf {
 
     public NomadicElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/OrderOfYawgmoth.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/OrderOfYawgmoth.java
index de2943f0d0..d21f0d074c 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/OrderOfYawgmoth.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/OrderOfYawgmoth.java
@@ -37,7 +37,7 @@ public class OrderOfYawgmoth extends mage.sets.urzassaga.OrderOfYawgmoth {
 
     public OrderOfYawgmoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianArena.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianArena.java
index 15169978e2..eb41579d8c 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianArena.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianArena.java
@@ -37,7 +37,7 @@ public class PhyrexianArena extends mage.sets.apocalypse.PhyrexianArena {
 
     public PhyrexianArena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianBroodlings.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianBroodlings.java
index f0fd8bb6b5..a63e68413b 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianBroodlings.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianBroodlings.java
@@ -37,7 +37,7 @@ public class PhyrexianBroodlings extends mage.sets.urzaslegacy.PhyrexianBroodlin
 
     public PhyrexianBroodlings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianColossus.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianColossus.java
index 3b2bf38102..d6c5347dd4 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianColossus.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianColossus.java
@@ -37,7 +37,7 @@ public class PhyrexianColossus extends mage.sets.eighthedition.PhyrexianColossus
 
     public PhyrexianColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDebaser.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDebaser.java
index dad9f3289c..acf1f7b059 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDebaser.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDebaser.java
@@ -37,7 +37,7 @@ public class PhyrexianDebaser extends mage.sets.urzaslegacy.PhyrexianDebaser {
 
     public PhyrexianDebaser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDefiler.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDefiler.java
index ff95133fd8..1b03a0aab3 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDefiler.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDefiler.java
@@ -37,7 +37,7 @@ public class PhyrexianDefiler extends mage.sets.urzaslegacy.PhyrexianDefiler {
 
     public PhyrexianDefiler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDenouncer.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDenouncer.java
index 5f911018d8..2140ccd621 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDenouncer.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianDenouncer.java
@@ -37,7 +37,7 @@ public class PhyrexianDenouncer extends mage.sets.urzaslegacy.PhyrexianDenouncer
 
     public PhyrexianDenouncer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGargantua.java
index 863d144266..467e186ffc 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGargantua.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGargantua.java
@@ -37,7 +37,7 @@ public class PhyrexianGargantua extends mage.sets.apocalypse.PhyrexianGargantua
 
     public PhyrexianGargantua(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGhoul.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGhoul.java
index 62a7e277ea..507dfef80a 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGhoul.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianGhoul.java
@@ -37,7 +37,7 @@ public class PhyrexianGhoul extends mage.sets.planechase.PhyrexianGhoul {
 
     public PhyrexianGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianHulk.java
index ea4931861a..97d09b7f05 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDE";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianNegator.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianNegator.java
index b49c9c20ad..2c9ba1ba1e 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianNegator.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianNegator.java
@@ -38,7 +38,7 @@ public class PhyrexianNegator extends mage.sets.urzasdestiny.PhyrexianNegator {
 
     public PhyrexianNegator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDE";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianPlaguelord.java
index 690ca7bf6c..5c9057445e 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianPlaguelord.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianPlaguelord.java
@@ -37,7 +37,7 @@ public class PhyrexianPlaguelord extends mage.sets.urzaslegacy.PhyrexianPlaguelo
 
     public PhyrexianPlaguelord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianProcessor.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianProcessor.java
index fccc17c09d..df2e43130b 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianProcessor.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianProcessor.java
@@ -37,7 +37,7 @@ public class PhyrexianProcessor extends mage.sets.urzassaga.PhyrexianProcessor {
 
     public PhyrexianProcessor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianVault.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianVault.java
index e938d5a34b..7d3ff58f6d 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianVault.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianVault.java
@@ -37,7 +37,7 @@ public class PhyrexianVault extends mage.sets.tenthedition.PhyrexianVault {
 
     public PhyrexianVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PowerArmor.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PowerArmor.java
index ef0c94ae19..7a48425097 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PowerArmor.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PowerArmor.java
@@ -37,7 +37,7 @@ public class PowerArmor extends mage.sets.invasion.PowerArmor {
 
     public PowerArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PriestOfGix.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PriestOfGix.java
index 7964214ab2..ab615540e9 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PriestOfGix.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PriestOfGix.java
@@ -37,7 +37,7 @@ public class PriestOfGix extends mage.sets.urzassaga.PriestOfGix {
 
     public PriestOfGix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PuppetStrings.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PuppetStrings.java
index 4eff782704..46e41fdab2 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PuppetStrings.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PuppetStrings.java
@@ -37,7 +37,7 @@ public class PuppetStrings extends mage.sets.tempest.PuppetStrings {
 
     public PuppetStrings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/QuirionElves.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/QuirionElves.java
index 33665b99cb..94c4da8485 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/QuirionElves.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/QuirionElves.java
@@ -37,7 +37,7 @@ public class QuirionElves extends mage.sets.mirage.QuirionElves {
 
     public QuirionElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithTheAwakener.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithTheAwakener.java
index f921fe0a13..c42e43919b 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithTheAwakener.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithTheAwakener.java
@@ -37,7 +37,7 @@ public class RithTheAwakener extends mage.sets.invasion.RithTheAwakener {
 
     public RithTheAwakener(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithsCharm.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithsCharm.java
index 58cd5a3c54..c09ea7c739 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithsCharm.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/RithsCharm.java
@@ -37,7 +37,7 @@ public class RithsCharm extends mage.sets.planeshift.RithsCharm {
 
     public RithsCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SanguineGuard.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SanguineGuard.java
index be6ee5a579..ad94c73085 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SanguineGuard.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SanguineGuard.java
@@ -37,7 +37,7 @@ public class SanguineGuard extends mage.sets.urzassaga.SanguineGuard {
     
     public SanguineGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDE";
     }
     
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ShivanOasis.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ShivanOasis.java
index 5c03336980..739cf1a45e 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ShivanOasis.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/ShivanOasis.java
@@ -37,7 +37,7 @@ public class ShivanOasis extends mage.sets.planechase.ShivanOasis {
 
     public ShivanOasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Slay.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Slay.java
index bc12150f4a..4b65f11565 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Slay.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Slay.java
@@ -37,7 +37,7 @@ public class Slay extends mage.sets.ninthedition.Slay {
 
     public Slay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SunscapeBattlemage.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SunscapeBattlemage.java
index da3e2bbb8a..7d840d4eb9 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SunscapeBattlemage.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/SunscapeBattlemage.java
@@ -37,7 +37,7 @@ public class SunscapeBattlemage extends mage.sets.planeshift.SunscapeBattlemage
 
     public SunscapeBattlemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TendrilsOfCorruption.java
index 41111fb6d3..bcdb5ef1eb 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TendrilsOfCorruption.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TendrilsOfCorruption.java
@@ -37,7 +37,7 @@ public class TendrilsOfCorruption extends mage.sets.magic2010.TendrilsOfCorrupti
 
     public TendrilsOfCorruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TerramorphicExpanse.java
index 9305d6d58b..3c21385047 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevaTheRenewer.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevaTheRenewer.java
index 60a0259657..5f5543b218 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevaTheRenewer.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevaTheRenewer.java
@@ -37,7 +37,7 @@ public class TrevaTheRenewer extends mage.sets.invasion.TrevaTheRenewer {
 
     public TrevaTheRenewer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevasCharm.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevasCharm.java
index 0061ac6d9c..fbda1430b4 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevasCharm.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TrevasCharm.java
@@ -37,7 +37,7 @@ public class TrevasCharm extends mage.sets.planeshift.TrevasCharm {
 
     public TrevasCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TribalFlames.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TribalFlames.java
index 99a61f33de..94b5e8b025 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TribalFlames.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/TribalFlames.java
@@ -37,7 +37,7 @@ public class TribalFlames extends mage.sets.invasion.TribalFlames {
 
     public TribalFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/VoltaicKey.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/VoltaicKey.java
index 2770f5ce5d..efd09117d2 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/VoltaicKey.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/VoltaicKey.java
@@ -37,7 +37,7 @@ public class VoltaicKey extends mage.sets.magic2011.VoltaicKey {
 
     public VoltaicKey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WhispersilkCloak.java
index 4d7a9e1a19..61ffeac406 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WhispersilkCloak.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WhispersilkCloak.java
@@ -37,7 +37,7 @@ public class WhispersilkCloak extends mage.sets.tenthedition.WhispersilkCloak {
 
     public WhispersilkCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WornPowerstone.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WornPowerstone.java
index c104267637..a07b3d635d 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WornPowerstone.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/WornPowerstone.java
@@ -37,7 +37,7 @@ public class WornPowerstone extends mage.sets.urzassaga.WornPowerstone {
 
     public WornPowerstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/YavimayaElder.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/YavimayaElder.java
index ec78cf192c..e0adad072c 100644
--- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/YavimayaElder.java
+++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/YavimayaElder.java
@@ -37,7 +37,7 @@ public class YavimayaElder extends mage.sets.commander.YavimayaElder {
 
     public YavimayaElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java b/Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java
index 971b3c2942..9a7126c936 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java
@@ -37,7 +37,7 @@ public class AEtherMembrane extends mage.sets.venservskoth.AEtherMembrane {
 
     public AEtherMembrane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/AeonChronicler.java b/Mage.Sets/src/mage/sets/planarchaos/AeonChronicler.java
index a19eedb352..ad09ce65fc 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/AeonChronicler.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/AeonChronicler.java
@@ -37,7 +37,7 @@ public class AeonChronicler extends mage.sets.jacevsvraska.AeonChronicler {
 
     public AeonChronicler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/AkromaAngelOfFury.java b/Mage.Sets/src/mage/sets/planarchaos/AkromaAngelOfFury.java
index 3d443e53c8..5f9918fb9d 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/AkromaAngelOfFury.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/AkromaAngelOfFury.java
@@ -37,7 +37,7 @@ public class AkromaAngelOfFury extends mage.sets.commander.AkromaAngelOfFury {
 
     public AkromaAngelOfFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/AquamorphEntity.java b/Mage.Sets/src/mage/sets/planarchaos/AquamorphEntity.java
index a85602583a..e2162505b0 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/AquamorphEntity.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/AquamorphEntity.java
@@ -37,7 +37,7 @@ public class AquamorphEntity extends mage.sets.speedvscunning.AquamorphEntity {
 
     public AquamorphEntity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/BodyDouble.java b/Mage.Sets/src/mage/sets/planarchaos/BodyDouble.java
index 412d03bc0d..1abeee4bef 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/BodyDouble.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/BodyDouble.java
@@ -37,7 +37,7 @@ public class BodyDouble extends mage.sets.jacevsvraska.BodyDouble {
 
     public BodyDouble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/DeadwoodTreefolk.java b/Mage.Sets/src/mage/sets/planarchaos/DeadwoodTreefolk.java
index 2dcb6aa589..7efe9db126 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/DeadwoodTreefolk.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/DeadwoodTreefolk.java
@@ -37,7 +37,7 @@ public class DeadwoodTreefolk extends mage.sets.commander2013.DeadwoodTreefolk {
 
     public DeadwoodTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Enslave.java b/Mage.Sets/src/mage/sets/planarchaos/Enslave.java
index 6e40d04fd0..7cad499b22 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Enslave.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Enslave.java
@@ -37,7 +37,7 @@ public class Enslave extends mage.sets.newphyrexia.Enslave {
 
     public Enslave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/KavuPredator.java b/Mage.Sets/src/mage/sets/planarchaos/KavuPredator.java
index 2772fc7dd1..6e06a78daf 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/KavuPredator.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/KavuPredator.java
@@ -37,7 +37,7 @@ public class KavuPredator extends mage.sets.heroesvsmonsters.KavuPredator {
 
     public KavuPredator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheArena.java b/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheArena.java
index 8685a407a7..c78152ada9 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheArena.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheArena.java
@@ -37,7 +37,7 @@ public class MagusOfTheArena extends mage.sets.commander2013.MagusOfTheArena {
 
     public MagusOfTheArena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheCoffers.java b/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheCoffers.java
index bea2dd0168..e5e3566714 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheCoffers.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheCoffers.java
@@ -37,7 +37,7 @@ public class MagusOfTheCoffers extends mage.sets.commander2014.MagusOfTheCoffers
 
     public MagusOfTheCoffers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/MesaEnchantress.java b/Mage.Sets/src/mage/sets/planarchaos/MesaEnchantress.java
index b83a170536..1a0606ac72 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/MesaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/MesaEnchantress.java
@@ -37,7 +37,7 @@ public class MesaEnchantress extends mage.sets.magic2010.MesaEnchantress {
 
     public MesaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/NumotTheDevastator.java b/Mage.Sets/src/mage/sets/planarchaos/NumotTheDevastator.java
index 3683fb409a..210e821100 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/NumotTheDevastator.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/NumotTheDevastator.java
@@ -37,7 +37,7 @@ public class NumotTheDevastator extends mage.sets.commander.NumotTheDevastator {
 
     public NumotTheDevastator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/OrosTheAvenger.java b/Mage.Sets/src/mage/sets/planarchaos/OrosTheAvenger.java
index ddd11ddc06..5781788bfb 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/OrosTheAvenger.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/OrosTheAvenger.java
@@ -37,7 +37,7 @@ public class OrosTheAvenger extends mage.sets.commander.OrosTheAvenger {
 
     public OrosTheAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/PrimalPlasma.java b/Mage.Sets/src/mage/sets/planarchaos/PrimalPlasma.java
index 890d7f26a7..7bc35c769a 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/PrimalPlasma.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/PrimalPlasma.java
@@ -37,7 +37,7 @@ public class PrimalPlasma extends mage.sets.planechase2012.PrimalPlasma {
 
     public PrimalPlasma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/planarchaos/ProdigalPyromancer.java
index 9355bac095..f1904ce844 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/ProdigalPyromancer.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/ProdigalPyromancer.java
@@ -37,7 +37,7 @@ public class ProdigalPyromancer extends mage.sets.tenthedition.ProdigalPyromance
 
     public ProdigalPyromancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/RoughTumble.java b/Mage.Sets/src/mage/sets/planarchaos/RoughTumble.java
index 54fb577eda..b4bdee8ccb 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/RoughTumble.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/RoughTumble.java
@@ -38,7 +38,7 @@ public class RoughTumble extends mage.sets.commander2013.RoughTumble {
 
     public RoughTumble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/SerrasBoon.java b/Mage.Sets/src/mage/sets/planarchaos/SerrasBoon.java
index e69ab03d0e..99fad4179f 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/SerrasBoon.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/SerrasBoon.java
@@ -37,7 +37,7 @@ public class SerrasBoon extends mage.sets.divinevsdemonic.SerrasBoon {
 
     public SerrasBoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/ShaperParasite.java b/Mage.Sets/src/mage/sets/planarchaos/ShaperParasite.java
index 584ae91970..56cd07aead 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/ShaperParasite.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/ShaperParasite.java
@@ -37,7 +37,7 @@ public class ShaperParasite extends mage.sets.commander2014.ShaperParasite {
 
     public ShaperParasite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/SkirkShaman.java b/Mage.Sets/src/mage/sets/planarchaos/SkirkShaman.java
index 03584643b8..a7a80fddad 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/SkirkShaman.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/SkirkShaman.java
@@ -37,7 +37,7 @@ public class SkirkShaman extends mage.sets.elvesvsgoblins.SkirkShaman {
 
     public SkirkShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Stonecloaker.java b/Mage.Sets/src/mage/sets/planarchaos/Stonecloaker.java
index 45287333a6..c0079afc86 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Stonecloaker.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Stonecloaker.java
@@ -37,7 +37,7 @@ public class Stonecloaker extends mage.sets.commander2013.Stonecloaker {
 
     public Stonecloaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/TenebTheHarvester.java b/Mage.Sets/src/mage/sets/planarchaos/TenebTheHarvester.java
index 85fce6ceca..600a528705 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/TenebTheHarvester.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/TenebTheHarvester.java
@@ -37,7 +37,7 @@ public class TenebTheHarvester extends mage.sets.commander.TenebTheHarvester {
 
     public TenebTheHarvester(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Torchling.java b/Mage.Sets/src/mage/sets/planarchaos/Torchling.java
index 02a5479adb..7ab5f62fb3 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Torchling.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Torchling.java
@@ -37,7 +37,7 @@ public class Torchling extends mage.sets.venservskoth.Torchling {
 
     public Torchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/VoroshTheHunter.java b/Mage.Sets/src/mage/sets/planarchaos/VoroshTheHunter.java
index a9eb9ec227..e0e011ebbd 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/VoroshTheHunter.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/VoroshTheHunter.java
@@ -37,7 +37,7 @@ public class VoroshTheHunter extends mage.sets.commander.VoroshTheHunter {
 
     public VoroshTheHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/WhitemaneLion.java b/Mage.Sets/src/mage/sets/planarchaos/WhitemaneLion.java
index 282bd443db..000ca9ded0 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/WhitemaneLion.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/WhitemaneLion.java
@@ -37,7 +37,7 @@ public class WhitemaneLion extends mage.sets.commander2014.WhitemaneLion {
 
     public WhitemaneLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "PLC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/AncientDen.java b/Mage.Sets/src/mage/sets/planechase/AncientDen.java
index 721f6d442a..fc760512c0 100644
--- a/Mage.Sets/src/mage/sets/planechase/AncientDen.java
+++ b/Mage.Sets/src/mage/sets/planechase/AncientDen.java
@@ -38,7 +38,7 @@ public class AncientDen extends mage.sets.mirrodin.AncientDen {
 
     public AncientDen (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ArcLightning.java b/Mage.Sets/src/mage/sets/planechase/ArcLightning.java
index 9db8cebfff..6f5b6bfacf 100644
--- a/Mage.Sets/src/mage/sets/planechase/ArcLightning.java
+++ b/Mage.Sets/src/mage/sets/planechase/ArcLightning.java
@@ -38,7 +38,7 @@ public class ArcLightning extends mage.sets.urzassaga.ArcLightning {
 
     public ArcLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ArsenalThresher.java b/Mage.Sets/src/mage/sets/planechase/ArsenalThresher.java
index 1bef117b14..6db2eedd43 100644
--- a/Mage.Sets/src/mage/sets/planechase/ArsenalThresher.java
+++ b/Mage.Sets/src/mage/sets/planechase/ArsenalThresher.java
@@ -37,7 +37,7 @@ public class ArsenalThresher extends mage.sets.alarareborn.ArsenalThresher {
 
     public ArsenalThresher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BalefireLiege.java b/Mage.Sets/src/mage/sets/planechase/BalefireLiege.java
index 76f2e38e02..5b2cc96805 100644
--- a/Mage.Sets/src/mage/sets/planechase/BalefireLiege.java
+++ b/Mage.Sets/src/mage/sets/planechase/BalefireLiege.java
@@ -37,7 +37,7 @@ public class BalefireLiege extends mage.sets.eventide.BalefireLiege {
 
     public BalefireLiege(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BattlegateMimic.java b/Mage.Sets/src/mage/sets/planechase/BattlegateMimic.java
index 3b528346fd..0d6f9ccdb7 100644
--- a/Mage.Sets/src/mage/sets/planechase/BattlegateMimic.java
+++ b/Mage.Sets/src/mage/sets/planechase/BattlegateMimic.java
@@ -37,7 +37,7 @@ public class BattlegateMimic extends mage.sets.eventide.BattlegateMimic {
 
     public BattlegateMimic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BeastHunt.java b/Mage.Sets/src/mage/sets/planechase/BeastHunt.java
index 49a2d5564b..d02949c916 100644
--- a/Mage.Sets/src/mage/sets/planechase/BeastHunt.java
+++ b/Mage.Sets/src/mage/sets/planechase/BeastHunt.java
@@ -37,7 +37,7 @@ public class BeastHunt extends mage.sets.zendikar.BeastHunt {
 
     public BeastHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BeseechTheQueen.java b/Mage.Sets/src/mage/sets/planechase/BeseechTheQueen.java
index 02153ffb8f..6e398c0595 100644
--- a/Mage.Sets/src/mage/sets/planechase/BeseechTheQueen.java
+++ b/Mage.Sets/src/mage/sets/planechase/BeseechTheQueen.java
@@ -37,7 +37,7 @@ public class BeseechTheQueen extends mage.sets.shadowmoor.BeseechTheQueen {
 
     public BeseechTheQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BorosGuildmage.java b/Mage.Sets/src/mage/sets/planechase/BorosGuildmage.java
index 0e04c74c34..f3b6635525 100644
--- a/Mage.Sets/src/mage/sets/planechase/BorosGuildmage.java
+++ b/Mage.Sets/src/mage/sets/planechase/BorosGuildmage.java
@@ -38,7 +38,7 @@ public class BorosGuildmage extends mage.sets.ravnica.BorosGuildmage {
 
     public BorosGuildmage (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BorosSignet.java b/Mage.Sets/src/mage/sets/planechase/BorosSignet.java
index 521a955fec..4ca8331cda 100644
--- a/Mage.Sets/src/mage/sets/planechase/BorosSignet.java
+++ b/Mage.Sets/src/mage/sets/planechase/BorosSignet.java
@@ -38,7 +38,7 @@ public class BorosSignet extends mage.sets.ravnica.BorosSignet {
 
     public BorosSignet (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BranchingBolt.java b/Mage.Sets/src/mage/sets/planechase/BranchingBolt.java
index 039036304b..2f53b94f26 100644
--- a/Mage.Sets/src/mage/sets/planechase/BranchingBolt.java
+++ b/Mage.Sets/src/mage/sets/planechase/BranchingBolt.java
@@ -37,7 +37,7 @@ public class BranchingBolt extends mage.sets.shardsofalara.BranchingBolt {
 
     public BranchingBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Browbeat.java b/Mage.Sets/src/mage/sets/planechase/Browbeat.java
index b96f043a92..d2574f892e 100644
--- a/Mage.Sets/src/mage/sets/planechase/Browbeat.java
+++ b/Mage.Sets/src/mage/sets/planechase/Browbeat.java
@@ -37,7 +37,7 @@ public class Browbeat extends mage.sets.judgment.Browbeat {
 
     public Browbeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/BullCerodon.java b/Mage.Sets/src/mage/sets/planechase/BullCerodon.java
index e51a7cd363..85853af1e4 100644
--- a/Mage.Sets/src/mage/sets/planechase/BullCerodon.java
+++ b/Mage.Sets/src/mage/sets/planechase/BullCerodon.java
@@ -38,7 +38,7 @@ public class BullCerodon extends mage.sets.shardsofalara.BullCerodon {
 
     public BullCerodon (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/CerodonYearling.java b/Mage.Sets/src/mage/sets/planechase/CerodonYearling.java
index 03e520d7fc..e1250b5003 100644
--- a/Mage.Sets/src/mage/sets/planechase/CerodonYearling.java
+++ b/Mage.Sets/src/mage/sets/planechase/CerodonYearling.java
@@ -37,7 +37,7 @@ public class CerodonYearling extends mage.sets.alarareborn.CerodonYearling {
 
     public CerodonYearling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/CinderElemental.java b/Mage.Sets/src/mage/sets/planechase/CinderElemental.java
index 0f532c2dfb..198e94f0b3 100644
--- a/Mage.Sets/src/mage/sets/planechase/CinderElemental.java
+++ b/Mage.Sets/src/mage/sets/planechase/CinderElemental.java
@@ -37,7 +37,7 @@ public class CinderElemental extends mage.sets.gatecrash.CinderElemental {
 
     public CinderElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ConeOfFlame.java b/Mage.Sets/src/mage/sets/planechase/ConeOfFlame.java
index 1e5062f5de..f40e15d273 100644
--- a/Mage.Sets/src/mage/sets/planechase/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/planechase/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Congregate.java b/Mage.Sets/src/mage/sets/planechase/Congregate.java
index beb65c603a..13f3b641d0 100644
--- a/Mage.Sets/src/mage/sets/planechase/Congregate.java
+++ b/Mage.Sets/src/mage/sets/planechase/Congregate.java
@@ -37,7 +37,7 @@ public class Congregate extends mage.sets.urzassaga.Congregate {
 
     public Congregate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/planechase/ConsumeSpirit.java
index 9ebd467abf..66d7611fee 100644
--- a/Mage.Sets/src/mage/sets/planechase/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/planechase/ConsumeSpirit.java
@@ -37,7 +37,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/CopperMyr.java b/Mage.Sets/src/mage/sets/planechase/CopperMyr.java
index 303010475a..a1588d0730 100644
--- a/Mage.Sets/src/mage/sets/planechase/CopperMyr.java
+++ b/Mage.Sets/src/mage/sets/planechase/CopperMyr.java
@@ -38,7 +38,7 @@ public class CopperMyr extends mage.sets.mirrodin.CopperMyr {
 
     public CopperMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/CruelRevival.java b/Mage.Sets/src/mage/sets/planechase/CruelRevival.java
index 08f7de461e..399a5db8a3 100644
--- a/Mage.Sets/src/mage/sets/planechase/CruelRevival.java
+++ b/Mage.Sets/src/mage/sets/planechase/CruelRevival.java
@@ -37,7 +37,7 @@ public class CruelRevival extends mage.sets.onslaught.CruelRevival {
 
     public CruelRevival(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/DarksteelForge.java b/Mage.Sets/src/mage/sets/planechase/DarksteelForge.java
index eb4ef8a2fe..86739d8e1b 100644
--- a/Mage.Sets/src/mage/sets/planechase/DarksteelForge.java
+++ b/Mage.Sets/src/mage/sets/planechase/DarksteelForge.java
@@ -37,7 +37,7 @@ public class DarksteelForge extends mage.sets.darksteel.DarksteelForge {
 
     public DarksteelForge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/DeathBaron.java b/Mage.Sets/src/mage/sets/planechase/DeathBaron.java
index cd6865ad58..91d4d0de7c 100644
--- a/Mage.Sets/src/mage/sets/planechase/DeathBaron.java
+++ b/Mage.Sets/src/mage/sets/planechase/DeathBaron.java
@@ -37,7 +37,7 @@ public class DeathBaron extends mage.sets.shardsofalara.DeathBaron {
 
     public DeathBaron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/DoubleCleave.java b/Mage.Sets/src/mage/sets/planechase/DoubleCleave.java
index 272cb206fb..34f19d9794 100644
--- a/Mage.Sets/src/mage/sets/planechase/DoubleCleave.java
+++ b/Mage.Sets/src/mage/sets/planechase/DoubleCleave.java
@@ -37,7 +37,7 @@ public class DoubleCleave extends mage.sets.eventide.DoubleCleave {
 
     public DoubleCleave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/DregscapeZombie.java b/Mage.Sets/src/mage/sets/planechase/DregscapeZombie.java
index 431b2b2bed..6db420e5c4 100644
--- a/Mage.Sets/src/mage/sets/planechase/DregscapeZombie.java
+++ b/Mage.Sets/src/mage/sets/planechase/DregscapeZombie.java
@@ -38,7 +38,7 @@ public class DregscapeZombie extends mage.sets.shardsofalara.DregscapeZombie {
 
     public DregscapeZombie (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/DuergarHedgeMage.java b/Mage.Sets/src/mage/sets/planechase/DuergarHedgeMage.java
index 991ed93b52..2af1f36258 100644
--- a/Mage.Sets/src/mage/sets/planechase/DuergarHedgeMage.java
+++ b/Mage.Sets/src/mage/sets/planechase/DuergarHedgeMage.java
@@ -37,7 +37,7 @@ public class DuergarHedgeMage extends mage.sets.commander.DuergarHedgeMage {
 
     public DuergarHedgeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Fabricate.java b/Mage.Sets/src/mage/sets/planechase/Fabricate.java
index 0aff5650e7..f8b488fe55 100644
--- a/Mage.Sets/src/mage/sets/planechase/Fabricate.java
+++ b/Mage.Sets/src/mage/sets/planechase/Fabricate.java
@@ -37,7 +37,7 @@ public class Fabricate extends mage.sets.magic2010.Fabricate {
 
     public Fabricate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/FertileGround.java b/Mage.Sets/src/mage/sets/planechase/FertileGround.java
index 3dc61e19f4..5d316d643a 100644
--- a/Mage.Sets/src/mage/sets/planechase/FertileGround.java
+++ b/Mage.Sets/src/mage/sets/planechase/FertileGround.java
@@ -37,7 +37,7 @@ public class FertileGround extends mage.sets.urzassaga.FertileGround {
 
     public FertileGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Fertilid.java b/Mage.Sets/src/mage/sets/planechase/Fertilid.java
index 6a3a848919..516e65e29a 100644
--- a/Mage.Sets/src/mage/sets/planechase/Fertilid.java
+++ b/Mage.Sets/src/mage/sets/planechase/Fertilid.java
@@ -37,7 +37,7 @@ public class Fertilid extends mage.sets.commander.Fertilid {
 
     public Fertilid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ForgottenAncient.java b/Mage.Sets/src/mage/sets/planechase/ForgottenAncient.java
index 3a99a87e5b..6bcd2177fb 100644
--- a/Mage.Sets/src/mage/sets/planechase/ForgottenAncient.java
+++ b/Mage.Sets/src/mage/sets/planechase/ForgottenAncient.java
@@ -37,7 +37,7 @@ public class ForgottenAncient extends mage.sets.scourge.ForgottenAncient {
 
     public ForgottenAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/FurnaceOfRath.java b/Mage.Sets/src/mage/sets/planechase/FurnaceOfRath.java
index 4e26089d59..164e9eb3a8 100644
--- a/Mage.Sets/src/mage/sets/planechase/FurnaceOfRath.java
+++ b/Mage.Sets/src/mage/sets/planechase/FurnaceOfRath.java
@@ -37,7 +37,7 @@ public class FurnaceOfRath extends mage.sets.tempest.FurnaceOfRath {
 
     public FurnaceOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/GloryOfWarfare.java b/Mage.Sets/src/mage/sets/planechase/GloryOfWarfare.java
index 768d763de0..ad584f5596 100644
--- a/Mage.Sets/src/mage/sets/planechase/GloryOfWarfare.java
+++ b/Mage.Sets/src/mage/sets/planechase/GloryOfWarfare.java
@@ -39,7 +39,7 @@ public class GloryOfWarfare extends mage.sets.alarareborn.GloryOfWarfare {
     public GloryOfWarfare (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "HOP";
-        this.cardNumber = 88;
+        this.cardNumber = "88";
     }
 
     public GloryOfWarfare (final GloryOfWarfare card) {
diff --git a/Mage.Sets/src/mage/sets/planechase/GoblinOffensive.java b/Mage.Sets/src/mage/sets/planechase/GoblinOffensive.java
index fb2ee6bcb8..a609a8a963 100644
--- a/Mage.Sets/src/mage/sets/planechase/GoblinOffensive.java
+++ b/Mage.Sets/src/mage/sets/planechase/GoblinOffensive.java
@@ -37,7 +37,7 @@ public class GoblinOffensive extends mage.sets.urzassaga.GoblinOffensive {
 
     public GoblinOffensive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/GoldMyr.java b/Mage.Sets/src/mage/sets/planechase/GoldMyr.java
index bb488f7be9..9ec51934cf 100644
--- a/Mage.Sets/src/mage/sets/planechase/GoldMyr.java
+++ b/Mage.Sets/src/mage/sets/planechase/GoldMyr.java
@@ -38,7 +38,7 @@ public class GoldMyr extends mage.sets.mirrodin.GoldMyr {
 
     public GoldMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/GravePact.java b/Mage.Sets/src/mage/sets/planechase/GravePact.java
index 01c516a7b1..575d180d91 100644
--- a/Mage.Sets/src/mage/sets/planechase/GravePact.java
+++ b/Mage.Sets/src/mage/sets/planechase/GravePact.java
@@ -37,7 +37,7 @@ public class GravePact extends mage.sets.ninthedition.GravePact {
 
     public GravePact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Gravedigger.java b/Mage.Sets/src/mage/sets/planechase/Gravedigger.java
index e981a59aca..80005811e4 100644
--- a/Mage.Sets/src/mage/sets/planechase/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/planechase/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/GreatFurnace.java b/Mage.Sets/src/mage/sets/planechase/GreatFurnace.java
index cf7128fb8f..7af62ca16a 100644
--- a/Mage.Sets/src/mage/sets/planechase/GreatFurnace.java
+++ b/Mage.Sets/src/mage/sets/planechase/GreatFurnace.java
@@ -38,7 +38,7 @@ public class GreatFurnace extends mage.sets.mirrodin.GreatFurnace {
 
     public GreatFurnace (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/HearthfireHobgoblin.java b/Mage.Sets/src/mage/sets/planechase/HearthfireHobgoblin.java
index fb7c956dbc..cb418265eb 100644
--- a/Mage.Sets/src/mage/sets/planechase/HearthfireHobgoblin.java
+++ b/Mage.Sets/src/mage/sets/planechase/HearthfireHobgoblin.java
@@ -37,7 +37,7 @@ public class HearthfireHobgoblin extends mage.sets.eventide.HearthfireHobgoblin
 
     public HearthfireHobgoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/HideousEnd.java b/Mage.Sets/src/mage/sets/planechase/HideousEnd.java
index f8213d42ed..0a4ad052a4 100644
--- a/Mage.Sets/src/mage/sets/planechase/HideousEnd.java
+++ b/Mage.Sets/src/mage/sets/planechase/HideousEnd.java
@@ -37,7 +37,7 @@ public class HideousEnd extends mage.sets.zendikar.HideousEnd {
 
     public HideousEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/HullBreach.java b/Mage.Sets/src/mage/sets/planechase/HullBreach.java
index 5e41fda0fd..7a65957a0b 100644
--- a/Mage.Sets/src/mage/sets/planechase/HullBreach.java
+++ b/Mage.Sets/src/mage/sets/planechase/HullBreach.java
@@ -37,7 +37,7 @@ public class HullBreach extends mage.sets.commander2013.HullBreach {
 
     public HullBreach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/IncrementalBlight.java b/Mage.Sets/src/mage/sets/planechase/IncrementalBlight.java
index d3683af165..2992f32035 100644
--- a/Mage.Sets/src/mage/sets/planechase/IncrementalBlight.java
+++ b/Mage.Sets/src/mage/sets/planechase/IncrementalBlight.java
@@ -37,7 +37,7 @@ public class IncrementalBlight extends mage.sets.shadowmoor.IncrementalBlight {
 
     public IncrementalBlight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Insurrection.java b/Mage.Sets/src/mage/sets/planechase/Insurrection.java
index 3e33f5bacc..e7a438cf44 100644
--- a/Mage.Sets/src/mage/sets/planechase/Insurrection.java
+++ b/Mage.Sets/src/mage/sets/planechase/Insurrection.java
@@ -37,7 +37,7 @@ public class Insurrection extends mage.sets.onslaught.Insurrection {
 
     public Insurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/IronMyr.java b/Mage.Sets/src/mage/sets/planechase/IronMyr.java
index f6e9fbe7cb..6f45bfc4c7 100644
--- a/Mage.Sets/src/mage/sets/planechase/IronMyr.java
+++ b/Mage.Sets/src/mage/sets/planechase/IronMyr.java
@@ -38,7 +38,7 @@ public class IronMyr extends mage.sets.mirrodin.IronMyr {
 
     public IronMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/KeepWatch.java b/Mage.Sets/src/mage/sets/planechase/KeepWatch.java
index 34b0e60526..9ae2b11e6d 100644
--- a/Mage.Sets/src/mage/sets/planechase/KeepWatch.java
+++ b/Mage.Sets/src/mage/sets/planechase/KeepWatch.java
@@ -37,7 +37,7 @@ public class KeepWatch extends mage.sets.judgment.KeepWatch {
 
     public KeepWatch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/KorSanctifiers.java b/Mage.Sets/src/mage/sets/planechase/KorSanctifiers.java
index 14ef97da6f..d892c5d5e4 100644
--- a/Mage.Sets/src/mage/sets/planechase/KorSanctifiers.java
+++ b/Mage.Sets/src/mage/sets/planechase/KorSanctifiers.java
@@ -38,7 +38,7 @@ public class KorSanctifiers extends mage.sets.zendikar.KorSanctifiers {
 
     public KorSanctifiers (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/LeadenMyr.java b/Mage.Sets/src/mage/sets/planechase/LeadenMyr.java
index cd41691793..fde0bc3c36 100644
--- a/Mage.Sets/src/mage/sets/planechase/LeadenMyr.java
+++ b/Mage.Sets/src/mage/sets/planechase/LeadenMyr.java
@@ -38,7 +38,7 @@ public class LeadenMyr extends mage.sets.mirrodin.LeadenMyr {
 
     public LeadenMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/LeechriddenSwamp.java b/Mage.Sets/src/mage/sets/planechase/LeechriddenSwamp.java
index 839451fc07..f514c9d299 100644
--- a/Mage.Sets/src/mage/sets/planechase/LeechriddenSwamp.java
+++ b/Mage.Sets/src/mage/sets/planechase/LeechriddenSwamp.java
@@ -37,7 +37,7 @@ public class LeechriddenSwamp extends mage.sets.shadowmoor.LeechriddenSwamp {
 
     public LeechriddenSwamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/LightningHelix.java b/Mage.Sets/src/mage/sets/planechase/LightningHelix.java
index c7877af52c..b141a5b0d9 100644
--- a/Mage.Sets/src/mage/sets/planechase/LightningHelix.java
+++ b/Mage.Sets/src/mage/sets/planechase/LightningHelix.java
@@ -38,7 +38,7 @@ public class LightningHelix extends mage.sets.ravnica.LightningHelix {
 
     public LightningHelix (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/LivingHive.java b/Mage.Sets/src/mage/sets/planechase/LivingHive.java
index 1b502f6e2e..5e340bd089 100644
--- a/Mage.Sets/src/mage/sets/planechase/LivingHive.java
+++ b/Mage.Sets/src/mage/sets/planechase/LivingHive.java
@@ -37,7 +37,7 @@ public class LivingHive extends mage.sets.mirrodin.LivingHive {
 
     public LivingHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/MageSlayer.java b/Mage.Sets/src/mage/sets/planechase/MageSlayer.java
index 37c6902b8d..2c17aafe63 100644
--- a/Mage.Sets/src/mage/sets/planechase/MageSlayer.java
+++ b/Mage.Sets/src/mage/sets/planechase/MageSlayer.java
@@ -37,7 +37,7 @@ public class MageSlayer extends mage.sets.alarareborn.MageSlayer {
 
     public MageSlayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/planechase/MasterOfEtherium.java
index 69f8506eb7..3477a19a3a 100644
--- a/Mage.Sets/src/mage/sets/planechase/MasterOfEtherium.java
+++ b/Mage.Sets/src/mage/sets/planechase/MasterOfEtherium.java
@@ -37,7 +37,7 @@ public class MasterOfEtherium extends mage.sets.shardsofalara.MasterOfEtherium {
 
     public MasterOfEtherium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/OblivionRing.java b/Mage.Sets/src/mage/sets/planechase/OblivionRing.java
index 136207c98e..54929cf6ed 100644
--- a/Mage.Sets/src/mage/sets/planechase/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/planechase/OblivionRing.java
@@ -38,7 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/OrderChaos.java b/Mage.Sets/src/mage/sets/planechase/OrderChaos.java
index b789a106c4..9426832303 100644
--- a/Mage.Sets/src/mage/sets/planechase/OrderChaos.java
+++ b/Mage.Sets/src/mage/sets/planechase/OrderChaos.java
@@ -38,7 +38,7 @@ public class OrderChaos extends mage.sets.apocalypse.OrderChaos {
 
     public OrderChaos (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/OrimsThunder.java b/Mage.Sets/src/mage/sets/planechase/OrimsThunder.java
index 0fa789f0c0..4323b4679e 100644
--- a/Mage.Sets/src/mage/sets/planechase/OrimsThunder.java
+++ b/Mage.Sets/src/mage/sets/planechase/OrimsThunder.java
@@ -37,7 +37,7 @@ public class OrimsThunder extends mage.sets.apocalypse.OrimsThunder {
 
     public OrimsThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Pentavus.java b/Mage.Sets/src/mage/sets/planechase/Pentavus.java
index 7978d4d7b2..41016444a2 100644
--- a/Mage.Sets/src/mage/sets/planechase/Pentavus.java
+++ b/Mage.Sets/src/mage/sets/planechase/Pentavus.java
@@ -37,7 +37,7 @@ public class Pentavus extends mage.sets.elspethvstezzeret.Pentavus {
 
     public Pentavus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/PhyrexianArena.java b/Mage.Sets/src/mage/sets/planechase/PhyrexianArena.java
index 5459fcf7e0..127bd3cf97 100644
--- a/Mage.Sets/src/mage/sets/planechase/PhyrexianArena.java
+++ b/Mage.Sets/src/mage/sets/planechase/PhyrexianArena.java
@@ -37,7 +37,7 @@ public class PhyrexianArena extends mage.sets.apocalypse.PhyrexianArena {
 
     public PhyrexianArena(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/PrisonTerm.java b/Mage.Sets/src/mage/sets/planechase/PrisonTerm.java
index c59d88a57c..abad36805d 100644
--- a/Mage.Sets/src/mage/sets/planechase/PrisonTerm.java
+++ b/Mage.Sets/src/mage/sets/planechase/PrisonTerm.java
@@ -37,7 +37,7 @@ public class PrisonTerm extends mage.sets.shadowmoor.PrisonTerm {
 
     public PrisonTerm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ProfaneCommand.java b/Mage.Sets/src/mage/sets/planechase/ProfaneCommand.java
index f57f2b8312..15add60735 100644
--- a/Mage.Sets/src/mage/sets/planechase/ProfaneCommand.java
+++ b/Mage.Sets/src/mage/sets/planechase/ProfaneCommand.java
@@ -37,7 +37,7 @@ public class ProfaneCommand extends mage.sets.commander2014.ProfaneCommand {
 
     public ProfaneCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Pyrotechnics.java b/Mage.Sets/src/mage/sets/planechase/Pyrotechnics.java
index 7edd042df0..ba862cfedd 100644
--- a/Mage.Sets/src/mage/sets/planechase/Pyrotechnics.java
+++ b/Mage.Sets/src/mage/sets/planechase/Pyrotechnics.java
@@ -37,7 +37,7 @@ public class Pyrotechnics extends mage.sets.seventhedition.Pyrotechnics {
 
     public Pyrotechnics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/Qumulox.java b/Mage.Sets/src/mage/sets/planechase/Qumulox.java
index 8f0846b581..1e15787bb4 100644
--- a/Mage.Sets/src/mage/sets/planechase/Qumulox.java
+++ b/Mage.Sets/src/mage/sets/planechase/Qumulox.java
@@ -37,7 +37,7 @@ public class Qumulox extends mage.sets.elspethvstezzeret.Qumulox {
 
     public Qumulox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/RampantGrowth.java b/Mage.Sets/src/mage/sets/planechase/RampantGrowth.java
index 4b5eb2c27e..b9bda5cd48 100644
--- a/Mage.Sets/src/mage/sets/planechase/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/planechase/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/RelentlessAssault.java b/Mage.Sets/src/mage/sets/planechase/RelentlessAssault.java
index fe7f5c4770..5af22e4759 100644
--- a/Mage.Sets/src/mage/sets/planechase/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/planechase/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/planechase/RelicOfProgenitus.java
index 1f7cf418d9..622995bc69 100644
--- a/Mage.Sets/src/mage/sets/planechase/RelicOfProgenitus.java
+++ b/Mage.Sets/src/mage/sets/planechase/RelicOfProgenitus.java
@@ -37,7 +37,7 @@ public class RelicOfProgenitus extends mage.sets.shardsofalara.RelicOfProgenitus
 
     public RelicOfProgenitus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/RockslideElemental.java b/Mage.Sets/src/mage/sets/planechase/RockslideElemental.java
index e5db1c4f6e..fa93cf3d22 100644
--- a/Mage.Sets/src/mage/sets/planechase/RockslideElemental.java
+++ b/Mage.Sets/src/mage/sets/planechase/RockslideElemental.java
@@ -37,7 +37,7 @@ public class RockslideElemental extends mage.sets.shardsofalara.RockslideElement
 
     public RockslideElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/RollingThunder.java b/Mage.Sets/src/mage/sets/planechase/RollingThunder.java
index bba6520a18..e6fb48487f 100644
--- a/Mage.Sets/src/mage/sets/planechase/RollingThunder.java
+++ b/Mage.Sets/src/mage/sets/planechase/RollingThunder.java
@@ -38,7 +38,7 @@ public class RollingThunder extends mage.sets.tempestremastered.RollingThunder {
 
     public RollingThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "HOP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/planechase/RottingRats.java b/Mage.Sets/src/mage/sets/planechase/RottingRats.java
index 28d7f1b744..8238366f52 100644
--- a/Mage.Sets/src/mage/sets/planechase/RottingRats.java
+++ b/Mage.Sets/src/mage/sets/planechase/RottingRats.java
@@ -39,7 +39,7 @@ public class RottingRats extends mage.sets.conflux.RottingRats {
     public RottingRats (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "HOP";
-        this.cardNumber = 39;
+        this.cardNumber = "39";
     }
 
     public RottingRats (final RottingRats card) {
diff --git a/Mage.Sets/src/mage/sets/planechase/RumblingSlum.java b/Mage.Sets/src/mage/sets/planechase/RumblingSlum.java
index 1ce5901500..e2a96e496a 100644
--- a/Mage.Sets/src/mage/sets/planechase/RumblingSlum.java
+++ b/Mage.Sets/src/mage/sets/planechase/RumblingSlum.java
@@ -37,7 +37,7 @@ public class RumblingSlum extends mage.sets.guildpact.RumblingSlum {
 
     public RumblingSlum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SavageTwister.java b/Mage.Sets/src/mage/sets/planechase/SavageTwister.java
index ebc7bf1d94..a9d2590219 100644
--- a/Mage.Sets/src/mage/sets/planechase/SavageTwister.java
+++ b/Mage.Sets/src/mage/sets/planechase/SavageTwister.java
@@ -37,7 +37,7 @@ public class SavageTwister extends mage.sets.commander2013.SavageTwister {
 
     public SavageTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SearchForTomorrow.java b/Mage.Sets/src/mage/sets/planechase/SearchForTomorrow.java
index 1ffdcc91b5..7c5ffceca0 100644
--- a/Mage.Sets/src/mage/sets/planechase/SearchForTomorrow.java
+++ b/Mage.Sets/src/mage/sets/planechase/SearchForTomorrow.java
@@ -37,7 +37,7 @@ public class SearchForTomorrow extends mage.sets.timespiral.SearchForTomorrow {
 
     public SearchForTomorrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod.java b/Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod.java
index 9566bcc8c0..484378f2e9 100644
--- a/Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod.java
+++ b/Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod.java
@@ -38,7 +38,7 @@ public class SeatOfTheSynod extends mage.sets.mirrodin.SeatOfTheSynod {
 
     public SeatOfTheSynod (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SerumTank.java b/Mage.Sets/src/mage/sets/planechase/SerumTank.java
index 3994d59143..5cbd0032f4 100644
--- a/Mage.Sets/src/mage/sets/planechase/SerumTank.java
+++ b/Mage.Sets/src/mage/sets/planechase/SerumTank.java
@@ -38,7 +38,7 @@ public class SerumTank extends mage.sets.mirrodin.SerumTank {
 
     public SerumTank (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/ShepherdOfRot.java b/Mage.Sets/src/mage/sets/planechase/ShepherdOfRot.java
index ccf054a930..bd45a1e9c3 100644
--- a/Mage.Sets/src/mage/sets/planechase/ShepherdOfRot.java
+++ b/Mage.Sets/src/mage/sets/planechase/ShepherdOfRot.java
@@ -37,7 +37,7 @@ public class ShepherdOfRot extends mage.sets.onslaught.ShepherdOfRot {
 
     public ShepherdOfRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SilverMyr.java b/Mage.Sets/src/mage/sets/planechase/SilverMyr.java
index 9ad4ae123b..78b11cdc22 100644
--- a/Mage.Sets/src/mage/sets/planechase/SilverMyr.java
+++ b/Mage.Sets/src/mage/sets/planechase/SilverMyr.java
@@ -38,7 +38,7 @@ public class SilverMyr extends mage.sets.mirrodin.SilverMyr {
 
     public SilverMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SludgeStrider.java b/Mage.Sets/src/mage/sets/planechase/SludgeStrider.java
index 5989196bd7..f66cb66569 100644
--- a/Mage.Sets/src/mage/sets/planechase/SludgeStrider.java
+++ b/Mage.Sets/src/mage/sets/planechase/SludgeStrider.java
@@ -37,7 +37,7 @@ public class SludgeStrider extends mage.sets.conflux.SludgeStrider {
 
     public SludgeStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SoulWarden.java b/Mage.Sets/src/mage/sets/planechase/SoulWarden.java
index d60268722b..ac5dc1357d 100644
--- a/Mage.Sets/src/mage/sets/planechase/SoulWarden.java
+++ b/Mage.Sets/src/mage/sets/planechase/SoulWarden.java
@@ -38,7 +38,7 @@ public class SoulWarden extends mage.sets.magic2010.SoulWarden {
 
     public SoulWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SoullessOne.java b/Mage.Sets/src/mage/sets/planechase/SoullessOne.java
index 0ad13358dd..8ed6dbb968 100644
--- a/Mage.Sets/src/mage/sets/planechase/SoullessOne.java
+++ b/Mage.Sets/src/mage/sets/planechase/SoullessOne.java
@@ -37,7 +37,7 @@ public class SoullessOne extends mage.sets.onslaught.SoullessOne {
 
     public SoullessOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/SyphonMind.java b/Mage.Sets/src/mage/sets/planechase/SyphonMind.java
index 82e87ed00c..ba7a723e09 100644
--- a/Mage.Sets/src/mage/sets/planechase/SyphonMind.java
+++ b/Mage.Sets/src/mage/sets/planechase/SyphonMind.java
@@ -37,7 +37,7 @@ public class SyphonMind extends mage.sets.onslaught.SyphonMind {
 
     public SyphonMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/planechase/TerramorphicExpanse.java
index 40263a9b12..297e86cf01 100644
--- a/Mage.Sets/src/mage/sets/planechase/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/planechase/TerramorphicExpanse.java
@@ -38,7 +38,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/TornadoElemental.java b/Mage.Sets/src/mage/sets/planechase/TornadoElemental.java
index 85a849d5bf..12642bea37 100644
--- a/Mage.Sets/src/mage/sets/planechase/TornadoElemental.java
+++ b/Mage.Sets/src/mage/sets/planechase/TornadoElemental.java
@@ -37,7 +37,7 @@ public class TornadoElemental extends mage.sets.fifthdawn.TornadoElemental {
 
     public TornadoElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/TreeOfTales.java b/Mage.Sets/src/mage/sets/planechase/TreeOfTales.java
index 8df31ccf83..f1fd807342 100644
--- a/Mage.Sets/src/mage/sets/planechase/TreeOfTales.java
+++ b/Mage.Sets/src/mage/sets/planechase/TreeOfTales.java
@@ -38,7 +38,7 @@ public class TreeOfTales extends mage.sets.mirrodin.TreeOfTales {
 
     public TreeOfTales (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/VaultOfWhispers.java b/Mage.Sets/src/mage/sets/planechase/VaultOfWhispers.java
index 982a957b5d..a30149ddc0 100644
--- a/Mage.Sets/src/mage/sets/planechase/VaultOfWhispers.java
+++ b/Mage.Sets/src/mage/sets/planechase/VaultOfWhispers.java
@@ -38,7 +38,7 @@ public class VaultOfWhispers extends mage.sets.mirrodin.VaultOfWhispers {
 
     public VaultOfWhispers (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/VerdantForce.java b/Mage.Sets/src/mage/sets/planechase/VerdantForce.java
index a78c725928..d5b1eac6af 100644
--- a/Mage.Sets/src/mage/sets/planechase/VerdantForce.java
+++ b/Mage.Sets/src/mage/sets/planechase/VerdantForce.java
@@ -37,7 +37,7 @@ public class VerdantForce extends mage.sets.tempest.VerdantForce {
 
     public VerdantForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase/WhiplashTrap.java b/Mage.Sets/src/mage/sets/planechase/WhiplashTrap.java
index e9df88d088..e2b3fecdbf 100644
--- a/Mage.Sets/src/mage/sets/planechase/WhiplashTrap.java
+++ b/Mage.Sets/src/mage/sets/planechase/WhiplashTrap.java
@@ -37,7 +37,7 @@ public class WhiplashTrap extends mage.sets.zendikar.WhiplashTrap {
 
     public WhiplashTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "HOP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ArcTrail.java b/Mage.Sets/src/mage/sets/planechase2012/ArcTrail.java
index c861289b7d..5bd6d332c7 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ArcTrail.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ArcTrail.java
@@ -38,7 +38,7 @@ public class ArcTrail extends mage.sets.scarsofmirrodin.ArcTrail {
 
     public ArcTrail (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ArmillarySphere.java b/Mage.Sets/src/mage/sets/planechase2012/ArmillarySphere.java
index 6e5431e1be..4518fd515a 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ArmillarySphere.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ArmillarySphere.java
@@ -37,7 +37,7 @@ public class ArmillarySphere extends mage.sets.conflux.ArmillarySphere {
 
     public ArmillarySphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Assassinate.java b/Mage.Sets/src/mage/sets/planechase2012/Assassinate.java
index b0f40107d8..0666bd2d8a 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Assassinate.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Assassinate.java
@@ -37,7 +37,7 @@ public class Assassinate extends mage.sets.tenthedition.Assassinate {
 
     public Assassinate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/AuguryOwl.java b/Mage.Sets/src/mage/sets/planechase2012/AuguryOwl.java
index 24099db016..257d73d2e4 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/AuguryOwl.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/AuguryOwl.java
@@ -37,7 +37,7 @@ public class AuguryOwl extends mage.sets.magic2011.AuguryOwl {
 
     public AuguryOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/AuraGnarlid.java b/Mage.Sets/src/mage/sets/planechase2012/AuraGnarlid.java
index 6792b71918..c4911c8d1f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/AuraGnarlid.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/AuraGnarlid.java
@@ -37,7 +37,7 @@ public class AuraGnarlid extends mage.sets.riseoftheeldrazi.AuraGnarlid {
 
     public AuraGnarlid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Auramancer.java b/Mage.Sets/src/mage/sets/planechase2012/Auramancer.java
index bb4ad2986e..0dc4225ae8 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Auramancer.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Auramancer.java
@@ -37,7 +37,7 @@ public class Auramancer extends mage.sets.magic2012.Auramancer {
 
     public Auramancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/AwakeningZone.java b/Mage.Sets/src/mage/sets/planechase2012/AwakeningZone.java
index b5a64eb418..1e5c2afa9f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/AwakeningZone.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/AwakeningZone.java
@@ -37,7 +37,7 @@ public class AwakeningZone extends mage.sets.riseoftheeldrazi.AwakeningZone {
 
     public AwakeningZone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BeastWithin.java b/Mage.Sets/src/mage/sets/planechase2012/BeastWithin.java
index 5a93aaa16e..e419aa41a3 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BeastWithin.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BeastWithin.java
@@ -37,7 +37,7 @@ public class BeastWithin extends mage.sets.newphyrexia.BeastWithin {
 
     public BeastWithin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BituminousBlast.java b/Mage.Sets/src/mage/sets/planechase2012/BituminousBlast.java
index 0f0c8d5f83..fe1303eaae 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BituminousBlast.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BituminousBlast.java
@@ -37,7 +37,7 @@ public class BituminousBlast extends mage.sets.alarareborn.BituminousBlast {
 
     public BituminousBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BloodbraidElf.java b/Mage.Sets/src/mage/sets/planechase2012/BloodbraidElf.java
index 189813ade2..93b4f51526 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BloodbraidElf.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BloodbraidElf.java
@@ -37,7 +37,7 @@ public class BloodbraidElf extends mage.sets.alarareborn.BloodbraidElf {
 
     public BloodbraidElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BoarUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/BoarUmbra.java
index 3a53d86432..3fd0a9b4c9 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BoarUmbra.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BoarUmbra.java
@@ -37,7 +37,7 @@ public class BoarUmbra extends mage.sets.riseoftheeldrazi.BoarUmbra {
 
     public BoarUmbra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BrambleElemental.java b/Mage.Sets/src/mage/sets/planechase2012/BrambleElemental.java
index be545c9d08..e4ad6c853e 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BrambleElemental.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BrambleElemental.java
@@ -37,7 +37,7 @@ public class BrambleElemental extends mage.sets.ravnica.BrambleElemental {
 
     public BrambleElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BrutalizerExarch.java b/Mage.Sets/src/mage/sets/planechase2012/BrutalizerExarch.java
index 1a1002aa79..7e7791d0dd 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BrutalizerExarch.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BrutalizerExarch.java
@@ -37,7 +37,7 @@ public class BrutalizerExarch extends mage.sets.newphyrexia.BrutalizerExarch {
 
     public BrutalizerExarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/CadaverImp.java b/Mage.Sets/src/mage/sets/planechase2012/CadaverImp.java
index c266ce3116..9392437c38 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/CadaverImp.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/CadaverImp.java
@@ -37,7 +37,7 @@ public class CadaverImp extends mage.sets.riseoftheeldrazi.CadaverImp {
 
     public CadaverImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/CageOfHands.java b/Mage.Sets/src/mage/sets/planechase2012/CageOfHands.java
index 1b9f8028d4..4f90caec0f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/CageOfHands.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/CageOfHands.java
@@ -37,7 +37,7 @@ public class CageOfHands extends mage.sets.championsofkamigawa.CageOfHands {
 
     public CageOfHands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Cancel.java b/Mage.Sets/src/mage/sets/planechase2012/Cancel.java
index 9d8ce5d0a0..7fbe822a29 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Cancel.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/CelestialAncient.java b/Mage.Sets/src/mage/sets/planechase2012/CelestialAncient.java
index bf84bd4a29..06504b3784 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/CelestialAncient.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/CelestialAncient.java
@@ -37,7 +37,7 @@ public class CelestialAncient extends mage.sets.dissension.CelestialAncient {
 
     public CelestialAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Concentrate.java b/Mage.Sets/src/mage/sets/planechase2012/Concentrate.java
index 023ac87cf9..525d753f45 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Concentrate.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Concentrate.java
@@ -37,7 +37,7 @@ public class Concentrate extends mage.sets.odyssey.Concentrate {
 
     public Concentrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Cultivate.java b/Mage.Sets/src/mage/sets/planechase2012/Cultivate.java
index 05c7403a71..739e7d10a5 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Cultivate.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Cultivate.java
@@ -37,7 +37,7 @@ public class Cultivate extends mage.sets.magic2011.Cultivate {
 
     public Cultivate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/DarkHatchling.java b/Mage.Sets/src/mage/sets/planechase2012/DarkHatchling.java
index 78904919e9..5f22a45765 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/DarkHatchling.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/DarkHatchling.java
@@ -37,7 +37,7 @@ public class DarkHatchling extends mage.sets.urzassaga.DarkHatchling {
 
     public DarkHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/DenyReality.java b/Mage.Sets/src/mage/sets/planechase2012/DenyReality.java
index 5ff1df5cf7..f41a3e751a 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/DenyReality.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/DenyReality.java
@@ -37,7 +37,7 @@ public class DenyReality extends mage.sets.alarareborn.DenyReality {
 
     public DenyReality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/DimirAqueduct.java b/Mage.Sets/src/mage/sets/planechase2012/DimirAqueduct.java
index ab1f532eec..93c768bf47 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/DimirAqueduct.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/DimirAqueduct.java
@@ -37,7 +37,7 @@ public class DimirAqueduct extends mage.sets.ravnica.DimirAqueduct {
 
     public DimirAqueduct(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/DimirInfiltrator.java b/Mage.Sets/src/mage/sets/planechase2012/DimirInfiltrator.java
index dbee846250..794290dc40 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/DimirInfiltrator.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/DimirInfiltrator.java
@@ -37,7 +37,7 @@ public class DimirInfiltrator extends mage.sets.ravnica.DimirInfiltrator {
 
     public DimirInfiltrator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/DowsingShaman.java b/Mage.Sets/src/mage/sets/planechase2012/DowsingShaman.java
index e4f2009e86..2ba25d7275 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/DowsingShaman.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/DowsingShaman.java
@@ -37,7 +37,7 @@ public class DowsingShaman extends mage.sets.ravnica.DowsingShaman {
 
     public DowsingShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/EnigmaSphinx.java b/Mage.Sets/src/mage/sets/planechase2012/EnigmaSphinx.java
index da3d44c118..eb9d25941c 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/EnigmaSphinx.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/EnigmaSphinx.java
@@ -37,7 +37,7 @@ public class EnigmaSphinx extends mage.sets.alarareborn.EnigmaSphinx {
 
     public EnigmaSphinx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/EnlistedWurm.java b/Mage.Sets/src/mage/sets/planechase2012/EnlistedWurm.java
index cd893b7594..1d3823719d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/EnlistedWurm.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/EnlistedWurm.java
@@ -37,7 +37,7 @@ public class EnlistedWurm extends mage.sets.alarareborn.EnlistedWurm {
 
     public EnlistedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ExoticOrchard.java b/Mage.Sets/src/mage/sets/planechase2012/ExoticOrchard.java
index e5b14da9c9..98f7914ce3 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ExoticOrchard.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ExoticOrchard.java
@@ -37,7 +37,7 @@ public class ExoticOrchard extends mage.sets.conflux.ExoticOrchard {
 
     public ExoticOrchard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/FarsightMask.java b/Mage.Sets/src/mage/sets/planechase2012/FarsightMask.java
index 6df4ab048f..3cd0ff5445 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/FarsightMask.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/FarsightMask.java
@@ -37,7 +37,7 @@ public class FarsightMask extends mage.sets.mirrodin.FarsightMask {
 
     public FarsightMask(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/FieryConclusion.java b/Mage.Sets/src/mage/sets/planechase2012/FieryConclusion.java
index ccc963936d..fd010347de 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/FieryConclusion.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/FieryConclusion.java
@@ -37,7 +37,7 @@ public class FieryConclusion extends mage.sets.ravnica.FieryConclusion {
 
     public FieryConclusion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/FieryFall.java b/Mage.Sets/src/mage/sets/planechase2012/FieryFall.java
index 38eb87e5a3..b5c7b45987 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/FieryFall.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/FieryFall.java
@@ -37,7 +37,7 @@ public class FieryFall extends mage.sets.conflux.FieryFall {
 
     public FieryFall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/planechase2012/FiresOfYavimaya.java
index 40f61c24eb..951f997e0d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/FlayerHusk.java b/Mage.Sets/src/mage/sets/planechase2012/FlayerHusk.java
index cee7c2f568..facf50083f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/FlayerHusk.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/FlayerHusk.java
@@ -37,7 +37,7 @@ public class FlayerHusk extends mage.sets.mirrodinbesieged.FlayerHusk {
 
     public FlayerHusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Fling.java b/Mage.Sets/src/mage/sets/planechase2012/Fling.java
index f2710d6b24..6aefb17bbe 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Fling.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Fling.java
@@ -37,7 +37,7 @@ public class Fling extends mage.sets.magic2011.Fling {
 
     public Fling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/FusionElemental.java b/Mage.Sets/src/mage/sets/planechase2012/FusionElemental.java
index 0e630a7fb2..44e944fd9c 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/FusionElemental.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/FusionElemental.java
@@ -37,7 +37,7 @@ public class FusionElemental extends mage.sets.conflux.FusionElemental {
 
     public FusionElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/GhostlyPrison.java b/Mage.Sets/src/mage/sets/planechase2012/GhostlyPrison.java
index c65dd02df0..08a34cb52f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/GhostlyPrison.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/GhostlyPrison.java
@@ -37,7 +37,7 @@ public class GhostlyPrison extends mage.sets.championsofkamigawa.GhostlyPrison {
 
     public GhostlyPrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/GlenElendraLiege.java b/Mage.Sets/src/mage/sets/planechase2012/GlenElendraLiege.java
index 14337a06ef..d62fc139a8 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/GlenElendraLiege.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/GlenElendraLiege.java
@@ -37,7 +37,7 @@ public class GlenElendraLiege extends mage.sets.shadowmoor.GlenElendraLiege {
 
     public GlenElendraLiege(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/GluttonousSlime.java b/Mage.Sets/src/mage/sets/planechase2012/GluttonousSlime.java
index ba15fdfa41..fb89bce9d3 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/GluttonousSlime.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/GluttonousSlime.java
@@ -37,7 +37,7 @@ public class GluttonousSlime extends mage.sets.conflux.GluttonousSlime {
 
     public GluttonousSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/GraypeltRefuge.java b/Mage.Sets/src/mage/sets/planechase2012/GraypeltRefuge.java
index 1362845616..2405aef89d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/GraypeltRefuge.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/GraypeltRefuge.java
@@ -37,7 +37,7 @@ public class GraypeltRefuge extends mage.sets.zendikar.GraypeltRefuge {
 
     public GraypeltRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/GruulTurf.java b/Mage.Sets/src/mage/sets/planechase2012/GruulTurf.java
index c85e6eca21..161220968e 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/GruulTurf.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/GruulTurf.java
@@ -37,7 +37,7 @@ public class GruulTurf extends mage.sets.planechase.GruulTurf {
 
     public GruulTurf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/GuardGomazoa.java b/Mage.Sets/src/mage/sets/planechase2012/GuardGomazoa.java
index ffef0d9174..c98e2d98e5 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/GuardGomazoa.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/GuardGomazoa.java
@@ -37,7 +37,7 @@ public class GuardGomazoa extends mage.sets.riseoftheeldrazi.GuardGomazoa {
 
     public GuardGomazoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/HellionEruption.java b/Mage.Sets/src/mage/sets/planechase2012/HellionEruption.java
index 9fd2def4d8..4f0679e074 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/HellionEruption.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/HellionEruption.java
@@ -37,7 +37,7 @@ public class HellionEruption extends mage.sets.riseoftheeldrazi.HellionEruption
 
     public HellionEruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/HellkiteHatchling.java b/Mage.Sets/src/mage/sets/planechase2012/HellkiteHatchling.java
index 49ff045840..46f4db207b 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/HellkiteHatchling.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/HellkiteHatchling.java
@@ -37,7 +37,7 @@ public class HellkiteHatchling extends mage.sets.conflux.HellkiteHatchling {
 
     public HellkiteHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/HigureTheStillWind.java b/Mage.Sets/src/mage/sets/planechase2012/HigureTheStillWind.java
index e22acf22cc..e8459fef1f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/HigureTheStillWind.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/HigureTheStillWind.java
@@ -37,7 +37,7 @@ public class HigureTheStillWind extends mage.sets.betrayersofkamigawa.HigureTheS
 
     public HigureTheStillWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/HissingIguanar.java b/Mage.Sets/src/mage/sets/planechase2012/HissingIguanar.java
index 5ab84b5e45..7571c28c82 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/HissingIguanar.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/HissingIguanar.java
@@ -37,7 +37,7 @@ public class HissingIguanar extends mage.sets.shardsofalara.HissingIguanar {
 
     public HissingIguanar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/HyenaUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/HyenaUmbra.java
index ece4d40040..3cd81a27ef 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/HyenaUmbra.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/HyenaUmbra.java
@@ -37,7 +37,7 @@ public class HyenaUmbra extends mage.sets.riseoftheeldrazi.HyenaUmbra {
 
     public HyenaUmbra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/InkEyesServantOfOni.java b/Mage.Sets/src/mage/sets/planechase2012/InkEyesServantOfOni.java
index f3d3c4c564..0448e14dce 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/InkEyesServantOfOni.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/InkEyesServantOfOni.java
@@ -37,7 +37,7 @@ public class InkEyesServantOfOni extends mage.sets.betrayersofkamigawa.InkEyesSe
 
     public InkEyesServantOfOni(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/JwarIsleRefuge.java b/Mage.Sets/src/mage/sets/planechase2012/JwarIsleRefuge.java
index b913cbda98..b336bb8ee1 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/JwarIsleRefuge.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/JwarIsleRefuge.java
@@ -37,7 +37,7 @@ public class JwarIsleRefuge extends mage.sets.zendikar.JwarIsleRefuge {
 
     public JwarIsleRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/KathariRemnant.java b/Mage.Sets/src/mage/sets/planechase2012/KathariRemnant.java
index a4783e96cb..60daa68cb2 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/KathariRemnant.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/KathariRemnant.java
@@ -37,7 +37,7 @@ public class KathariRemnant extends mage.sets.alarareborn.KathariRemnant {
 
     public KathariRemnant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/KazanduRefuge.java b/Mage.Sets/src/mage/sets/planechase2012/KazanduRefuge.java
index eb622e0c21..cb053d8db4 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/KazanduRefuge.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/KazanduRefuge.java
@@ -37,7 +37,7 @@ public class KazanduRefuge extends mage.sets.zendikar.KazanduRefuge {
 
     public KazanduRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/KhalniGarden.java b/Mage.Sets/src/mage/sets/planechase2012/KhalniGarden.java
index 7e1fd82f5f..8e12eb7994 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/KhalniGarden.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/KhalniGarden.java
@@ -37,7 +37,7 @@ public class KhalniGarden extends mage.sets.worldwake.KhalniGarden {
 
     public KhalniGarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/KorSpiritdancer.java b/Mage.Sets/src/mage/sets/planechase2012/KorSpiritdancer.java
index 904bce2559..3c9692b012 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/KorSpiritdancer.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/KorSpiritdancer.java
@@ -37,7 +37,7 @@ public class KorSpiritdancer extends mage.sets.riseoftheeldrazi.KorSpiritdancer
 
     public KorSpiritdancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/LilianasSpecter.java b/Mage.Sets/src/mage/sets/planechase2012/LilianasSpecter.java
index c73bb01d84..bab218d9bd 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/LilianasSpecter.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/LilianasSpecter.java
@@ -37,7 +37,7 @@ public class LilianasSpecter extends mage.sets.magic2011.LilianasSpecter {
 
     public LilianasSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Lumberknot.java b/Mage.Sets/src/mage/sets/planechase2012/Lumberknot.java
index 7fe6604074..17d031c22b 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Lumberknot.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Lumberknot.java
@@ -37,7 +37,7 @@ public class Lumberknot extends mage.sets.innistrad.Lumberknot {
 
     public Lumberknot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/MammothUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/MammothUmbra.java
index 905364af26..98f5a11fa0 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/MammothUmbra.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/MammothUmbra.java
@@ -37,7 +37,7 @@ public class MammothUmbra extends mage.sets.riseoftheeldrazi.MammothUmbra {
 
     public MammothUmbra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/MarkOfMutiny.java b/Mage.Sets/src/mage/sets/planechase2012/MarkOfMutiny.java
index 7977511b29..f86eaad272 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/MarkOfMutiny.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/MarkOfMutiny.java
@@ -37,7 +37,7 @@ public class MarkOfMutiny extends mage.sets.zendikar.MarkOfMutiny {
 
     public MarkOfMutiny(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/MistbladeShinobi.java b/Mage.Sets/src/mage/sets/planechase2012/MistbladeShinobi.java
index fab9b97c2e..b406b3e4b2 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/MistbladeShinobi.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/MistbladeShinobi.java
@@ -37,7 +37,7 @@ public class MistbladeShinobi extends mage.sets.betrayersofkamigawa.MistbladeShi
 
     public MistbladeShinobi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/MitoticSlime.java b/Mage.Sets/src/mage/sets/planechase2012/MitoticSlime.java
index 63c48e30f9..523f37cf8c 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/MitoticSlime.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/MitoticSlime.java
@@ -37,7 +37,7 @@ public class MitoticSlime extends mage.sets.magic2011.MitoticSlime {
 
     public MitoticSlime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/planechase2012/MudbuttonTorchrunner.java
index f4ffd21782..af11c0fada 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/MudbuttonTorchrunner.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/MudbuttonTorchrunner.java
@@ -37,7 +37,7 @@ public class MudbuttonTorchrunner extends mage.sets.lorwyn.MudbuttonTorchrunner
 
     public MudbuttonTorchrunner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Mycoloth.java b/Mage.Sets/src/mage/sets/planechase2012/Mycoloth.java
index 85e34e15f7..32ef1dce6a 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Mycoloth.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Mycoloth.java
@@ -37,7 +37,7 @@ public class Mycoloth extends mage.sets.shardsofalara.Mycoloth {
 
     public Mycoloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/NestInvader.java b/Mage.Sets/src/mage/sets/planechase2012/NestInvader.java
index bd19a00abe..d2319c7017 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/NestInvader.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/NestInvader.java
@@ -37,7 +37,7 @@ public class NestInvader extends mage.sets.riseoftheeldrazi.NestInvader {
 
     public NestInvader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/NinjaOfTheDeepHours.java b/Mage.Sets/src/mage/sets/planechase2012/NinjaOfTheDeepHours.java
index 6ac06ca268..9ff84b9b4b 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/NinjaOfTheDeepHours.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/NinjaOfTheDeepHours.java
@@ -37,7 +37,7 @@ public class NinjaOfTheDeepHours extends mage.sets.betrayersofkamigawa.NinjaOfTh
 
     public NinjaOfTheDeepHours(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/OkibaGangShinobi.java b/Mage.Sets/src/mage/sets/planechase2012/OkibaGangShinobi.java
index b25e0e70e3..e1db4283df 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/OkibaGangShinobi.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/OkibaGangShinobi.java
@@ -37,7 +37,7 @@ public class OkibaGangShinobi extends mage.sets.betrayersofkamigawa.OkibaGangShi
 
     public OkibaGangShinobi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/OnduGiant.java b/Mage.Sets/src/mage/sets/planechase2012/OnduGiant.java
index ee0d00f0d1..1dee89772a 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/OnduGiant.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/OnduGiant.java
@@ -37,7 +37,7 @@ public class OnduGiant extends mage.sets.riseoftheeldrazi.OnduGiant {
 
     public OnduGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Overrun.java b/Mage.Sets/src/mage/sets/planechase2012/Overrun.java
index 6a121a2e6b..3dc9f5442f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Overrun.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/PeregrineDrake.java b/Mage.Sets/src/mage/sets/planechase2012/PeregrineDrake.java
index 0b0561cb43..7cdee83d2a 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/PeregrineDrake.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/PeregrineDrake.java
@@ -37,7 +37,7 @@ public class PeregrineDrake extends mage.sets.urzassaga.PeregrineDrake {
 
     public PeregrineDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/PredatoryUrge.java b/Mage.Sets/src/mage/sets/planechase2012/PredatoryUrge.java
index bcd9aff80e..491bff3793 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/PredatoryUrge.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/PredatoryUrge.java
@@ -37,7 +37,7 @@ public class PredatoryUrge extends mage.sets.zendikar.PredatoryUrge {
 
     public PredatoryUrge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/QuietusSpike.java b/Mage.Sets/src/mage/sets/planechase2012/QuietusSpike.java
index 3bd02360d1..aa1fea8ac6 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/QuietusSpike.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/QuietusSpike.java
@@ -37,7 +37,7 @@ public class QuietusSpike extends mage.sets.shardsofalara.QuietusSpike {
 
     public QuietusSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Rancor.java b/Mage.Sets/src/mage/sets/planechase2012/Rancor.java
index 6a8bdb263f..4c19c8b6af 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Rancor.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Rancor.java
@@ -37,7 +37,7 @@ public class Rancor extends mage.sets.urzaslegacy.Rancor {
 
     public Rancor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/RuptureSpire.java b/Mage.Sets/src/mage/sets/planechase2012/RuptureSpire.java
index e6e17ce945..d4bcee6ab7 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/RuptureSpire.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/RuptureSpire.java
@@ -37,7 +37,7 @@ public class RuptureSpire extends mage.sets.conflux.RuptureSpire {
 
     public RuptureSpire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SeeBeyond.java b/Mage.Sets/src/mage/sets/planechase2012/SeeBeyond.java
index b8b4891cf1..6c6acf1964 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SeeBeyond.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SeeBeyond.java
@@ -37,7 +37,7 @@ public class SeeBeyond extends mage.sets.riseoftheeldrazi.SeeBeyond {
 
     public SeeBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/planechase2012/SelesnyaSanctuary.java
index 1ba1e01b20..597760e8cf 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SelesnyaSanctuary.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SelesnyaSanctuary.java
@@ -37,7 +37,7 @@ public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
 
     public SelesnyaSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ShimmeringGrotto.java b/Mage.Sets/src/mage/sets/planechase2012/ShimmeringGrotto.java
index 6d7e9f01e0..51f948bfd0 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ShimmeringGrotto.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ShimmeringGrotto.java
@@ -37,7 +37,7 @@ public class ShimmeringGrotto extends mage.sets.lorwyn.ShimmeringGrotto {
 
     public ShimmeringGrotto(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/planechase2012/SigilOfTheEmptyThrone.java
index c78212827e..5a7cf1aad9 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SigilOfTheEmptyThrone.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SigilOfTheEmptyThrone.java
@@ -37,7 +37,7 @@ public class SigilOfTheEmptyThrone extends mage.sets.conflux.SigilOfTheEmptyThro
 
     public SigilOfTheEmptyThrone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SilhanaLedgewalker.java b/Mage.Sets/src/mage/sets/planechase2012/SilhanaLedgewalker.java
index 3b445f1c77..bf751edc1b 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SilhanaLedgewalker.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SilhanaLedgewalker.java
@@ -37,7 +37,7 @@ public class SilhanaLedgewalker extends mage.sets.guildpact.SilhanaLedgewalker {
 
     public SilhanaLedgewalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SkarrgTheRagePits.java b/Mage.Sets/src/mage/sets/planechase2012/SkarrgTheRagePits.java
index 9d49c4ac48..d3c6dcbee5 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SkarrgTheRagePits.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SkarrgTheRagePits.java
@@ -37,7 +37,7 @@ public class SkarrgTheRagePits extends mage.sets.guildpact.SkarrgTheRagePits {
 
     public SkarrgTheRagePits(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/Skullsnatcher.java b/Mage.Sets/src/mage/sets/planechase2012/Skullsnatcher.java
index b1ebf5fae6..71b212925e 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/Skullsnatcher.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/Skullsnatcher.java
@@ -37,7 +37,7 @@ public class Skullsnatcher extends mage.sets.betrayersofkamigawa.Skullsnatcher {
 
     public Skullsnatcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SnakeUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/SnakeUmbra.java
index 0038747fd0..0c9c0e4c15 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SnakeUmbra.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SnakeUmbra.java
@@ -37,7 +37,7 @@ public class SnakeUmbra extends mage.sets.riseoftheeldrazi.SnakeUmbra {
 
     public SnakeUmbra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SpiritMantle.java b/Mage.Sets/src/mage/sets/planechase2012/SpiritMantle.java
index a96f2ab594..484ecea076 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SpiritMantle.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SpiritMantle.java
@@ -37,7 +37,7 @@ public class SpiritMantle extends mage.sets.magic2012.SpiritMantle {
 
     public SpiritMantle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/SunkenHope.java b/Mage.Sets/src/mage/sets/planechase2012/SunkenHope.java
index e73df8b59c..64ba29a43d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/SunkenHope.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/SunkenHope.java
@@ -37,7 +37,7 @@ public class SunkenHope extends mage.sets.planeshift.SunkenHope {
 
     public SunkenHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/planechase2012/TerramorphicExpanse.java
index c13cc1699b..0820127df9 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThornThrashViashino.java b/Mage.Sets/src/mage/sets/planechase2012/ThornThrashViashino.java
index bb115604f6..84ea996d4d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ThornThrashViashino.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ThornThrashViashino.java
@@ -37,7 +37,7 @@ public class ThornThrashViashino extends mage.sets.shardsofalara.ThornThrashVias
 
     public ThornThrashViashino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThranGolem.java b/Mage.Sets/src/mage/sets/planechase2012/ThranGolem.java
index 72be9950e1..529e220feb 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ThranGolem.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ThranGolem.java
@@ -37,7 +37,7 @@ public class ThranGolem extends mage.sets.magic2012.ThranGolem {
 
     public ThranGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThroatSlitter.java b/Mage.Sets/src/mage/sets/planechase2012/ThroatSlitter.java
index 75a0ac7029..98d0549f10 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ThroatSlitter.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ThroatSlitter.java
@@ -38,7 +38,7 @@ public class ThroatSlitter extends mage.sets.betrayersofkamigawa.ThroatSlitter {
 
     public ThroatSlitter (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThunderThrashElder.java b/Mage.Sets/src/mage/sets/planechase2012/ThunderThrashElder.java
index a8ab03363f..a8263d7bb0 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ThunderThrashElder.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ThunderThrashElder.java
@@ -37,7 +37,7 @@ public class ThunderThrashElder extends mage.sets.shardsofalara.ThunderThrashEld
 
     public ThunderThrashElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/TormentedSoul.java b/Mage.Sets/src/mage/sets/planechase2012/TormentedSoul.java
index d3f55c45c1..0d9f8bb82f 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/TormentedSoul.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/TormentedSoul.java
@@ -37,7 +37,7 @@ public class TormentedSoul extends mage.sets.magic2012.TormentedSoul {
 
     public TormentedSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/TukatongueThallid.java b/Mage.Sets/src/mage/sets/planechase2012/TukatongueThallid.java
index 4110b55b54..c1b5077280 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/TukatongueThallid.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/TukatongueThallid.java
@@ -37,7 +37,7 @@ public class TukatongueThallid extends mage.sets.conflux.TukatongueThallid {
 
     public TukatongueThallid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ViridianEmissary.java b/Mage.Sets/src/mage/sets/planechase2012/ViridianEmissary.java
index 50133808a0..2e0bf92780 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ViridianEmissary.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ViridianEmissary.java
@@ -37,7 +37,7 @@ public class ViridianEmissary extends mage.sets.mirrodinbesieged.ViridianEmissar
 
     public ViridianEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/sets/planechase2012/VituGhaziTheCityTree.java
index cba85417b3..64f3446ac7 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/VituGhaziTheCityTree.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/VituGhaziTheCityTree.java
@@ -37,7 +37,7 @@ public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree
 
     public VituGhaziTheCityTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/VividCreek.java b/Mage.Sets/src/mage/sets/planechase2012/VividCreek.java
index ad6d1be2df..0ae08f1c4c 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/VividCreek.java
@@ -37,7 +37,7 @@ public class VividCreek extends mage.sets.lorwyn.VividCreek {
 
     public VividCreek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/WalkerOfSecretWays.java b/Mage.Sets/src/mage/sets/planechase2012/WalkerOfSecretWays.java
index 648b4410d2..1cf16f1190 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/WalkerOfSecretWays.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/WalkerOfSecretWays.java
@@ -38,7 +38,7 @@ public class WalkerOfSecretWays extends mage.sets.betrayersofkamigawa.WalkerOfSe
 
     public WalkerOfSecretWays (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/planechase2012/WallOfBlossoms.java
index a1593c8f01..e7ee42f20d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/WallOfBlossoms.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/WallOfBlossoms.java
@@ -37,7 +37,7 @@ public class WallOfBlossoms extends mage.sets.stronghold.WallOfBlossoms {
 
     public WallOfBlossoms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/WallOfFrost.java b/Mage.Sets/src/mage/sets/planechase2012/WallOfFrost.java
index f560c3dc30..ecd2c100e9 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/WallOfFrost.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/WallOfFrost.java
@@ -37,7 +37,7 @@ public class WallOfFrost extends mage.sets.magic2010.WallOfFrost {
 
     public WallOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/WarstormSurge.java b/Mage.Sets/src/mage/sets/planechase2012/WarstormSurge.java
index bf34d22fee..25937aaea7 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/WarstormSurge.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/WarstormSurge.java
@@ -37,7 +37,7 @@ public class WarstormSurge extends mage.sets.magic2012.WarstormSurge {
 
     public WarstormSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/planechase2012/WhispersilkCloak.java
index bb983e6778..abc72fab4d 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/WhispersilkCloak.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/WhispersilkCloak.java
@@ -37,7 +37,7 @@ public class WhispersilkCloak extends mage.sets.tenthedition.WhispersilkCloak {
 
     public WhispersilkCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "PC2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/CrosissCharm.java b/Mage.Sets/src/mage/sets/planeshift/CrosissCharm.java
index d6975ac0f5..f17cf7bab5 100644
--- a/Mage.Sets/src/mage/sets/planeshift/CrosissCharm.java
+++ b/Mage.Sets/src/mage/sets/planeshift/CrosissCharm.java
@@ -37,7 +37,7 @@ public class CrosissCharm extends mage.sets.commander2013.CrosissCharm {
 
     public CrosissCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/Draco.java b/Mage.Sets/src/mage/sets/planeshift/Draco.java
index 4de19ca60f..d85f36779b 100644
--- a/Mage.Sets/src/mage/sets/planeshift/Draco.java
+++ b/Mage.Sets/src/mage/sets/planeshift/Draco.java
@@ -37,7 +37,7 @@ public class Draco extends mage.sets.ftvdragons.Draco {
 
     public Draco(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/DromarsCharm.java b/Mage.Sets/src/mage/sets/planeshift/DromarsCharm.java
index 3004a787be..aaaa2d05e7 100644
--- a/Mage.Sets/src/mage/sets/planeshift/DromarsCharm.java
+++ b/Mage.Sets/src/mage/sets/planeshift/DromarsCharm.java
@@ -37,7 +37,7 @@ public class DromarsCharm extends mage.sets.commander2013.DromarsCharm {
 
     public DromarsCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted.java b/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted1.java
similarity index 90%
rename from Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted.java
rename to Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted1.java
index 8771358fb2..ff144d7b96 100644
--- a/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted.java
+++ b/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted1.java
@@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent;
  *
  * @author fireshoes
  */
-public class ErtaiTheCorrupted extends CardImpl {
+public class ErtaiTheCorrupted1 extends CardImpl {
     
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("a creature or enchantment");
     
@@ -57,8 +57,8 @@ public class ErtaiTheCorrupted extends CardImpl {
         filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ENCHANTMENT)));
     }
 
-    public ErtaiTheCorrupted(UUID ownerId) {
-        super(ownerId, 107, "Ertai, the Corrupted", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{U}{B}");
+    public ErtaiTheCorrupted1(UUID ownerId) {
+        super(ownerId, "107a", "Ertai, the Corrupted", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{U}{B}");
         this.expansionSetCode = "PLS";
         this.supertype.add("Legendary");
         this.subtype.add("Human");
@@ -74,12 +74,12 @@ public class ErtaiTheCorrupted extends CardImpl {
         this.addAbility(ability);
 }
 
-    public ErtaiTheCorrupted(final ErtaiTheCorrupted card) {
+    public ErtaiTheCorrupted1(final ErtaiTheCorrupted1 card) {
         super(card);
     }
 
     @Override
-    public ErtaiTheCorrupted copy() {
-        return new ErtaiTheCorrupted(this);
+    public ErtaiTheCorrupted1 copy() {
+        return new ErtaiTheCorrupted1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted2.java b/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted2.java
new file mode 100644
index 0000000000..603fe5b1d8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/planeshift/ErtaiTheCorrupted2.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.planeshift;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class ErtaiTheCorrupted2 extends ErtaiTheCorrupted1 {
+
+    public ErtaiTheCorrupted2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = "107b";
+}
+
+    public ErtaiTheCorrupted2(final ErtaiTheCorrupted2 card) {
+        super(card);
+    }
+
+    @Override
+    public ErtaiTheCorrupted2 copy() {
+        return new ErtaiTheCorrupted2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/planeshift/FlametongueKavu.java b/Mage.Sets/src/mage/sets/planeshift/FlametongueKavu.java
index 36d0b2321d..fc76e83c6d 100644
--- a/Mage.Sets/src/mage/sets/planeshift/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/planeshift/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/GaeasHerald.java b/Mage.Sets/src/mage/sets/planeshift/GaeasHerald.java
index a25ed0b0ed..ec27048510 100644
--- a/Mage.Sets/src/mage/sets/planeshift/GaeasHerald.java
+++ b/Mage.Sets/src/mage/sets/planeshift/GaeasHerald.java
@@ -37,7 +37,7 @@ public class GaeasHerald extends mage.sets.tenthedition.GaeasHerald {
 
     public GaeasHerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/Gainsay.java b/Mage.Sets/src/mage/sets/planeshift/Gainsay.java
index 336a6061b2..064cd06eff 100644
--- a/Mage.Sets/src/mage/sets/planeshift/Gainsay.java
+++ b/Mage.Sets/src/mage/sets/planeshift/Gainsay.java
@@ -37,7 +37,7 @@ public class Gainsay extends mage.sets.theros.Gainsay {
 
     public Gainsay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/GerrardsCommand.java b/Mage.Sets/src/mage/sets/planeshift/GerrardsCommand.java
index 422f9ceb94..539dc84496 100644
--- a/Mage.Sets/src/mage/sets/planeshift/GerrardsCommand.java
+++ b/Mage.Sets/src/mage/sets/planeshift/GerrardsCommand.java
@@ -37,7 +37,7 @@ public class GerrardsCommand extends mage.sets.phyrexiavsthecoalition.GerrardsCo
 
     public GerrardsCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/HullBreach.java b/Mage.Sets/src/mage/sets/planeshift/HullBreach.java
index baf4c82268..b37da303a5 100644
--- a/Mage.Sets/src/mage/sets/planeshift/HullBreach.java
+++ b/Mage.Sets/src/mage/sets/planeshift/HullBreach.java
@@ -37,7 +37,7 @@ public class HullBreach extends mage.sets.commander2013.HullBreach {
 
     public HullBreach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/LordOfTheUndead.java b/Mage.Sets/src/mage/sets/planeshift/LordOfTheUndead.java
index 5705941a33..65b77831d6 100644
--- a/Mage.Sets/src/mage/sets/planeshift/LordOfTheUndead.java
+++ b/Mage.Sets/src/mage/sets/planeshift/LordOfTheUndead.java
@@ -37,7 +37,7 @@ public class LordOfTheUndead extends mage.sets.tenthedition.LordOfTheUndead {
 
     public LordOfTheUndead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java b/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java
index 79fa0aec42..b64e1b0da0 100644
--- a/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java
+++ b/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java
@@ -38,7 +38,7 @@ public class ManaCylix extends mage.sets.conflux.ManaCylix {
 
     public ManaCylix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "PLS";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/planeshift/MeddlingMage.java b/Mage.Sets/src/mage/sets/planeshift/MeddlingMage.java
index aebd0ac8e1..1b0cbdd94a 100644
--- a/Mage.Sets/src/mage/sets/planeshift/MeddlingMage.java
+++ b/Mage.Sets/src/mage/sets/planeshift/MeddlingMage.java
@@ -37,7 +37,7 @@ public class MeddlingMage extends mage.sets.alarareborn.MeddlingMage {
 
     public MeddlingMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/MoggSentry.java b/Mage.Sets/src/mage/sets/planeshift/MoggSentry.java
index 9b84935338..743fce5c21 100644
--- a/Mage.Sets/src/mage/sets/planeshift/MoggSentry.java
+++ b/Mage.Sets/src/mage/sets/planeshift/MoggSentry.java
@@ -38,7 +38,7 @@ public class MoggSentry extends mage.sets.ninthedition.MoggSentry {
 
     public MoggSentry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/QuestingPhelddagrif.java b/Mage.Sets/src/mage/sets/planeshift/QuestingPhelddagrif.java
index a78b3881e1..d794fbac6b 100644
--- a/Mage.Sets/src/mage/sets/planeshift/QuestingPhelddagrif.java
+++ b/Mage.Sets/src/mage/sets/planeshift/QuestingPhelddagrif.java
@@ -39,7 +39,7 @@ public class QuestingPhelddagrif extends mage.sets.prereleaseevents.QuestingPhel
 
     public QuestingPhelddagrif(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "PLS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/planeshift/QuirionDryad.java b/Mage.Sets/src/mage/sets/planeshift/QuirionDryad.java
index cc47ff7ae4..49fea9514d 100644
--- a/Mage.Sets/src/mage/sets/planeshift/QuirionDryad.java
+++ b/Mage.Sets/src/mage/sets/planeshift/QuirionDryad.java
@@ -37,7 +37,7 @@ public class QuirionDryad extends mage.sets.tenthedition.QuirionDryad {
 
     public QuirionDryad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/SawtoothLoon.java b/Mage.Sets/src/mage/sets/planeshift/SawtoothLoon.java
index b2f836bc9f..4bea1ae315 100644
--- a/Mage.Sets/src/mage/sets/planeshift/SawtoothLoon.java
+++ b/Mage.Sets/src/mage/sets/planeshift/SawtoothLoon.java
@@ -37,7 +37,7 @@ public class SawtoothLoon extends mage.sets.venservskoth.SawtoothLoon {
 
     public SawtoothLoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/ShivanWurm.java b/Mage.Sets/src/mage/sets/planeshift/ShivanWurm.java
index bbc2c147f9..507a9cfc45 100644
--- a/Mage.Sets/src/mage/sets/planeshift/ShivanWurm.java
+++ b/Mage.Sets/src/mage/sets/planeshift/ShivanWurm.java
@@ -37,7 +37,7 @@ public class ShivanWurm extends mage.sets.vintagemasters.ShivanWurm {
 
     public ShivanWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/SilverDrake.java b/Mage.Sets/src/mage/sets/planeshift/SilverDrake.java
index ec2d9f3463..42070d58bf 100644
--- a/Mage.Sets/src/mage/sets/planeshift/SilverDrake.java
+++ b/Mage.Sets/src/mage/sets/planeshift/SilverDrake.java
@@ -39,7 +39,7 @@ public class SilverDrake extends mage.sets.mediainserts.SilverDrake {
 
     public SilverDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "PLS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java b/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight1.java
similarity index 93%
rename from Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java
rename to Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight1.java
index 31aa2dcd8e..8a77355c2f 100644
--- a/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java
+++ b/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight1.java
@@ -33,10 +33,10 @@ import mage.util.CardUtil;
  *
  * @author nick.myers
  */
-public class SkyshipWeatherlight extends CardImpl {
+public class SkyshipWeatherlight1 extends CardImpl {
 
-    public SkyshipWeatherlight(UUID ownerId) {
-        super(ownerId, 133, "Skyship Weatherlight", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}");
+    public SkyshipWeatherlight1(UUID ownerId) {
+        super(ownerId, "133a", "Skyship Weatherlight", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}");
         this.expansionSetCode = "PLS";
         this.supertype.add("Legendary");
 
@@ -49,13 +49,13 @@ public class SkyshipWeatherlight extends CardImpl {
         this.addAbility(ability);
     }
 
-    public SkyshipWeatherlight(final SkyshipWeatherlight card) {
+    public SkyshipWeatherlight1(final SkyshipWeatherlight1 card) {
         super(card);
     }
 
     @Override
-    public SkyshipWeatherlight copy() {
-        return new SkyshipWeatherlight(this);
+    public SkyshipWeatherlight1 copy() {
+        return new SkyshipWeatherlight1(this);
     }
 
 }
diff --git a/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight2.java b/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight2.java
new file mode 100644
index 0000000000..5665516c75
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight2.java
@@ -0,0 +1,30 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.sets.planeshift;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class SkyshipWeatherlight2 extends SkyshipWeatherlight1 {
+
+    public SkyshipWeatherlight2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = "133b";
+    }
+
+    public SkyshipWeatherlight2(final SkyshipWeatherlight2 card) {
+        super(card);
+    }
+
+    @Override
+    public SkyshipWeatherlight2 copy() {
+        return new SkyshipWeatherlight2(this);
+    }
+
+}
diff --git a/Mage.Sets/src/mage/sets/planeshift/Slay.java b/Mage.Sets/src/mage/sets/planeshift/Slay.java
index d90c0fd21e..8081a3cb93 100644
--- a/Mage.Sets/src/mage/sets/planeshift/Slay.java
+++ b/Mage.Sets/src/mage/sets/planeshift/Slay.java
@@ -37,7 +37,7 @@ public class Slay extends mage.sets.ninthedition.Slay {
 
     public Slay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/StarCompass.java b/Mage.Sets/src/mage/sets/planeshift/StarCompass.java
index 6188c95b68..25ba829299 100644
--- a/Mage.Sets/src/mage/sets/planeshift/StarCompass.java
+++ b/Mage.Sets/src/mage/sets/planeshift/StarCompass.java
@@ -37,7 +37,7 @@ public class StarCompass extends mage.sets.eighthedition.StarCompass {
 
     public StarCompass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/StormscapeBattlemage.java b/Mage.Sets/src/mage/sets/planeshift/StormscapeBattlemage.java
index 3a6ab0249e..4ef35d60c4 100644
--- a/Mage.Sets/src/mage/sets/planeshift/StormscapeBattlemage.java
+++ b/Mage.Sets/src/mage/sets/planeshift/StormscapeBattlemage.java
@@ -37,7 +37,7 @@ public class StormscapeBattlemage extends mage.sets.commander2013.StormscapeBatt
 
     public StormscapeBattlemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/StormscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/StormscapeFamiliar.java
index 89a4057a9d..40221baccd 100644
--- a/Mage.Sets/src/mage/sets/planeshift/StormscapeFamiliar.java
+++ b/Mage.Sets/src/mage/sets/planeshift/StormscapeFamiliar.java
@@ -38,7 +38,7 @@ public class StormscapeFamiliar extends mage.sets.timeshifted.StormscapeFamiliar
 
     public StormscapeFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "PLS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero.java b/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero1.java
similarity index 88%
rename from Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero.java
rename to Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero1.java
index 876e3724c0..faed81199e 100644
--- a/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero.java
+++ b/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero1.java
@@ -45,10 +45,10 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author LoneFox
  */
-public class TahngarthTalruumHero extends CardImpl {
+public class TahngarthTalruumHero1 extends CardImpl {
 
-    public TahngarthTalruumHero(UUID ownerId) {
-        super(ownerId, 74, "Tahngarth, Talruum Hero", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
+    public TahngarthTalruumHero1(UUID ownerId) {
+        super(ownerId, "74a", "Tahngarth, Talruum Hero", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
         this.expansionSetCode = "PLS";
         this.supertype.add("Legendary");
         this.subtype.add("Minotaur");
@@ -65,12 +65,12 @@ public class TahngarthTalruumHero extends CardImpl {
         this.addAbility(ability);
     }
 
-    public TahngarthTalruumHero(final TahngarthTalruumHero card) {
+    public TahngarthTalruumHero1(final TahngarthTalruumHero1 card) {
         super(card);
     }
 
     @Override
-    public TahngarthTalruumHero copy() {
-        return new TahngarthTalruumHero(this);
+    public TahngarthTalruumHero1 copy() {
+        return new TahngarthTalruumHero1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero2.java b/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero2.java
new file mode 100644
index 0000000000..40185067e3
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/planeshift/TahngarthTalruumHero2.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.planeshift;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class TahngarthTalruumHero2 extends TahngarthTalruumHero1 {
+
+    public TahngarthTalruumHero2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = "74b";
+    }
+
+    public TahngarthTalruumHero2(final TahngarthTalruumHero2 card) {
+        super(card);
+    }
+
+    @Override
+    public TahngarthTalruumHero2 copy() {
+        return new TahngarthTalruumHero2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/planeshift/Terminate.java b/Mage.Sets/src/mage/sets/planeshift/Terminate.java
index 38774f47a2..f2ceb2fc6a 100644
--- a/Mage.Sets/src/mage/sets/planeshift/Terminate.java
+++ b/Mage.Sets/src/mage/sets/planeshift/Terminate.java
@@ -37,7 +37,7 @@ public class Terminate extends mage.sets.alarareborn.Terminate {
 
     public Terminate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/ThornscapeBattlemage.java b/Mage.Sets/src/mage/sets/planeshift/ThornscapeBattlemage.java
index 425431f14f..f15684ef5a 100644
--- a/Mage.Sets/src/mage/sets/planeshift/ThornscapeBattlemage.java
+++ b/Mage.Sets/src/mage/sets/planeshift/ThornscapeBattlemage.java
@@ -37,7 +37,7 @@ public class ThornscapeBattlemage extends mage.sets.phyrexiavsthecoalition.Thorn
 
     public ThornscapeBattlemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/ThunderscapeBattlemage.java b/Mage.Sets/src/mage/sets/planeshift/ThunderscapeBattlemage.java
index c77111751a..57f43736e4 100644
--- a/Mage.Sets/src/mage/sets/planeshift/ThunderscapeBattlemage.java
+++ b/Mage.Sets/src/mage/sets/planeshift/ThunderscapeBattlemage.java
@@ -37,7 +37,7 @@ public class ThunderscapeBattlemage extends mage.sets.phyrexiavsthecoalition.Thu
 
     public ThunderscapeBattlemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "PLS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/planeshift/WarpedDevotion.java b/Mage.Sets/src/mage/sets/planeshift/WarpedDevotion.java
index d1bcf1212a..7d5ab3b699 100644
--- a/Mage.Sets/src/mage/sets/planeshift/WarpedDevotion.java
+++ b/Mage.Sets/src/mage/sets/planeshift/WarpedDevotion.java
@@ -38,7 +38,7 @@ public class WarpedDevotion extends mage.sets.eighthedition.WarpedDevotion {
 
     public WarpedDevotion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "PLS";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/Anaconda1.java b/Mage.Sets/src/mage/sets/portal/Anaconda1.java
index 1300b5f298..8051a58219 100644
--- a/Mage.Sets/src/mage/sets/portal/Anaconda1.java
+++ b/Mage.Sets/src/mage/sets/portal/Anaconda1.java
@@ -37,7 +37,7 @@ public class Anaconda1 extends mage.sets.urzassaga.Anaconda {
 
     public Anaconda1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Anaconda2.java b/Mage.Sets/src/mage/sets/portal/Anaconda2.java
index 9e01a0beb4..62602ecbf2 100644
--- a/Mage.Sets/src/mage/sets/portal/Anaconda2.java
+++ b/Mage.Sets/src/mage/sets/portal/Anaconda2.java
@@ -37,7 +37,7 @@ public class Anaconda2 extends mage.sets.urzassaga.Anaconda {
 
     public Anaconda2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/AncestralMemories.java b/Mage.Sets/src/mage/sets/portal/AncestralMemories.java
index 035719ec7b..4865fa74b5 100644
--- a/Mage.Sets/src/mage/sets/portal/AncestralMemories.java
+++ b/Mage.Sets/src/mage/sets/portal/AncestralMemories.java
@@ -37,7 +37,7 @@ public class AncestralMemories extends mage.sets.seventhedition.AncestralMemorie
 
     public AncestralMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/AngelicBlessing.java b/Mage.Sets/src/mage/sets/portal/AngelicBlessing.java
index 9d2f4c7eeb..918a7e653a 100644
--- a/Mage.Sets/src/mage/sets/portal/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/portal/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Archangel.java b/Mage.Sets/src/mage/sets/portal/Archangel.java
index 5bfb5f6094..5503012002 100644
--- a/Mage.Sets/src/mage/sets/portal/Archangel.java
+++ b/Mage.Sets/src/mage/sets/portal/Archangel.java
@@ -38,7 +38,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel {
 
     public Archangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/ArdentMilitia.java b/Mage.Sets/src/mage/sets/portal/ArdentMilitia.java
index a380260f23..724ca34660 100644
--- a/Mage.Sets/src/mage/sets/portal/ArdentMilitia.java
+++ b/Mage.Sets/src/mage/sets/portal/ArdentMilitia.java
@@ -37,7 +37,7 @@ public class ArdentMilitia extends mage.sets.eighthedition.ArdentMilitia {
 
     public ArdentMilitia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Armageddon.java b/Mage.Sets/src/mage/sets/portal/Armageddon.java
index d564c407e9..6a524c2c03 100644
--- a/Mage.Sets/src/mage/sets/portal/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/portal/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/portal/ArmoredPegasus.java
index 4db996a97d..cc9fe83747 100644
--- a/Mage.Sets/src/mage/sets/portal/ArmoredPegasus.java
+++ b/Mage.Sets/src/mage/sets/portal/ArmoredPegasus.java
@@ -37,7 +37,7 @@ public class ArmoredPegasus extends mage.sets.tempest.ArmoredPegasus {
 
     public ArmoredPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BalanceOfPower.java b/Mage.Sets/src/mage/sets/portal/BalanceOfPower.java
index 0f0f122dc2..43286b4b43 100644
--- a/Mage.Sets/src/mage/sets/portal/BalanceOfPower.java
+++ b/Mage.Sets/src/mage/sets/portal/BalanceOfPower.java
@@ -37,7 +37,7 @@ public class BalanceOfPower extends mage.sets.eighthedition.BalanceOfPower {
 
     public BalanceOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BalefulStare.java b/Mage.Sets/src/mage/sets/portal/BalefulStare.java
index e365599d21..e9f38983db 100644
--- a/Mage.Sets/src/mage/sets/portal/BalefulStare.java
+++ b/Mage.Sets/src/mage/sets/portal/BalefulStare.java
@@ -38,7 +38,7 @@ public class BalefulStare extends mage.sets.ninthedition.BalefulStare {
 
     public BalefulStare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Blaze1.java b/Mage.Sets/src/mage/sets/portal/Blaze1.java
index 22f800c0d4..6e5d0096d4 100644
--- a/Mage.Sets/src/mage/sets/portal/Blaze1.java
+++ b/Mage.Sets/src/mage/sets/portal/Blaze1.java
@@ -37,7 +37,7 @@ public class Blaze1 extends mage.sets.planechase.Blaze {
 
     public Blaze1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Blaze2.java b/Mage.Sets/src/mage/sets/portal/Blaze2.java
index 1ca245b852..771f0842c5 100644
--- a/Mage.Sets/src/mage/sets/portal/Blaze2.java
+++ b/Mage.Sets/src/mage/sets/portal/Blaze2.java
@@ -37,7 +37,7 @@ public class Blaze2 extends mage.sets.planechase.Blaze {
 
     public Blaze2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BlessedReversal.java b/Mage.Sets/src/mage/sets/portal/BlessedReversal.java
index d0aba344be..e3e407e0fd 100644
--- a/Mage.Sets/src/mage/sets/portal/BlessedReversal.java
+++ b/Mage.Sets/src/mage/sets/portal/BlessedReversal.java
@@ -37,7 +37,7 @@ public class BlessedReversal extends mage.sets.urzaslegacy.BlessedReversal {
 
     public BlessedReversal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BlindingLight.java b/Mage.Sets/src/mage/sets/portal/BlindingLight.java
index a8678502c8..25c119fad5 100644
--- a/Mage.Sets/src/mage/sets/portal/BlindingLight.java
+++ b/Mage.Sets/src/mage/sets/portal/BlindingLight.java
@@ -39,7 +39,7 @@ public class BlindingLight extends mage.sets.mirage.BlindingLight {
 
     public BlindingLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/BogImp.java b/Mage.Sets/src/mage/sets/portal/BogImp.java
index 4e6cf2fffa..09c4461fd3 100644
--- a/Mage.Sets/src/mage/sets/portal/BogImp.java
+++ b/Mage.Sets/src/mage/sets/portal/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BogRaiders.java b/Mage.Sets/src/mage/sets/portal/BogRaiders.java
index d58283b7fc..0d9c4efd13 100644
--- a/Mage.Sets/src/mage/sets/portal/BogRaiders.java
+++ b/Mage.Sets/src/mage/sets/portal/BogRaiders.java
@@ -37,7 +37,7 @@ public class BogRaiders extends mage.sets.magic2011.BogRaiders {
 
     public BogRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BogWraith.java b/Mage.Sets/src/mage/sets/portal/BogWraith.java
index 20d32adca3..8c04c4e1ac 100644
--- a/Mage.Sets/src/mage/sets/portal/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/portal/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BoilingSeas.java b/Mage.Sets/src/mage/sets/portal/BoilingSeas.java
index a2c29bcea6..3c3daeac6b 100644
--- a/Mage.Sets/src/mage/sets/portal/BoilingSeas.java
+++ b/Mage.Sets/src/mage/sets/portal/BoilingSeas.java
@@ -37,7 +37,7 @@ public class BoilingSeas extends mage.sets.ninthedition.BoilingSeas {
 
     public BoilingSeas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/BreathOfLife.java b/Mage.Sets/src/mage/sets/portal/BreathOfLife.java
index 2dc1454cf2..3f5398dbf1 100644
--- a/Mage.Sets/src/mage/sets/portal/BreathOfLife.java
+++ b/Mage.Sets/src/mage/sets/portal/BreathOfLife.java
@@ -38,7 +38,7 @@ public class BreathOfLife extends mage.sets.starter2000.BreathOfLife {
 
     public BreathOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/BullHippo.java b/Mage.Sets/src/mage/sets/portal/BullHippo.java
index 288ce48e7c..39eee8e1c4 100644
--- a/Mage.Sets/src/mage/sets/portal/BullHippo.java
+++ b/Mage.Sets/src/mage/sets/portal/BullHippo.java
@@ -37,7 +37,7 @@ public class BullHippo extends mage.sets.urzassaga.BullHippo {
 
     public BullHippo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/ChargingPaladin.java b/Mage.Sets/src/mage/sets/portal/ChargingPaladin.java
index 7e2ec5c6db..9c08be713d 100644
--- a/Mage.Sets/src/mage/sets/portal/ChargingPaladin.java
+++ b/Mage.Sets/src/mage/sets/portal/ChargingPaladin.java
@@ -38,7 +38,7 @@ public class ChargingPaladin extends mage.sets.divinevsdemonic.ChargingPaladin {
 
     public ChargingPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/ChargingRhino.java b/Mage.Sets/src/mage/sets/portal/ChargingRhino.java
index 789c573cdb..cb58f72939 100644
--- a/Mage.Sets/src/mage/sets/portal/ChargingRhino.java
+++ b/Mage.Sets/src/mage/sets/portal/ChargingRhino.java
@@ -38,7 +38,7 @@ public class ChargingRhino extends mage.sets.tempest.ChargingRhino {
 
     public ChargingRhino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/CloudDragon.java b/Mage.Sets/src/mage/sets/portal/CloudDragon.java
index aeda4e3679..9fc8c3314b 100644
--- a/Mage.Sets/src/mage/sets/portal/CloudDragon.java
+++ b/Mage.Sets/src/mage/sets/portal/CloudDragon.java
@@ -37,7 +37,7 @@ public class CloudDragon extends mage.sets.masterseditioniv.CloudDragon {
 
     public CloudDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/CloudSpirit.java b/Mage.Sets/src/mage/sets/portal/CloudSpirit.java
index 4ffab02998..f7274d3bb8 100644
--- a/Mage.Sets/src/mage/sets/portal/CloudSpirit.java
+++ b/Mage.Sets/src/mage/sets/portal/CloudSpirit.java
@@ -38,7 +38,7 @@ public class CloudSpirit extends mage.sets.stronghold.CloudSpirit {
 
     public CloudSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/CoralEel.java b/Mage.Sets/src/mage/sets/portal/CoralEel.java
index 29b7454e5b..442f75d316 100644
--- a/Mage.Sets/src/mage/sets/portal/CoralEel.java
+++ b/Mage.Sets/src/mage/sets/portal/CoralEel.java
@@ -37,7 +37,7 @@ public class CoralEel extends mage.sets.eighthedition.CoralEel {
 
     public CoralEel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/CravenGiant.java b/Mage.Sets/src/mage/sets/portal/CravenGiant.java
index fa3138d0c3..1b99e9c327 100644
--- a/Mage.Sets/src/mage/sets/portal/CravenGiant.java
+++ b/Mage.Sets/src/mage/sets/portal/CravenGiant.java
@@ -37,7 +37,7 @@ public class CravenGiant extends mage.sets.stronghold.CravenGiant {
 
     public CravenGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/CruelBargain.java b/Mage.Sets/src/mage/sets/portal/CruelBargain.java
index 12efa2fdb4..b9a49094fb 100644
--- a/Mage.Sets/src/mage/sets/portal/CruelBargain.java
+++ b/Mage.Sets/src/mage/sets/portal/CruelBargain.java
@@ -36,7 +36,7 @@ public class CruelBargain extends mage.sets.vintagemasters.CruelBargain {
 
     public CruelBargain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/DreadReaper.java b/Mage.Sets/src/mage/sets/portal/DreadReaper.java
index d00d26c5bc..9ca68031b9 100644
--- a/Mage.Sets/src/mage/sets/portal/DreadReaper.java
+++ b/Mage.Sets/src/mage/sets/portal/DreadReaper.java
@@ -37,7 +37,7 @@ public class DreadReaper extends mage.sets.starter1999.DreadReaper {
 
     public DreadReaper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/DrySpell.java b/Mage.Sets/src/mage/sets/portal/DrySpell.java
index ff05472ecb..a5a7c5eac9 100644
--- a/Mage.Sets/src/mage/sets/portal/DrySpell.java
+++ b/Mage.Sets/src/mage/sets/portal/DrySpell.java
@@ -38,7 +38,7 @@ public class DrySpell extends mage.sets.homelands.DrySpell1 {
 
     public DrySpell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/Earthquake.java b/Mage.Sets/src/mage/sets/portal/Earthquake.java
index 356f9ec39f..8814fc36f9 100644
--- a/Mage.Sets/src/mage/sets/portal/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/portal/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/EbonDragon.java b/Mage.Sets/src/mage/sets/portal/EbonDragon.java
index 805a893078..1756c8dd4c 100644
--- a/Mage.Sets/src/mage/sets/portal/EbonDragon.java
+++ b/Mage.Sets/src/mage/sets/portal/EbonDragon.java
@@ -37,7 +37,7 @@ public class EbonDragon extends mage.sets.ftvdragons.EbonDragon {
 
     public EbonDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/EliteCatWarrior2.java b/Mage.Sets/src/mage/sets/portal/EliteCatWarrior2.java
index 11f0782259..269c66b090 100644
--- a/Mage.Sets/src/mage/sets/portal/EliteCatWarrior2.java
+++ b/Mage.Sets/src/mage/sets/portal/EliteCatWarrior2.java
@@ -37,7 +37,7 @@ public class EliteCatWarrior2 extends mage.sets.portal.EliteCatWarrior1 {
 
     public EliteCatWarrior2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
     }
 
     public EliteCatWarrior2(final EliteCatWarrior2 card) {
diff --git a/Mage.Sets/src/mage/sets/portal/ElvenCache.java b/Mage.Sets/src/mage/sets/portal/ElvenCache.java
index 25a408b28f..e68d36ca64 100644
--- a/Mage.Sets/src/mage/sets/portal/ElvenCache.java
+++ b/Mage.Sets/src/mage/sets/portal/ElvenCache.java
@@ -37,7 +37,7 @@ public class ElvenCache extends mage.sets.visions.ElvenCache {
 
     public ElvenCache(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/EndlessCockroaches.java b/Mage.Sets/src/mage/sets/portal/EndlessCockroaches.java
index ee415b7456..3bf1ffc772 100644
--- a/Mage.Sets/src/mage/sets/portal/EndlessCockroaches.java
+++ b/Mage.Sets/src/mage/sets/portal/EndlessCockroaches.java
@@ -37,7 +37,7 @@ public class EndlessCockroaches extends mage.sets.commander2013.EndlessCockroach
 
     public EndlessCockroaches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Exhaustion.java b/Mage.Sets/src/mage/sets/portal/Exhaustion.java
index 82a1e0be2d..c5b2b20dd0 100644
--- a/Mage.Sets/src/mage/sets/portal/Exhaustion.java
+++ b/Mage.Sets/src/mage/sets/portal/Exhaustion.java
@@ -37,7 +37,7 @@ public class Exhaustion extends mage.sets.portalthreekingdoms.Exhaustion {
 
     public Exhaustion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/FeralShadow.java b/Mage.Sets/src/mage/sets/portal/FeralShadow.java
index 10db67b50c..9cdf1e576f 100644
--- a/Mage.Sets/src/mage/sets/portal/FeralShadow.java
+++ b/Mage.Sets/src/mage/sets/portal/FeralShadow.java
@@ -37,7 +37,7 @@ public class FeralShadow extends mage.sets.mirage.FeralShadow {
 
     public FeralShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Flashfires.java b/Mage.Sets/src/mage/sets/portal/Flashfires.java
index 5e6712d641..8943a52cab 100644
--- a/Mage.Sets/src/mage/sets/portal/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/portal/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/FootSoldiers.java b/Mage.Sets/src/mage/sets/portal/FootSoldiers.java
index 7ea2e23092..ee080d625d 100644
--- a/Mage.Sets/src/mage/sets/portal/FootSoldiers.java
+++ b/Mage.Sets/src/mage/sets/portal/FootSoldiers.java
@@ -37,7 +37,7 @@ public class FootSoldiers extends mage.sets.ninthedition.FootSoldiers {
 
     public FootSoldiers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/GiantOctopus.java b/Mage.Sets/src/mage/sets/portal/GiantOctopus.java
index 8c5ba577ef..7b4a9757cd 100644
--- a/Mage.Sets/src/mage/sets/portal/GiantOctopus.java
+++ b/Mage.Sets/src/mage/sets/portal/GiantOctopus.java
@@ -37,7 +37,7 @@ public class GiantOctopus extends mage.sets.seventhedition.GiantOctopus {
 
     public GiantOctopus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/GiantSpider.java b/Mage.Sets/src/mage/sets/portal/GiantSpider.java
index 2cf6708fd4..1ed54fb6f4 100644
--- a/Mage.Sets/src/mage/sets/portal/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/portal/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/GiftOfEstates.java b/Mage.Sets/src/mage/sets/portal/GiftOfEstates.java
index ff92a77b3f..2ef4ca7de6 100644
--- a/Mage.Sets/src/mage/sets/portal/GiftOfEstates.java
+++ b/Mage.Sets/src/mage/sets/portal/GiftOfEstates.java
@@ -38,7 +38,7 @@ public class GiftOfEstates extends mage.sets.commander2014.GiftOfEstates {
 
     public GiftOfEstates(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/GorillaWarrior.java b/Mage.Sets/src/mage/sets/portal/GorillaWarrior.java
index e4b871459a..207e3a6a08 100644
--- a/Mage.Sets/src/mage/sets/portal/GorillaWarrior.java
+++ b/Mage.Sets/src/mage/sets/portal/GorillaWarrior.java
@@ -37,7 +37,7 @@ public class GorillaWarrior extends mage.sets.urzassaga.GorillaWarrior {
 
     public GorillaWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Gravedigger.java b/Mage.Sets/src/mage/sets/portal/Gravedigger.java
index 6d76d84a17..30b084fa45 100644
--- a/Mage.Sets/src/mage/sets/portal/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/portal/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/GrizzlyBears.java b/Mage.Sets/src/mage/sets/portal/GrizzlyBears.java
index 60532cc177..9ac8c3dfe6 100644
--- a/Mage.Sets/src/mage/sets/portal/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/portal/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/HandOfDeath1.java b/Mage.Sets/src/mage/sets/portal/HandOfDeath1.java
index 8cc4b9e9b5..43c0ba1edf 100644
--- a/Mage.Sets/src/mage/sets/portal/HandOfDeath1.java
+++ b/Mage.Sets/src/mage/sets/portal/HandOfDeath1.java
@@ -37,7 +37,7 @@ public class HandOfDeath1 extends mage.sets.starter2000.HandOfDeath {
 
     public HandOfDeath1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/HandOfDeath2.java b/Mage.Sets/src/mage/sets/portal/HandOfDeath2.java
index 1ccf01bbc1..5b9f6a48d2 100644
--- a/Mage.Sets/src/mage/sets/portal/HandOfDeath2.java
+++ b/Mage.Sets/src/mage/sets/portal/HandOfDeath2.java
@@ -37,7 +37,7 @@ public class HandOfDeath2 extends mage.sets.starter2000.HandOfDeath {
 
     public HandOfDeath2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/HillGiant.java b/Mage.Sets/src/mage/sets/portal/HillGiant.java
index bd527a39ae..03161c6be5 100644
--- a/Mage.Sets/src/mage/sets/portal/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/portal/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/HornedTurtle.java b/Mage.Sets/src/mage/sets/portal/HornedTurtle.java
index 3bab25862c..e4c985cdea 100644
--- a/Mage.Sets/src/mage/sets/portal/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/portal/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/HowlingFury.java b/Mage.Sets/src/mage/sets/portal/HowlingFury.java
index e5cea6ffcb..e1b40c5e7f 100644
--- a/Mage.Sets/src/mage/sets/portal/HowlingFury.java
+++ b/Mage.Sets/src/mage/sets/portal/HowlingFury.java
@@ -38,7 +38,7 @@ public class HowlingFury extends mage.sets.starter1999.HowlingFury {
 
     public HowlingFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/HulkingCyclops.java b/Mage.Sets/src/mage/sets/portal/HulkingCyclops.java
index a10ae006be..eca78cd35f 100644
--- a/Mage.Sets/src/mage/sets/portal/HulkingCyclops.java
+++ b/Mage.Sets/src/mage/sets/portal/HulkingCyclops.java
@@ -37,7 +37,7 @@ public class HulkingCyclops extends mage.sets.visions.HulkingCyclops {
 
     public HulkingCyclops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/HulkingGoblin.java b/Mage.Sets/src/mage/sets/portal/HulkingGoblin.java
index 37465bfaf5..6835437f9b 100644
--- a/Mage.Sets/src/mage/sets/portal/HulkingGoblin.java
+++ b/Mage.Sets/src/mage/sets/portal/HulkingGoblin.java
@@ -37,7 +37,7 @@ public class HulkingGoblin extends mage.sets.vintagemasters.HulkingGoblin {
 
     public HulkingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Hurricane.java b/Mage.Sets/src/mage/sets/portal/Hurricane.java
index d66a8c3a2e..eb55f3a5fd 100644
--- a/Mage.Sets/src/mage/sets/portal/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/portal/Hurricane.java
@@ -38,7 +38,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/KnightErrant.java b/Mage.Sets/src/mage/sets/portal/KnightErrant.java
index e20fcc37cc..61198f94ca 100644
--- a/Mage.Sets/src/mage/sets/portal/KnightErrant.java
+++ b/Mage.Sets/src/mage/sets/portal/KnightErrant.java
@@ -37,7 +37,7 @@ public class KnightErrant extends mage.sets.seventhedition.KnightErrant {
 
     public KnightErrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/LastChance.java b/Mage.Sets/src/mage/sets/portal/LastChance.java
index ab7c193687..2a5f99b9fd 100644
--- a/Mage.Sets/src/mage/sets/portal/LastChance.java
+++ b/Mage.Sets/src/mage/sets/portal/LastChance.java
@@ -37,7 +37,7 @@ public class LastChance extends mage.sets.masterseditioniv.LastChance {
 
     public LastChance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/LavaAxe.java b/Mage.Sets/src/mage/sets/portal/LavaAxe.java
index 2a041b097b..f4e17a5548 100644
--- a/Mage.Sets/src/mage/sets/portal/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/portal/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/ManOWar.java b/Mage.Sets/src/mage/sets/portal/ManOWar.java
index 228f26232b..82ff9b7cce 100644
--- a/Mage.Sets/src/mage/sets/portal/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/portal/ManOWar.java
@@ -38,7 +38,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/portal/MerfolkOfThePearlTrident.java
index b7c77a799a..7232cb7fa9 100644
--- a/Mage.Sets/src/mage/sets/portal/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/portal/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/MindRot.java b/Mage.Sets/src/mage/sets/portal/MindRot.java
index 676a50c649..ed4624328d 100644
--- a/Mage.Sets/src/mage/sets/portal/MindRot.java
+++ b/Mage.Sets/src/mage/sets/portal/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/MonstrousGrowth1.java b/Mage.Sets/src/mage/sets/portal/MonstrousGrowth1.java
index 24188f146e..49d1ad93c7 100644
--- a/Mage.Sets/src/mage/sets/portal/MonstrousGrowth1.java
+++ b/Mage.Sets/src/mage/sets/portal/MonstrousGrowth1.java
@@ -37,7 +37,7 @@ public class MonstrousGrowth1 extends mage.sets.seventhedition.MonstrousGrowth {
 
     public MonstrousGrowth1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/MonstrousGrowth2.java b/Mage.Sets/src/mage/sets/portal/MonstrousGrowth2.java
index eb54028cfa..f4339c66d9 100644
--- a/Mage.Sets/src/mage/sets/portal/MonstrousGrowth2.java
+++ b/Mage.Sets/src/mage/sets/portal/MonstrousGrowth2.java
@@ -37,7 +37,7 @@ public class MonstrousGrowth2 extends mage.sets.seventhedition.MonstrousGrowth {
 
     public MonstrousGrowth2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/MountainGoat.java b/Mage.Sets/src/mage/sets/portal/MountainGoat.java
index 4dee35572b..3061c7c3a3 100644
--- a/Mage.Sets/src/mage/sets/portal/MountainGoat.java
+++ b/Mage.Sets/src/mage/sets/portal/MountainGoat.java
@@ -38,7 +38,7 @@ public class MountainGoat extends mage.sets.fifthedition.MountainGoat {
 
     public MountainGoat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/MuckRats.java b/Mage.Sets/src/mage/sets/portal/MuckRats.java
index 4db7afa123..d558791c9a 100644
--- a/Mage.Sets/src/mage/sets/portal/MuckRats.java
+++ b/Mage.Sets/src/mage/sets/portal/MuckRats.java
@@ -37,7 +37,7 @@ public class MuckRats extends mage.sets.portalsecondage.MuckRats {
 
     public MuckRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/NaturalOrder.java b/Mage.Sets/src/mage/sets/portal/NaturalOrder.java
index 9c621c27f2..1904a9e810 100644
--- a/Mage.Sets/src/mage/sets/portal/NaturalOrder.java
+++ b/Mage.Sets/src/mage/sets/portal/NaturalOrder.java
@@ -37,7 +37,7 @@ public class NaturalOrder extends mage.sets.visions.NaturalOrder {
 
     public NaturalOrder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/NaturalSpring.java b/Mage.Sets/src/mage/sets/portal/NaturalSpring.java
index a5e112c1db..65f4d74b75 100644
--- a/Mage.Sets/src/mage/sets/portal/NaturalSpring.java
+++ b/Mage.Sets/src/mage/sets/portal/NaturalSpring.java
@@ -38,7 +38,7 @@ public class NaturalSpring extends mage.sets.tempest.NaturalSpring {
 
     public NaturalSpring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/NaturesCloak.java b/Mage.Sets/src/mage/sets/portal/NaturesCloak.java
index 747aacad57..dd7d062627 100644
--- a/Mage.Sets/src/mage/sets/portal/NaturesCloak.java
+++ b/Mage.Sets/src/mage/sets/portal/NaturesCloak.java
@@ -37,7 +37,7 @@ public class NaturesCloak extends mage.sets.starter1999.NaturesCloak {
 
     public NaturesCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/NaturesLore.java b/Mage.Sets/src/mage/sets/portal/NaturesLore.java
index cc4f7ff702..097161393d 100644
--- a/Mage.Sets/src/mage/sets/portal/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/portal/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/NaturesRuin.java b/Mage.Sets/src/mage/sets/portal/NaturesRuin.java
index 5dde001b1f..d4b4cecacb 100644
--- a/Mage.Sets/src/mage/sets/portal/NaturesRuin.java
+++ b/Mage.Sets/src/mage/sets/portal/NaturesRuin.java
@@ -38,7 +38,7 @@ public class NaturesRuin extends mage.sets.vintagemasters.NaturesRuin {
 
     public NaturesRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/NeedleStorm.java b/Mage.Sets/src/mage/sets/portal/NeedleStorm.java
index 1726c84b4c..b8bdfdcfbf 100644
--- a/Mage.Sets/src/mage/sets/portal/NeedleStorm.java
+++ b/Mage.Sets/src/mage/sets/portal/NeedleStorm.java
@@ -37,7 +37,7 @@ public class NeedleStorm extends mage.sets.tempest.NeedleStorm {
 
     public NeedleStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/PantherWarriors.java b/Mage.Sets/src/mage/sets/portal/PantherWarriors.java
index 7a73e37aa8..390a0186e4 100644
--- a/Mage.Sets/src/mage/sets/portal/PantherWarriors.java
+++ b/Mage.Sets/src/mage/sets/portal/PantherWarriors.java
@@ -37,7 +37,7 @@ public class PantherWarriors extends mage.sets.visions.PantherWarriors {
 
     public PantherWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/PhantomWarrior.java b/Mage.Sets/src/mage/sets/portal/PhantomWarrior.java
index 9c8a57f23e..e249d5baae 100644
--- a/Mage.Sets/src/mage/sets/portal/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/portal/PhantomWarrior.java
@@ -38,7 +38,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/PillagingHorde.java b/Mage.Sets/src/mage/sets/portal/PillagingHorde.java
index ac2f7636a6..33f64216c3 100644
--- a/Mage.Sets/src/mage/sets/portal/PillagingHorde.java
+++ b/Mage.Sets/src/mage/sets/portal/PillagingHorde.java
@@ -38,7 +38,7 @@ public class PillagingHorde extends mage.sets.vintagemasters.PillagingHorde {
 
     public PillagingHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/PrimevalForce.java b/Mage.Sets/src/mage/sets/portal/PrimevalForce.java
index 4e8d099e87..19967f7c32 100644
--- a/Mage.Sets/src/mage/sets/portal/PrimevalForce.java
+++ b/Mage.Sets/src/mage/sets/portal/PrimevalForce.java
@@ -37,7 +37,7 @@ public class PrimevalForce extends mage.sets.eighthedition.PrimevalForce {
 
     public PrimevalForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Prosperity.java b/Mage.Sets/src/mage/sets/portal/Prosperity.java
index 5cb326a61d..6e519805d8 100644
--- a/Mage.Sets/src/mage/sets/portal/Prosperity.java
+++ b/Mage.Sets/src/mage/sets/portal/Prosperity.java
@@ -38,7 +38,7 @@ public class Prosperity extends mage.sets.commander2013.Prosperity {
 
     public Prosperity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/Pyroclasm.java b/Mage.Sets/src/mage/sets/portal/Pyroclasm.java
index ed6280e1a5..10d219864a 100644
--- a/Mage.Sets/src/mage/sets/portal/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/portal/Pyroclasm.java
@@ -38,7 +38,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/Python.java b/Mage.Sets/src/mage/sets/portal/Python.java
index 173bec0580..eb08563319 100644
--- a/Mage.Sets/src/mage/sets/portal/Python.java
+++ b/Mage.Sets/src/mage/sets/portal/Python.java
@@ -37,7 +37,7 @@ public class Python extends mage.sets.visions.Python {
 
     public Python(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RagingGoblin1.java b/Mage.Sets/src/mage/sets/portal/RagingGoblin1.java
index e43a721f05..7d71f28287 100644
--- a/Mage.Sets/src/mage/sets/portal/RagingGoblin1.java
+++ b/Mage.Sets/src/mage/sets/portal/RagingGoblin1.java
@@ -37,7 +37,7 @@ public class RagingGoblin1 extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RagingGoblin2.java b/Mage.Sets/src/mage/sets/portal/RagingGoblin2.java
index 84361fc83c..b038dfdb1b 100644
--- a/Mage.Sets/src/mage/sets/portal/RagingGoblin2.java
+++ b/Mage.Sets/src/mage/sets/portal/RagingGoblin2.java
@@ -37,7 +37,7 @@ public class RagingGoblin2 extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RainOfSalt.java b/Mage.Sets/src/mage/sets/portal/RainOfSalt.java
index 0e77acd100..740fb856ab 100644
--- a/Mage.Sets/src/mage/sets/portal/RainOfSalt.java
+++ b/Mage.Sets/src/mage/sets/portal/RainOfSalt.java
@@ -37,7 +37,7 @@ public class RainOfSalt extends mage.sets.urzassaga.RainOfSalt {
 
     public RainOfSalt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RainOfTears.java b/Mage.Sets/src/mage/sets/portal/RainOfTears.java
index 914acae91b..8e8943c105 100644
--- a/Mage.Sets/src/mage/sets/portal/RainOfTears.java
+++ b/Mage.Sets/src/mage/sets/portal/RainOfTears.java
@@ -37,7 +37,7 @@ public class RainOfTears extends mage.sets.tempest.RainOfTears {
 
     public RainOfTears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RaiseDead.java b/Mage.Sets/src/mage/sets/portal/RaiseDead.java
index 0467273ada..028df24b09 100644
--- a/Mage.Sets/src/mage/sets/portal/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/portal/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RedwoodTreefolk.java b/Mage.Sets/src/mage/sets/portal/RedwoodTreefolk.java
index 8a9e78a511..287fc3e4ea 100644
--- a/Mage.Sets/src/mage/sets/portal/RedwoodTreefolk.java
+++ b/Mage.Sets/src/mage/sets/portal/RedwoodTreefolk.java
@@ -37,7 +37,7 @@ public class RedwoodTreefolk extends mage.sets.weatherlight.RedwoodTreefolk {
 
     public RedwoodTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java b/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java
index b20f2ccef6..5e52a7188f 100644
--- a/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java
+++ b/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java
@@ -37,7 +37,7 @@ public class RegalUnicorn extends mage.sets.classicsixthedition.RegalUnicorn {
 
     public RegalUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SacredNectar.java b/Mage.Sets/src/mage/sets/portal/SacredNectar.java
index fd1750b7b2..ed28788ba8 100644
--- a/Mage.Sets/src/mage/sets/portal/SacredNectar.java
+++ b/Mage.Sets/src/mage/sets/portal/SacredNectar.java
@@ -37,7 +37,7 @@ public class SacredNectar extends mage.sets.ninthedition.SacredNectar {
 
     public SacredNectar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/ScorchingSpear.java b/Mage.Sets/src/mage/sets/portal/ScorchingSpear.java
index b19a5211c7..bf5f47c147 100644
--- a/Mage.Sets/src/mage/sets/portal/ScorchingSpear.java
+++ b/Mage.Sets/src/mage/sets/portal/ScorchingSpear.java
@@ -37,7 +37,7 @@ public class ScorchingSpear extends mage.sets.starter1999.ScorchingSpear {
 
     public ScorchingSpear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/portal/SeasonedMarshal.java
index 1858b0a187..42a7d3d7a0 100644
--- a/Mage.Sets/src/mage/sets/portal/SeasonedMarshal.java
+++ b/Mage.Sets/src/mage/sets/portal/SeasonedMarshal.java
@@ -37,7 +37,7 @@ public class SeasonedMarshal extends mage.sets.elspethvstezzeret.SeasonedMarshal
 
     public SeasonedMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SerpentWarrior.java b/Mage.Sets/src/mage/sets/portal/SerpentWarrior.java
index 9cad6edd65..add9ab148d 100644
--- a/Mage.Sets/src/mage/sets/portal/SerpentWarrior.java
+++ b/Mage.Sets/src/mage/sets/portal/SerpentWarrior.java
@@ -37,7 +37,7 @@ public class SerpentWarrior extends mage.sets.stronghold.SerpentWarrior {
 
     public SerpentWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SnappingDrake.java b/Mage.Sets/src/mage/sets/portal/SnappingDrake.java
index 26e66e268b..0a525c7c5a 100644
--- a/Mage.Sets/src/mage/sets/portal/SnappingDrake.java
+++ b/Mage.Sets/src/mage/sets/portal/SnappingDrake.java
@@ -37,7 +37,7 @@ public class SnappingDrake extends mage.sets.magic2010.SnappingDrake {
 
     public SnappingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SoulShred.java b/Mage.Sets/src/mage/sets/portal/SoulShred.java
index b357ce6ecf..174486d8ec 100644
--- a/Mage.Sets/src/mage/sets/portal/SoulShred.java
+++ b/Mage.Sets/src/mage/sets/portal/SoulShred.java
@@ -37,7 +37,7 @@ public class SoulShred extends mage.sets.masterseditioniv.SoulShred {
 
     public SoulShred(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SpinedWurm.java b/Mage.Sets/src/mage/sets/portal/SpinedWurm.java
index 1a9296a8e6..3cd1a02c76 100644
--- a/Mage.Sets/src/mage/sets/portal/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/portal/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SpittingEarth.java b/Mage.Sets/src/mage/sets/portal/SpittingEarth.java
index 7dff16dc6d..ff1a75122a 100644
--- a/Mage.Sets/src/mage/sets/portal/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/portal/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/StalkingTiger.java b/Mage.Sets/src/mage/sets/portal/StalkingTiger.java
index 7f4bdcf108..fc54ec3ff6 100644
--- a/Mage.Sets/src/mage/sets/portal/StalkingTiger.java
+++ b/Mage.Sets/src/mage/sets/portal/StalkingTiger.java
@@ -37,7 +37,7 @@ public class StalkingTiger extends mage.sets.tenthedition.StalkingTiger {
 
     public StalkingTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Starlight.java b/Mage.Sets/src/mage/sets/portal/Starlight.java
index c2331fd01e..15334bc9b3 100644
--- a/Mage.Sets/src/mage/sets/portal/Starlight.java
+++ b/Mage.Sets/src/mage/sets/portal/Starlight.java
@@ -38,7 +38,7 @@ public class Starlight extends mage.sets.seventhedition.Starlight {
 
     public Starlight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/Steadfastness.java b/Mage.Sets/src/mage/sets/portal/Steadfastness.java
index ee102d439b..e0b1336d02 100644
--- a/Mage.Sets/src/mage/sets/portal/Steadfastness.java
+++ b/Mage.Sets/src/mage/sets/portal/Steadfastness.java
@@ -37,7 +37,7 @@ public class Steadfastness extends mage.sets.starter1999.Steadfastness {
 
     public Steadfastness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/StoneRain.java b/Mage.Sets/src/mage/sets/portal/StoneRain.java
index bae37e282d..3b1f44ee90 100644
--- a/Mage.Sets/src/mage/sets/portal/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/portal/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/StormCrow.java b/Mage.Sets/src/mage/sets/portal/StormCrow.java
index 5b70b9de6b..b1c53ba343 100644
--- a/Mage.Sets/src/mage/sets/portal/StormCrow.java
+++ b/Mage.Sets/src/mage/sets/portal/StormCrow.java
@@ -37,7 +37,7 @@ public class StormCrow extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/SummerBloom.java b/Mage.Sets/src/mage/sets/portal/SummerBloom.java
index a68488e062..970bbeb4e5 100644
--- a/Mage.Sets/src/mage/sets/portal/SummerBloom.java
+++ b/Mage.Sets/src/mage/sets/portal/SummerBloom.java
@@ -38,7 +38,7 @@ public class SummerBloom extends mage.sets.ninthedition.SummerBloom {
 
     public SummerBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/TheftOfDreams.java b/Mage.Sets/src/mage/sets/portal/TheftOfDreams.java
index 6342c53c2e..045c377e00 100644
--- a/Mage.Sets/src/mage/sets/portal/TheftOfDreams.java
+++ b/Mage.Sets/src/mage/sets/portal/TheftOfDreams.java
@@ -38,7 +38,7 @@ public class TheftOfDreams extends mage.sets.exodus.TheftOfDreams {
 
     public TheftOfDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/ThingFromTheDeep.java b/Mage.Sets/src/mage/sets/portal/ThingFromTheDeep.java
index 89b110e6d3..7a3792357a 100644
--- a/Mage.Sets/src/mage/sets/portal/ThingFromTheDeep.java
+++ b/Mage.Sets/src/mage/sets/portal/ThingFromTheDeep.java
@@ -37,7 +37,7 @@ public class ThingFromTheDeep extends mage.sets.masterseditioniv.ThingFromTheDee
 
     public ThingFromTheDeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/TidalSurge.java b/Mage.Sets/src/mage/sets/portal/TidalSurge.java
index bc54cacf08..1ee1146ec0 100644
--- a/Mage.Sets/src/mage/sets/portal/TidalSurge.java
+++ b/Mage.Sets/src/mage/sets/portal/TidalSurge.java
@@ -37,7 +37,7 @@ public class TidalSurge extends mage.sets.stronghold.TidalSurge {
 
     public TidalSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/TimeEbb.java b/Mage.Sets/src/mage/sets/portal/TimeEbb.java
index d92e0bce3f..0e970e4058 100644
--- a/Mage.Sets/src/mage/sets/portal/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/portal/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/TouchOfBrilliance.java b/Mage.Sets/src/mage/sets/portal/TouchOfBrilliance.java
index ec42cbf31b..0bb45646b0 100644
--- a/Mage.Sets/src/mage/sets/portal/TouchOfBrilliance.java
+++ b/Mage.Sets/src/mage/sets/portal/TouchOfBrilliance.java
@@ -37,7 +37,7 @@ public class TouchOfBrilliance extends mage.sets.portalsecondage.TouchOfBrillian
 
     public TouchOfBrilliance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/UntamedWilds.java b/Mage.Sets/src/mage/sets/portal/UntamedWilds.java
index 3a796ad375..1fdb057bb8 100644
--- a/Mage.Sets/src/mage/sets/portal/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/portal/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/VenerableMonk.java b/Mage.Sets/src/mage/sets/portal/VenerableMonk.java
index 5bb6449e10..f6e0e03743 100644
--- a/Mage.Sets/src/mage/sets/portal/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/portal/VenerableMonk.java
@@ -38,7 +38,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/Vengeance.java b/Mage.Sets/src/mage/sets/portal/Vengeance.java
index deb9733702..982318c375 100644
--- a/Mage.Sets/src/mage/sets/portal/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/portal/Vengeance.java
@@ -37,7 +37,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance {
 
     public Vengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/VolcanicDragon.java b/Mage.Sets/src/mage/sets/portal/VolcanicDragon.java
index aaeebbf687..53599aa045 100644
--- a/Mage.Sets/src/mage/sets/portal/VolcanicDragon.java
+++ b/Mage.Sets/src/mage/sets/portal/VolcanicDragon.java
@@ -38,7 +38,7 @@ public class VolcanicDragon extends mage.sets.magic2012.VolcanicDragon {
 
     public VolcanicDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/VolcanicHammer.java b/Mage.Sets/src/mage/sets/portal/VolcanicHammer.java
index 3318e29ead..86adb87e09 100644
--- a/Mage.Sets/src/mage/sets/portal/VolcanicHammer.java
+++ b/Mage.Sets/src/mage/sets/portal/VolcanicHammer.java
@@ -37,7 +37,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {
 
     public VolcanicHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/WallOfSwords.java b/Mage.Sets/src/mage/sets/portal/WallOfSwords.java
index 577dfeff1c..cc782468d3 100644
--- a/Mage.Sets/src/mage/sets/portal/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/portal/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/WarriorsCharge2.java b/Mage.Sets/src/mage/sets/portal/WarriorsCharge2.java
index 9c3d686cba..b731f47540 100644
--- a/Mage.Sets/src/mage/sets/portal/WarriorsCharge2.java
+++ b/Mage.Sets/src/mage/sets/portal/WarriorsCharge2.java
@@ -37,7 +37,7 @@ public class WarriorsCharge2 extends mage.sets.portal.WarriorsCharge1 {
 
     public WarriorsCharge2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
     }
 
     public WarriorsCharge2(final WarriorsCharge2 card) {
diff --git a/Mage.Sets/src/mage/sets/portal/WindDrake.java b/Mage.Sets/src/mage/sets/portal/WindDrake.java
index 786c66584e..3fe019ff8e 100644
--- a/Mage.Sets/src/mage/sets/portal/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/portal/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/WindsOfChange.java b/Mage.Sets/src/mage/sets/portal/WindsOfChange.java
index 60e6b24ec0..806ed5cf8e 100644
--- a/Mage.Sets/src/mage/sets/portal/WindsOfChange.java
+++ b/Mage.Sets/src/mage/sets/portal/WindsOfChange.java
@@ -37,7 +37,7 @@ public class WindsOfChange extends mage.sets.fifthedition.WindsOfChange {
 
     public WindsOfChange(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/WintersGrasp.java b/Mage.Sets/src/mage/sets/portal/WintersGrasp.java
index fb17b56847..1dd273f076 100644
--- a/Mage.Sets/src/mage/sets/portal/WintersGrasp.java
+++ b/Mage.Sets/src/mage/sets/portal/WintersGrasp.java
@@ -37,7 +37,7 @@ public class WintersGrasp extends mage.sets.tempest.WintersGrasp {
 
     public WintersGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portal/WoodElves.java b/Mage.Sets/src/mage/sets/portal/WoodElves.java
index 1bc3d7ecc1..6c8c14452f 100644
--- a/Mage.Sets/src/mage/sets/portal/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/portal/WoodElves.java
@@ -38,7 +38,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "POR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portal/WrathOfGod.java b/Mage.Sets/src/mage/sets/portal/WrathOfGod.java
index 21bd53fc93..19cdd8eb39 100644
--- a/Mage.Sets/src/mage/sets/portal/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/portal/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "POR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java b/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java
index 543ab77e03..8fe96f3868 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java
index 22d9aa4eb0..0394810643 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java
@@ -37,7 +37,7 @@ public class AlluringScent extends mage.sets.portal.AlluringScent {
 
     public AlluringScent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java
index 4dc2cbf056..62ed07886a 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java
@@ -37,7 +37,7 @@ public class AncientCraving extends mage.sets.starter1999.AncientCraving {
 
     public AncientCraving(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java
index 7b38fa86ee..93993ecd2f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java
index 806180abbf..68c30d3362 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java
index 204ae636e3..20adb9acf3 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java
@@ -37,7 +37,7 @@ public class AngelicWall extends mage.sets.tenthedition.AngelicWall {
 
     public AngelicWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java b/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java
index 88897c7120..0e777af18a 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java
@@ -38,7 +38,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel {
 
     public Archangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java b/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java
index d951ff8015..d7b92f6814 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java b/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java
index a58b179213..7436992a3b 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java
@@ -37,7 +37,7 @@ public class ArmoredGriffin extends mage.sets.planechase2012.ArmoredGriffin {
 
     public ArmoredGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java b/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java
index cf8babeb74..64bb6337b9 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java
@@ -37,7 +37,7 @@ public class Bargain extends mage.sets.starter1999.Bargain {
 
     public Bargain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java
index 2a92ef4411..806c217705 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java
@@ -37,7 +37,7 @@ public class BeeSting extends mage.sets.portal.BeeSting {
 
     public BeeSting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java b/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java
index 88c1572655..48588de1c7 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java b/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java
index 91908658e0..5d2207a476 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java
@@ -38,7 +38,7 @@ public class BreathOfLife extends mage.sets.starter2000.BreathOfLife {
 
     public BreathOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java b/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java
index 8cd7980d85..d99964374a 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java
@@ -38,7 +38,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java b/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java
index f87d91f60e..bc98682585 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java
@@ -38,7 +38,7 @@ public class CruelEdict extends mage.sets.tenthedition.CruelEdict {
 
     public CruelEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java
index aba3368403..94417010ec 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java
@@ -37,7 +37,7 @@ public class DakmorPlague extends mage.sets.starter1999.DakmorPlague {
 
     public DakmorPlague(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java
index edcdf218fb..c6e4ac1826 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java
@@ -37,7 +37,7 @@ public class DakmorSorceress extends mage.sets.starter1999.DakmorSorceress {
 
     public DakmorSorceress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java b/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java
index 86e3c48c09..080cc97373 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java
@@ -37,7 +37,7 @@ public class DejaVu extends mage.sets.portal.DejaVu {
 
     public DejaVu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java b/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java
index 4666b3ec97..923db8ab3b 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java
@@ -37,7 +37,7 @@ public class DenizenOfTheDeep extends mage.sets.tenthedition.DenizenOfTheDeep {
 
     public DenizenOfTheDeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java b/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java
index 312b264e4e..3495f0fa9f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java b/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java
index 18ae4e7321..c96a83bebf 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java
@@ -37,7 +37,7 @@ public class Exhaustion extends mage.sets.portalthreekingdoms.Exhaustion {
 
     public Exhaustion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java b/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java
index 3be390b8a5..aa2efed7f6 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java
@@ -37,7 +37,7 @@ public class EyeSpy extends mage.sets.starter1999.EyeSpy {
 
     public EyeSpy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java b/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java
index 4162ab26c1..66cf96c12f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java
@@ -38,7 +38,7 @@ public class FoulSpirit extends mage.sets.masterseditioniv.FoulSpirit {
 
     public FoulSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java
index 200fad9514..7a3a6e45b2 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java
@@ -38,7 +38,7 @@ public class GoblinGeneral extends mage.sets.vintagemasters.GoblinGeneral {
 
     public GoblinGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java
index d2428a8fd6..3f606ba3f6 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java
@@ -38,7 +38,7 @@ public class GoblinGlider extends mage.sets.seventhedition.GoblinGlider {
 
     public GoblinGlider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java
index ed9741ff9a..939811bb2e 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java
@@ -37,7 +37,7 @@ public class GoblinLore extends mage.sets.tenthedition.GoblinLore {
 
     public GoblinLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java
index e0c261d639..f17caa670f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java
@@ -38,7 +38,7 @@ public class GoblinMatron extends mage.sets.urzassaga.GoblinMatron {
 
     public GoblinMatron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java
index e9ae08d2a3..51b6a8e2c7 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java
@@ -37,7 +37,7 @@ public class GoblinMountaineer extends mage.sets.shardsofalara.GoblinMountaineer
 
     public GoblinMountaineer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java
index 2f28a59a74..7c5726895c 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java
@@ -37,7 +37,7 @@ public class GoblinPiker extends mage.sets.tenthedition.GoblinPiker {
 
     public GoblinPiker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java
index b0ac117c91..d50de6a1ea 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java
@@ -37,7 +37,7 @@ public class GoblinRaider extends mage.sets.urzassaga.GoblinRaider {
 
     public GoblinRaider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java
index 5fb63b7424..b789f27a22 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java
@@ -37,7 +37,7 @@ public class GoblinWarStrike extends mage.sets.scourge.GoblinWarStrike {
 
     public GoblinWarStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java b/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java
index eb5d26d586..05b2026f57 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java
@@ -37,7 +37,7 @@ public class HandOfDeath extends mage.sets.starter2000.HandOfDeath {
 
     public HandOfDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java b/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java
index 7668636121..6dc951ccbf 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java
@@ -38,7 +38,7 @@ public class HiddenHorror extends mage.sets.tenthedition.HiddenHorror {
 
     public HiddenHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java b/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java
index c6d536c182..8cde6d199a 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java
@@ -38,7 +38,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java b/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java
index fdb45983ac..2b88de7924 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java
@@ -37,7 +37,7 @@ public class JaggedLightning extends mage.sets.urzassaga.JaggedLightning {
 
     public JaggedLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java b/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java
index 27a66c45da..933b1443bf 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java b/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java
index c6fd28e7f0..b822c0f165 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java
@@ -37,7 +37,7 @@ public class LoneWolf extends mage.sets.urzaslegacy.LoneWolf {
 
     public LoneWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java b/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java
index d74639cdf7..5e49ebd6ef 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java
index 4ab606b7c4..9823795033 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java
@@ -37,7 +37,7 @@ public class MonstrousGrowth extends mage.sets.seventhedition.MonstrousGrowth {
 
     public MonstrousGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java b/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java
index cc7e0d3510..11480a376a 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java
@@ -37,7 +37,7 @@ public class MysticDenial extends mage.sets.portal.MysticDenial {
 
     public MysticDenial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java b/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java
index 18b6358ee6..0e727df765 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java
@@ -37,7 +37,7 @@ public class NaturalSpring extends mage.sets.tempest.NaturalSpring {
 
     public NaturalSpring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java b/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java
index faed5e41b2..e3da51c8cf 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java
index f9b36063fc..3ae81d31e8 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java
@@ -37,7 +37,7 @@ public class NorwoodPriestess extends mage.sets.vintagemasters.NorwoodPriestess
 
     public NorwoodPriestess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java
index 663fd513bf..d81dc0fe1f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java
@@ -37,7 +37,7 @@ public class NorwoodRanger extends mage.sets.ninthedition.NorwoodRanger {
 
     public NorwoodRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java
index c4bf812969..8d06d7f650 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java
@@ -37,7 +37,7 @@ public class OgreTaskmaster extends mage.sets.ninthedition.OgreTaskmaster {
 
     public OgreTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java
index 9f04d5566e..b3a44a53bf 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java
@@ -38,7 +38,7 @@ public class PredatoryNightstalker extends mage.sets.vintagemasters.PredatoryNig
 
     public PredatoryNightstalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java
index 5a641ffa06..008d3e07f0 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java
@@ -37,7 +37,7 @@ public class ProwlingNightstalker extends mage.sets.masterseditioniv.ProwlingNig
 
     public ProwlingNightstalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java b/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java
index e632ae062d..76e266c14d 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java b/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java
index 729e7493de..01ed61f160 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java b/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java
index 7d665ff403..1b6153b25b 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java b/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java
index 3c8ce2ed73..f8e7446beb 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java
@@ -38,7 +38,7 @@ public class RighteousCharge extends mage.sets.gatecrash.RighteousCharge {
 
     public RighteousCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java b/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java
index a8a975bec2..915b0b657f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java
@@ -37,7 +37,7 @@ public class RighteousFury extends mage.sets.starter1999.RighteousFury {
 
     public RighteousFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java b/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java
index d1e9baabf6..2eb5dc32b7 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java
@@ -37,7 +37,7 @@ public class RiverBear extends mage.sets.ninthedition.RiverBear {
 
     public RiverBear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java b/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java
index faef68b06a..3461d2a3cc 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java
@@ -37,7 +37,7 @@ public class ScreechingDrake extends mage.sets.masterseditionii.ScreechingDrake
 
     public ScreechingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java b/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java
index b2ebcbca77..65986bfcb5 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java
@@ -39,7 +39,7 @@ public class SeaDrake extends mage.sets.masterseditionii.SeaDrake {
 
     public SeaDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java b/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java
index a9f22ec45d..e8d7157711 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java
@@ -37,7 +37,7 @@ public class SleightOfHand extends mage.sets.ninthedition.SleightOfHand {
 
     public SleightOfHand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java b/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java
index 77fb9d0b49..cc721232e1 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java b/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java
index 7a6de1cddb..a8e0f70168 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java b/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java
index 85f59693b1..1617d5cfaf 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java
@@ -38,7 +38,7 @@ public class SwarmOfRats extends mage.sets.ninthedition.SwarmOfRats {
 
     public SwarmOfRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java b/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java
index afd4a6b14b..6a161d3e6c 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java
@@ -37,7 +37,7 @@ public class SylvanYeti extends mage.sets.starter1999.SylvanYeti {
 
     public SylvanYeti(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java b/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java
index 97a675b386..95767e91e1 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java
@@ -37,7 +37,7 @@ public class TempleAcolyte extends mage.sets.elspethvstezzeret.TempleAcolyte {
 
     public TempleAcolyte(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java b/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java
index 4035e36a47..9669a28231 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java
@@ -38,7 +38,7 @@ public class TheftOfDreams extends mage.sets.exodus.TheftOfDreams {
 
     public TheftOfDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java b/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java
index b35cb3dfd6..b7a8f31920 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java
@@ -37,7 +37,7 @@ public class TidalSurge extends mage.sets.stronghold.TidalSurge {
 
     public TidalSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java b/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java
index eb10137c82..38e1b9618e 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java b/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java
index 5791e715a6..3731a484d9 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java
@@ -37,7 +37,7 @@ public class TreeMonkey extends mage.sets.ninthedition.TreeMonkey {
 
     public TreeMonkey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java b/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java
index 7483d714e7..a03c1280f1 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java
@@ -37,7 +37,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor {
 
     public Tremor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Undo.java b/Mage.Sets/src/mage/sets/portalsecondage/Undo.java
index a12965707f..7001277b03 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Undo.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Undo.java
@@ -37,7 +37,7 @@ public class Undo extends mage.sets.starter1999.Undo {
 
     public Undo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java b/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java
index 1a8f4a6a44..2f8bfd82a2 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java b/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java
index 9cce6926a3..ed6a787d60 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java
@@ -37,7 +37,7 @@ public class VampiricSpirit extends mage.sets.eighthedition.VampiricSpirit {
 
     public VampiricSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java b/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java
index 292e3eb892..bce1b625b6 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java
@@ -37,7 +37,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance {
 
     public Vengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java b/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java
index 183ea1e830..301f4807f4 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java
@@ -37,7 +37,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {
 
     public VolcanicHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java b/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java
index eef0db6d46..c1ee5bcc9f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java
@@ -37,7 +37,7 @@ public class VolunteerMilitia extends mage.sets.portalthreekingdoms.VolunteerMil
 
     public VolunteerMilitia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java b/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java
index 8477bee477..cc90c7d48e 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java
@@ -37,7 +37,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin {
 
     public WildGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java b/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java
index 31cb69495c..c1e6305f0f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java
@@ -37,7 +37,7 @@ public class Wildfire extends mage.sets.urzassaga.Wildfire {
 
     public Wildfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "PO2";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java b/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java
index badb8027a2..77c675d17f 100644
--- a/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java
+++ b/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java
@@ -38,7 +38,7 @@ public class WindSail extends mage.sets.starter1999.WindSail {
 
     public WindSail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "PO2";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/AmbitionsCost.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/AmbitionsCost.java
index 818c095bcb..8f7d2ec393 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/AmbitionsCost.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/AmbitionsCost.java
@@ -38,7 +38,7 @@ public class AmbitionsCost extends mage.sets.eighthedition.AmbitionsCost {
 
     public AmbitionsCost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/BalanceOfPower.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/BalanceOfPower.java
index 93f76dfcc7..e8b2b20781 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/BalanceOfPower.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/BalanceOfPower.java
@@ -37,7 +37,7 @@ public class BalanceOfPower extends mage.sets.eighthedition.BalanceOfPower {
 
     public BalanceOfPower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Blaze.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Blaze.java
index 9e0ae4e063..6398a7b4d9 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Blaze.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Borrowing100000Arrows.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Borrowing100000Arrows.java
index 53a78897a6..a44e3ed7bd 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Borrowing100000Arrows.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Borrowing100000Arrows.java
@@ -37,7 +37,7 @@ public class Borrowing100000Arrows extends mage.sets.commander2013.Borrowing1000
 
     public Borrowing100000Arrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/BrilliantPlan.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/BrilliantPlan.java
index da2b4a1e7b..91c3b3c4df 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/BrilliantPlan.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/BrilliantPlan.java
@@ -37,7 +37,7 @@ public class BrilliantPlan extends mage.sets.commander2013.BrilliantPlan {
 
     public BrilliantPlan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Coercion.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Coercion.java
index 695069f463..da2cf11101 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Coercion.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Coercion.java
@@ -38,7 +38,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/CorruptEunuchs.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/CorruptEunuchs.java
index 3dccbe169e..f88930f458 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/CorruptEunuchs.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/CorruptEunuchs.java
@@ -37,7 +37,7 @@ public class CorruptEunuchs extends mage.sets.masterseditioniii.CorruptEunuchs {
 
     public CorruptEunuchs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Extinguish.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Extinguish.java
index 10883cfc59..02addf3f45 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Extinguish.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Extinguish.java
@@ -37,7 +37,7 @@ public class Extinguish extends mage.sets.portalsecondage.Extinguish {
 
     public Extinguish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/FalseDefeat.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/FalseDefeat.java
index 99ba984fc8..47629f1e78 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/FalseDefeat.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/FalseDefeat.java
@@ -38,7 +38,7 @@ public class FalseDefeat extends mage.sets.masterseditioniii.FalseDefeat {
 
     public FalseDefeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Famine.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Famine.java
index 68e3ba7bbd..884ecfcad6 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Famine.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Famine.java
@@ -37,7 +37,7 @@ public class Famine extends mage.sets.commander2013.Famine {
 
     public Famine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ForcedRetreat.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ForcedRetreat.java
index 0815691fac..b42ac40759 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ForcedRetreat.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ForcedRetreat.java
@@ -37,7 +37,7 @@ public class ForcedRetreat extends mage.sets.masterseditioniii.ForcedRetreat {
 
     public ForcedRetreat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYuSaintedWarrior.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYuSaintedWarrior.java
index 0501e3d908..7700dd3edf 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYuSaintedWarrior.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYuSaintedWarrior.java
@@ -38,7 +38,7 @@ public class GuanYuSaintedWarrior extends mage.sets.masterseditioniii.GuanYuSain
 
     public GuanYuSaintedWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYus1000LiMarch.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYus1000LiMarch.java
index 52647787d3..3bf5edcd18 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYus1000LiMarch.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/GuanYus1000LiMarch.java
@@ -37,7 +37,7 @@ public class GuanYus1000LiMarch extends mage.sets.masterseditioniii.GuanYus1000L
 
     public GuanYus1000LiMarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/HuaTuoHonoredPhysician.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/HuaTuoHonoredPhysician.java
index 4bd22548a7..2c67243e7d 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/HuaTuoHonoredPhysician.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/HuaTuoHonoredPhysician.java
@@ -37,7 +37,7 @@ public class HuaTuoHonoredPhysician extends mage.sets.commander2013.HuaTuoHonore
 
     public HuaTuoHonoredPhysician(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/KongmingSleepingDragon.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/KongmingSleepingDragon.java
index 7f5d189791..62534322f8 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/KongmingSleepingDragon.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/KongmingSleepingDragon.java
@@ -37,7 +37,7 @@ public class KongmingSleepingDragon extends mage.sets.commander2013.KongmingSlee
 
     public KongmingSleepingDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/LoneWolf.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/LoneWolf.java
index 86ac73a41d..2f9edd43cd 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/LoneWolf.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/LoneWolf.java
@@ -37,7 +37,7 @@ public class LoneWolf extends mage.sets.urzaslegacy.LoneWolf {
 
     public LoneWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/LuBuMasterAtArms.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/LuBuMasterAtArms.java
index c5dfd75ca9..94f7fa45ae 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/LuBuMasterAtArms.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/LuBuMasterAtArms.java
@@ -37,7 +37,7 @@ public class LuBuMasterAtArms extends mage.sets.masterseditioniii.LuBuMasterAtAr
 
     public LuBuMasterAtArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/LuXunScholarGeneral.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/LuXunScholarGeneral.java
index f21ef3c40e..6a57c0b172 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/LuXunScholarGeneral.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/LuXunScholarGeneral.java
@@ -37,7 +37,7 @@ public class LuXunScholarGeneral extends mage.sets.commander2013.LuXunScholarGen
 
     public LuXunScholarGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/MysticDenial.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/MysticDenial.java
index 79ff442359..ab2f87c681 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/MysticDenial.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/MysticDenial.java
@@ -37,7 +37,7 @@ public class MysticDenial extends mage.sets.portal.MysticDenial {
 
     public MysticDenial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/PeachGardenOath.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/PeachGardenOath.java
index 56ec9e28d9..0927acb517 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/PeachGardenOath.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/PeachGardenOath.java
@@ -37,7 +37,7 @@ public class PeachGardenOath extends mage.sets.eighthedition.PeachGardenOath {
 
     public PeachGardenOath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/RedCliffsArmada.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/RedCliffsArmada.java
index 0e96a287aa..f4dffd933f 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/RedCliffsArmada.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/RedCliffsArmada.java
@@ -38,7 +38,7 @@ public class RedCliffsArmada extends mage.sets.masterseditionii.RedCliffsArmada
 
     public RedCliffsArmada(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/RelentlessAssault.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/RelentlessAssault.java
index c5b30a24a9..eab19faa59 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/RidingTheDiluHorse.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/RidingTheDiluHorse.java
index 08541ef908..cc370a1e6f 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/RidingTheDiluHorse.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/RidingTheDiluHorse.java
@@ -38,7 +38,7 @@ public class RidingTheDiluHorse extends mage.sets.masterseditioniii.RidingTheDil
 
     public RidingTheDiluHorse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuCavalry.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuCavalry.java
index fad2232d24..241256294d 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuCavalry.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuCavalry.java
@@ -37,7 +37,7 @@ public class ShuCavalry extends mage.sets.masterseditioniii.ShuCavalry {
 
     public ShuCavalry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteCompanions.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteCompanions.java
index 5b00f9e97a..59c0a50573 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteCompanions.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ShuEliteCompanions.java
@@ -38,7 +38,7 @@ public class ShuEliteCompanions extends mage.sets.masterseditioniii.ShuEliteComp
 
     public ShuEliteCompanions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/SpoilsOfVictory.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/SpoilsOfVictory.java
index 34e86cceaf..c99e3ebcc1 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/SpoilsOfVictory.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/SpoilsOfVictory.java
@@ -37,7 +37,7 @@ public class SpoilsOfVictory extends mage.sets.commander2013.SpoilsOfVictory {
 
     public SpoilsOfVictory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/StalkingTiger.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/StalkingTiger.java
index 4079a6f9e3..301312af35 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/StalkingTiger.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/StalkingTiger.java
@@ -37,7 +37,7 @@ public class StalkingTiger extends mage.sets.tenthedition.StalkingTiger {
 
     public StalkingTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/StolenGrain.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/StolenGrain.java
index 21a9cbb279..b599a04183 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/StolenGrain.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/StolenGrain.java
@@ -37,7 +37,7 @@ public class StolenGrain extends mage.sets.masterseditioniii.StolenGrain {
 
     public StolenGrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/StoneRain.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/StoneRain.java
index c90918b922..2f2f95ffa9 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/StrategicPlanning.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/StrategicPlanning.java
index 09bbbd4131..ba3aa7399a 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/StrategicPlanning.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/StrategicPlanning.java
@@ -37,7 +37,7 @@ public class StrategicPlanning extends mage.sets.commander2013.StrategicPlanning
 
     public StrategicPlanning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/SunCeYoungConquerer.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/SunCeYoungConquerer.java
index 6e433d924c..5c06b28921 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/SunCeYoungConquerer.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/SunCeYoungConquerer.java
@@ -38,7 +38,7 @@ public class SunCeYoungConquerer extends mage.sets.masterseditioniii.SunCeYoungC
 
     public SunCeYoungConquerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/TripWire.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/TripWire.java
index ee30216aae..691ed5aded 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/TripWire.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/TripWire.java
@@ -38,7 +38,7 @@ public class TripWire extends mage.sets.masterseditioniii.TripWire {
 
     public TripWire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/Vengeance.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/Vengeance.java
index 53f3f7e2dd..07ef58e4d9 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/Vengeance.java
@@ -37,7 +37,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance {
 
     public Vengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiEliteCompanions.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiEliteCompanions.java
index 667ef3c730..c860f90b63 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiEliteCompanions.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/WeiEliteCompanions.java
@@ -38,7 +38,7 @@ public class WeiEliteCompanions extends mage.sets.masterseditioniii.WeiEliteComp
 
     public WeiEliteCompanions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/WolfPack.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/WolfPack.java
index 105c7ce48e..e1f58f9681 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/WolfPack.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/WolfPack.java
@@ -37,7 +37,7 @@ public class WolfPack extends mage.sets.masterseditionii.WolfPack {
 
     public WolfPack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/WuWarship.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/WuWarship.java
index d73e452eca..eb1128c469 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/WuWarship.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/WuWarship.java
@@ -37,7 +37,7 @@ public class WuWarship extends mage.sets.masterseditioniii.WuWarship {
 
     public WuWarship(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/YoungWeiRecruits.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/YoungWeiRecruits.java
index 23342d408d..36d774d578 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/YoungWeiRecruits.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/YoungWeiRecruits.java
@@ -37,7 +37,7 @@ public class YoungWeiRecruits extends mage.sets.masterseditioniii.YoungWeiRecrui
 
     public YoungWeiRecruits(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZhangFeiFierceWarrior.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZhangFeiFierceWarrior.java
index 424272f1b6..08079825a8 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZhangFeiFierceWarrior.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZhangFeiFierceWarrior.java
@@ -38,7 +38,7 @@ public class ZhangFeiFierceWarrior extends mage.sets.masterseditioniii.ZhangFeiF
 
     public ZhangFeiFierceWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "PTK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacMonkey.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacMonkey.java
index 429961609e..fd62482970 100644
--- a/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacMonkey.java
+++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/ZodiacMonkey.java
@@ -37,7 +37,7 @@ public class ZodiacMonkey extends mage.sets.ninthedition.ZodiacMonkey {
 
     public ZodiacMonkey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "PTK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AbbotOfKeralKeep.java b/Mage.Sets/src/mage/sets/prereleaseevents/AbbotOfKeralKeep.java
index 9a77f4b58d..4f391e4295 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AbbotOfKeralKeep.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AbbotOfKeralKeep.java
@@ -37,7 +37,7 @@ public class AbbotOfKeralKeep extends mage.sets.magicorigins.AbbotOfKeralKeep {
 
     public AbbotOfKeralKeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AbhorrentOverlord.java b/Mage.Sets/src/mage/sets/prereleaseevents/AbhorrentOverlord.java
index 64d58c8887..f894b31bd7 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AbhorrentOverlord.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AbhorrentOverlord.java
@@ -38,7 +38,7 @@ public class AbhorrentOverlord extends mage.sets.theros.AbhorrentOverlord {
 
     public AbhorrentOverlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AbzanAscendancy.java b/Mage.Sets/src/mage/sets/prereleaseevents/AbzanAscendancy.java
index f0ed927dc1..3c91096143 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AbzanAscendancy.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AbzanAscendancy.java
@@ -38,7 +38,7 @@ public class AbzanAscendancy extends mage.sets.khansoftarkir.AbzanAscendancy {
 
     public AbzanAscendancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AjaniVengeant.java b/Mage.Sets/src/mage/sets/prereleaseevents/AjaniVengeant.java
index 26bd5204a0..985e6b416b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AjaniVengeant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AjaniVengeant.java
@@ -38,7 +38,7 @@ public class AjaniVengeant extends mage.sets.shardsofalara.AjaniVengeant {
 
     public AjaniVengeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AkoumFirebird.java b/Mage.Sets/src/mage/sets/prereleaseevents/AkoumFirebird.java
index dac5ac79af..12e5a7050a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AkoumFirebird.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AkoumFirebird.java
@@ -37,7 +37,7 @@ public class AkoumFirebird extends mage.sets.battleforzendikar.AkoumFirebird {
 
     public AkoumFirebird(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AkoumHellkite.java b/Mage.Sets/src/mage/sets/prereleaseevents/AkoumHellkite.java
index 720c8727b7..6af9944461 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AkoumHellkite.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AkoumHellkite.java
@@ -37,7 +37,7 @@ public class AkoumHellkite extends mage.sets.battleforzendikar.AkoumHellkite {
 
     public AkoumHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AleshaWhoSmilesAtDeath.java b/Mage.Sets/src/mage/sets/prereleaseevents/AleshaWhoSmilesAtDeath.java
index 3788bf3ff9..d6d2336000 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AleshaWhoSmilesAtDeath.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AleshaWhoSmilesAtDeath.java
@@ -37,7 +37,7 @@ public class AleshaWhoSmilesAtDeath extends mage.sets.fatereforged.AleshaWhoSmil
 
     public AleshaWhoSmilesAtDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/sets/prereleaseevents/AlhammarretHighArbiter.java
index d3ba4a31f1..3c399ae603 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AlhammarretHighArbiter.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AlhammarretHighArbiter.java
@@ -37,7 +37,7 @@ public class AlhammarretHighArbiter extends mage.sets.magicorigins.AlhammarretHi
 
     public AlhammarretHighArbiter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AlignedHedronNetwork.java b/Mage.Sets/src/mage/sets/prereleaseevents/AlignedHedronNetwork.java
index b527c460ee..ab9cad6e3e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AlignedHedronNetwork.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AlignedHedronNetwork.java
@@ -37,7 +37,7 @@ public class AlignedHedronNetwork extends mage.sets.battleforzendikar.AlignedHed
 
     public AlignedHedronNetwork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AllosaurusRider.java b/Mage.Sets/src/mage/sets/prereleaseevents/AllosaurusRider.java
index 8ca83d83d3..912e162826 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AllosaurusRider.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AllosaurusRider.java
@@ -38,7 +38,7 @@ public class AllosaurusRider extends mage.sets.elvesvsgoblins.AllosaurusRider {
 
     public AllosaurusRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AllyEncampment.java b/Mage.Sets/src/mage/sets/prereleaseevents/AllyEncampment.java
index f7cb9bcf7a..4dbb14a682 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AllyEncampment.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AllyEncampment.java
@@ -37,7 +37,7 @@ public class AllyEncampment extends mage.sets.battleforzendikar.AllyEncampment {
 
     public AllyEncampment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaKinTreeSpirit.java b/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaKinTreeSpirit.java
index 199ac7700d..8b2d5438b3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaKinTreeSpirit.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaKinTreeSpirit.java
@@ -37,7 +37,7 @@ public class AnafenzaKinTreeSpirit extends mage.sets.dragonsoftarkir.AnafenzaKin
 
     public AnafenzaKinTreeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaTheForemost.java b/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaTheForemost.java
index 48c61403b5..200a41c1d0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaTheForemost.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AnafenzaTheForemost.java
@@ -38,7 +38,7 @@ public class AnafenzaTheForemost extends mage.sets.khansoftarkir.AnafenzaTheFore
 
     public AnafenzaTheForemost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AngelicCaptain.java b/Mage.Sets/src/mage/sets/prereleaseevents/AngelicCaptain.java
index e8294e13ad..e3ecc28648 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AngelicCaptain.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AngelicCaptain.java
@@ -37,7 +37,7 @@ public class AngelicCaptain extends mage.sets.battleforzendikar.AngelicCaptain {
 
     public AngelicCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AnkleShanker.java b/Mage.Sets/src/mage/sets/prereleaseevents/AnkleShanker.java
index 0b6a4f7dc1..9bd7bd0ba0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AnkleShanker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AnkleShanker.java
@@ -38,7 +38,7 @@ public class AnkleShanker extends mage.sets.khansoftarkir.AnkleShanker {
 
     public AnkleShanker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AnthousaSetessanHero.java b/Mage.Sets/src/mage/sets/prereleaseevents/AnthousaSetessanHero.java
index 0be22c0168..129279b783 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AnthousaSetessanHero.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AnthousaSetessanHero.java
@@ -38,7 +38,7 @@ public class AnthousaSetessanHero extends mage.sets.theros.AnthousaSetessanHero
 
     public AnthousaSetessanHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArashinForemost.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArashinForemost.java
index 622a8b9d54..ac2c167553 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ArashinForemost.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArashinForemost.java
@@ -37,7 +37,7 @@ public class ArashinForemost extends mage.sets.dragonsoftarkir.ArashinForemost {
 
     public ArashinForemost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArashinSovereign.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArashinSovereign.java
index 2df9437e39..0ea2d8194e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ArashinSovereign.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArashinSovereign.java
@@ -37,7 +37,7 @@ public class ArashinSovereign extends mage.sets.dragonsoftarkir.ArashinSovereign
 
     public ArashinSovereign(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArbiterOfTheIdeal.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArbiterOfTheIdeal.java
index 29ff4d6f8a..416fe60ed2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ArbiterOfTheIdeal.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArbiterOfTheIdeal.java
@@ -38,7 +38,7 @@ public class ArbiterOfTheIdeal extends mage.sets.bornofthegods.ArbiterOfTheIdeal
 
     public ArbiterOfTheIdeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Arcbond.java b/Mage.Sets/src/mage/sets/prereleaseevents/Arcbond.java
index 54e557153f..b3773acf11 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Arcbond.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Arcbond.java
@@ -37,7 +37,7 @@ public class Arcbond extends mage.sets.fatereforged.Arcbond {
 
     public Arcbond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java
index 430fa61a75..1ef98c7aa6 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java
@@ -38,7 +38,7 @@ public class ArchdemonOfGreed extends mage.sets.darkascension.ArchdemonOfGreed {
 
     public ArchdemonOfGreed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArchfiendOfDepravity.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArchfiendOfDepravity.java
index 058bd88b3c..7f1f656b65 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ArchfiendOfDepravity.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArchfiendOfDepravity.java
@@ -37,7 +37,7 @@ public class ArchfiendOfDepravity extends mage.sets.fatereforged.ArchfiendOfDepr
 
     public ArchfiendOfDepravity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArchonOfTheTriumvirate.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArchonOfTheTriumvirate.java
index bfd41bd5c7..d86555f973 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ArchonOfTheTriumvirate.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArchonOfTheTriumvirate.java
@@ -38,7 +38,7 @@ public class ArchonOfTheTriumvirate extends mage.sets.returntoravnica.ArchonOfTh
 
     public ArchonOfTheTriumvirate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AtarkaWorldRender.java b/Mage.Sets/src/mage/sets/prereleaseevents/AtarkaWorldRender.java
index 1904f98137..4eda61571a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AtarkaWorldRender.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AtarkaWorldRender.java
@@ -37,7 +37,7 @@ public class AtarkaWorldRender extends mage.sets.fatereforged.AtarkaWorldRender
 
     public AtarkaWorldRender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AtarkasCommand.java b/Mage.Sets/src/mage/sets/prereleaseevents/AtarkasCommand.java
index 26902ccfb5..a6a453eb11 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AtarkasCommand.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AtarkasCommand.java
@@ -37,7 +37,7 @@ public class AtarkasCommand extends mage.sets.dragonsoftarkir.AtarkasCommand {
 
     public AtarkasCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AvalancheTusker.java b/Mage.Sets/src/mage/sets/prereleaseevents/AvalancheTusker.java
index 68af60f87f..a2f4602fd4 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AvalancheTusker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AvalancheTusker.java
@@ -38,7 +38,7 @@ public class AvalancheTusker extends mage.sets.khansoftarkir.AvalancheTusker {
 
     public AvalancheTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfDiscord.java b/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfDiscord.java
index 3d295ea688..6d7aab12d5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfDiscord.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfDiscord.java
@@ -38,7 +38,7 @@ public class AvatarOfDiscord extends mage.sets.dissension.AvatarOfDiscord {
 
     public AvatarOfDiscord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfHope.java b/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfHope.java
index 4b27a9809a..2a00b01d6a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfHope.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfHope.java
@@ -38,7 +38,7 @@ public class AvatarOfHope extends mage.sets.prophecy.AvatarOfHope {
 
     public AvatarOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfTheResolute.java b/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfTheResolute.java
index cf31ff3a67..6a3a4a7f52 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfTheResolute.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/AvatarOfTheResolute.java
@@ -37,7 +37,7 @@ public class AvatarOfTheResolute extends mage.sets.dragonsoftarkir.AvatarOfTheRe
 
     public AvatarOfTheResolute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BarrageTyrant.java b/Mage.Sets/src/mage/sets/prereleaseevents/BarrageTyrant.java
index df9bd49ac7..cd1edf3703 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BarrageTyrant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BarrageTyrant.java
@@ -37,7 +37,7 @@ public class BarrageTyrant extends mage.sets.battleforzendikar.BarrageTyrant {
 
     public BarrageTyrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BeastOfBurden.java b/Mage.Sets/src/mage/sets/prereleaseevents/BeastOfBurden.java
index 44bdd49c9f..84796294cd 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BeastOfBurden.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BeastOfBurden.java
@@ -38,7 +38,7 @@ public class BeastOfBurden extends mage.sets.ninthedition.BeastOfBurden {
 
     public BeastOfBurden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BeastcallerSavant.java b/Mage.Sets/src/mage/sets/prereleaseevents/BeastcallerSavant.java
index 4980831a55..bdb60d825e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BeastcallerSavant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BeastcallerSavant.java
@@ -37,7 +37,7 @@ public class BeastcallerSavant extends mage.sets.battleforzendikar.BeastcallerSa
 
     public BeastcallerSavant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BlessedReincarnation.java b/Mage.Sets/src/mage/sets/prereleaseevents/BlessedReincarnation.java
index dabaa1aff1..bed457bbfb 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BlessedReincarnation.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BlessedReincarnation.java
@@ -37,7 +37,7 @@ public class BlessedReincarnation extends mage.sets.dragonsoftarkir.BlessedReinc
 
     public BlessedReincarnation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BlightHerder.java b/Mage.Sets/src/mage/sets/prereleaseevents/BlightHerder.java
index 074c3b000a..26044c6a3a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BlightHerder.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BlightHerder.java
@@ -37,7 +37,7 @@ public class BlightHerder extends mage.sets.battleforzendikar.BlightHerder {
 
     public BlightHerder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BloodChinFanatic.java b/Mage.Sets/src/mage/sets/prereleaseevents/BloodChinFanatic.java
index 6fd000aff8..0ed55b79de 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BloodChinFanatic.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BloodChinFanatic.java
@@ -37,7 +37,7 @@ public class BloodChinFanatic extends mage.sets.dragonsoftarkir.BloodChinFanatic
 
     public BloodChinFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/sets/prereleaseevents/BloodlordOfVaasgoth.java
index 5ef7704f89..7a80e7520b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BloodlordOfVaasgoth.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BloodlordOfVaasgoth.java
@@ -38,7 +38,7 @@ public class BloodlordOfVaasgoth extends mage.sets.magic2012.BloodlordOfVaasgoth
 
     public BloodlordOfVaasgoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BloodsoakedChampion.java b/Mage.Sets/src/mage/sets/prereleaseevents/BloodsoakedChampion.java
index 04457650c4..a41842427d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BloodsoakedChampion.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BloodsoakedChampion.java
@@ -38,7 +38,7 @@ public class BloodsoakedChampion extends mage.sets.khansoftarkir.BloodsoakedCham
 
     public BloodsoakedChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BoltwingMarauder.java b/Mage.Sets/src/mage/sets/prereleaseevents/BoltwingMarauder.java
index eefbe13768..30c2b8a9fe 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BoltwingMarauder.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BoltwingMarauder.java
@@ -37,7 +37,7 @@ public class BoltwingMarauder extends mage.sets.dragonsoftarkir.BoltwingMarauder
 
     public BoltwingMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BringToLight.java b/Mage.Sets/src/mage/sets/prereleaseevents/BringToLight.java
index a0c6c618a3..5a7d8d83f9 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BringToLight.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BringToLight.java
@@ -37,7 +37,7 @@ public class BringToLight extends mage.sets.battleforzendikar.BringToLight {
 
     public BringToLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BroodButcher.java b/Mage.Sets/src/mage/sets/prereleaseevents/BroodButcher.java
index bfa8377d7f..1535c17a43 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BroodButcher.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BroodButcher.java
@@ -37,7 +37,7 @@ public class BroodButcher extends mage.sets.battleforzendikar.BroodButcher {
 
     public BroodButcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BrutalExpulsion.java b/Mage.Sets/src/mage/sets/prereleaseevents/BrutalExpulsion.java
index dbe74c8358..bf197c2351 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BrutalExpulsion.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BrutalExpulsion.java
@@ -37,7 +37,7 @@ public class BrutalExpulsion extends mage.sets.battleforzendikar.BrutalExpulsion
 
     public BrutalExpulsion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/BrutalHordechief.java b/Mage.Sets/src/mage/sets/prereleaseevents/BrutalHordechief.java
index b0b581332d..4dede4d087 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/BrutalHordechief.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/BrutalHordechief.java
@@ -37,7 +37,7 @@ public class BrutalHordechief extends mage.sets.fatereforged.BrutalHordechief {
 
     public BrutalHordechief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ButcherOfTheHorde.java b/Mage.Sets/src/mage/sets/prereleaseevents/ButcherOfTheHorde.java
index 7e3f6355b7..d6d2684df1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ButcherOfTheHorde.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ButcherOfTheHorde.java
@@ -38,7 +38,7 @@ public class ButcherOfTheHorde extends mage.sets.khansoftarkir.ButcherOfTheHorde
 
     public ButcherOfTheHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CanopyVista.java b/Mage.Sets/src/mage/sets/prereleaseevents/CanopyVista.java
index de7894dc08..fd2b02f00c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CanopyVista.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CanopyVista.java
@@ -37,7 +37,7 @@ public class CanopyVista extends mage.sets.battleforzendikar.CanopyVista {
 
     public CanopyVista(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CarnivalHellsteed.java b/Mage.Sets/src/mage/sets/prereleaseevents/CarnivalHellsteed.java
index 9e11a73e22..49f4f92149 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CarnivalHellsteed.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CarnivalHellsteed.java
@@ -38,7 +38,7 @@ public class CarnivalHellsteed extends mage.sets.returntoravnica.CarnivalHellste
 
     public CarnivalHellsteed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CelestialArchon.java b/Mage.Sets/src/mage/sets/prereleaseevents/CelestialArchon.java
index 82939c6ee4..d6a099a312 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CelestialArchon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CelestialArchon.java
@@ -38,7 +38,7 @@ public class CelestialArchon extends mage.sets.theros.CelestialArchon {
 
     public CelestialArchon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ChandraFireOfKaladesh.java b/Mage.Sets/src/mage/sets/prereleaseevents/ChandraFireOfKaladesh.java
index 5a7427975f..d3718e4b45 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ChandraFireOfKaladesh.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ChandraFireOfKaladesh.java
@@ -37,7 +37,7 @@ public class ChandraFireOfKaladesh extends mage.sets.magicorigins.ChandraFireOfK
 
     public ChandraFireOfKaladesh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ChandrasIgnition.java b/Mage.Sets/src/mage/sets/prereleaseevents/ChandrasIgnition.java
index 0a9eb1e8a3..50565d4c8d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ChandrasIgnition.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ChandrasIgnition.java
@@ -37,7 +37,7 @@ public class ChandrasIgnition extends mage.sets.magicorigins.ChandrasIgnition {
 
     public ChandrasIgnition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CinderGlade.java b/Mage.Sets/src/mage/sets/prereleaseevents/CinderGlade.java
index d4846fc5aa..d0b47c6462 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CinderGlade.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CinderGlade.java
@@ -37,7 +37,7 @@ public class CinderGlade extends mage.sets.battleforzendikar.CinderGlade {
 
     public CinderGlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CometStorm.java b/Mage.Sets/src/mage/sets/prereleaseevents/CometStorm.java
index f37ec57a4b..6c2513b918 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CometStorm.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CometStorm.java
@@ -38,7 +38,7 @@ public class CometStorm extends mage.sets.worldwake.CometStorm {
 
     public CometStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ConduitOfRuin.java b/Mage.Sets/src/mage/sets/prereleaseevents/ConduitOfRuin.java
index 556c68e087..01e7911fc9 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ConduitOfRuin.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ConduitOfRuin.java
@@ -37,7 +37,7 @@ public class ConduitOfRuin extends mage.sets.battleforzendikar.ConduitOfRuin {
 
     public ConduitOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ConsumingAberration.java b/Mage.Sets/src/mage/sets/prereleaseevents/ConsumingAberration.java
index 63e318df3c..743a69d9f0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ConsumingAberration.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ConsumingAberration.java
@@ -38,7 +38,7 @@ public class ConsumingAberration extends mage.sets.gatecrash.ConsumingAberration
 
     public ConsumingAberration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CorpsejackMenace.java b/Mage.Sets/src/mage/sets/prereleaseevents/CorpsejackMenace.java
index be557c96a3..6d1fa02cc0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CorpsejackMenace.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CorpsejackMenace.java
@@ -38,7 +38,7 @@ public class CorpsejackMenace extends mage.sets.returntoravnica.CorpsejackMenace
 
     public CorpsejackMenace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CracklingDoom.java b/Mage.Sets/src/mage/sets/prereleaseevents/CracklingDoom.java
index 612457bb6d..5025a62c40 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CracklingDoom.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CracklingDoom.java
@@ -38,7 +38,7 @@ public class CracklingDoom extends mage.sets.khansoftarkir.CracklingDoom {
 
     public CracklingDoom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CraterElemental.java b/Mage.Sets/src/mage/sets/prereleaseevents/CraterElemental.java
index 3a42f2585b..aa9f3768c3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CraterElemental.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CraterElemental.java
@@ -37,7 +37,7 @@ public class CraterElemental extends mage.sets.dragonsoftarkir.CraterElemental {
 
     public CraterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/CratersClaws.java b/Mage.Sets/src/mage/sets/prereleaseevents/CratersClaws.java
index 1a2369ee20..eed3adf1b0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/CratersClaws.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/CratersClaws.java
@@ -38,7 +38,7 @@ public class CratersClaws extends mage.sets.khansoftarkir.CratersClaws {
 
     public CratersClaws(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DaghatarTheAdamant.java b/Mage.Sets/src/mage/sets/prereleaseevents/DaghatarTheAdamant.java
index 5dff5f3c19..93b1d7d605 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DaghatarTheAdamant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DaghatarTheAdamant.java
@@ -37,7 +37,7 @@ public class DaghatarTheAdamant extends mage.sets.fatereforged.DaghatarTheAdaman
 
     public DaghatarTheAdamant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DamnablePact.java b/Mage.Sets/src/mage/sets/prereleaseevents/DamnablePact.java
index e1ffd0c9c0..f66d3fe41e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DamnablePact.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DamnablePact.java
@@ -37,7 +37,7 @@ public class DamnablePact extends mage.sets.dragonsoftarkir.DamnablePact {
 
     public DamnablePact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DarkPetition.java b/Mage.Sets/src/mage/sets/prereleaseevents/DarkPetition.java
index b2d1f6cd23..366af5b1d6 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DarkPetition.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DarkPetition.java
@@ -37,7 +37,7 @@ public class DarkPetition extends mage.sets.magicorigins.DarkPetition {
 
     public DarkPetition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DawnbringerCharioteers.java b/Mage.Sets/src/mage/sets/prereleaseevents/DawnbringerCharioteers.java
index a7f98e3e53..5b3a70123c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DawnbringerCharioteers.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DawnbringerCharioteers.java
@@ -38,7 +38,7 @@ public class DawnbringerCharioteers extends mage.sets.journeyintonyx.Dawnbringer
 
     public DawnbringerCharioteers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DeathbringerRegent.java b/Mage.Sets/src/mage/sets/prereleaseevents/DeathbringerRegent.java
index 3a88aa4489..d882ad4741 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DeathbringerRegent.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DeathbringerRegent.java
@@ -37,7 +37,7 @@ public class DeathbringerRegent extends mage.sets.dragonsoftarkir.DeathbringerRe
 
     public DeathbringerRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DefiantBloodlord.java b/Mage.Sets/src/mage/sets/prereleaseevents/DefiantBloodlord.java
index e722167bcc..93a3b08a24 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DefiantBloodlord.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DefiantBloodlord.java
@@ -37,7 +37,7 @@ public class DefiantBloodlord extends mage.sets.battleforzendikar.DefiantBloodlo
 
     public DefiantBloodlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DeflectingPalm.java b/Mage.Sets/src/mage/sets/prereleaseevents/DeflectingPalm.java
index dd2cd7dc83..6eb05a0eef 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DeflectingPalm.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DeflectingPalm.java
@@ -38,7 +38,7 @@ public class DeflectingPalm extends mage.sets.khansoftarkir.DeflectingPalm {
 
     public DeflectingPalm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DemigodOfRevenge.java b/Mage.Sets/src/mage/sets/prereleaseevents/DemigodOfRevenge.java
index 10cb63e420..11f6056fe5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DemigodOfRevenge.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DemigodOfRevenge.java
@@ -38,7 +38,7 @@ public class DemigodOfRevenge extends mage.sets.shadowmoor.DemigodOfRevenge {
 
     public DemigodOfRevenge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DenProtector.java b/Mage.Sets/src/mage/sets/prereleaseevents/DenProtector.java
index 2a3b07f7fd..7ffcd287f5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DenProtector.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DenProtector.java
@@ -37,7 +37,7 @@ public class DenProtector extends mage.sets.dragonsoftarkir.DenProtector {
 
     public DenProtector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DesolationTwin.java b/Mage.Sets/src/mage/sets/prereleaseevents/DesolationTwin.java
index 78169abfb1..b95927a890 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DesolationTwin.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DesolationTwin.java
@@ -37,7 +37,7 @@ public class DesolationTwin extends mage.sets.battleforzendikar.DesolationTwin {
 
     public DesolationTwin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DespoilerOfSouls.java b/Mage.Sets/src/mage/sets/prereleaseevents/DespoilerOfSouls.java
index e5285aa120..2e4d78d0e3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DespoilerOfSouls.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DespoilerOfSouls.java
@@ -37,7 +37,7 @@ public class DespoilerOfSouls extends mage.sets.magicorigins.DespoilerOfSouls {
 
     public DespoilerOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DigThroughTime.java b/Mage.Sets/src/mage/sets/prereleaseevents/DigThroughTime.java
index 214d4f147b..0b4ef3126f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DigThroughTime.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DigThroughTime.java
@@ -38,7 +38,7 @@ public class DigThroughTime extends mage.sets.khansoftarkir.DigThroughTime {
 
     public DigThroughTime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DoomwakeGiant.java b/Mage.Sets/src/mage/sets/prereleaseevents/DoomwakeGiant.java
index e02219afc8..db98860f62 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DoomwakeGiant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DoomwakeGiant.java
@@ -38,7 +38,7 @@ public class DoomwakeGiant extends mage.sets.journeyintonyx.DoomwakeGiant {
 
     public DoomwakeGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DoorOfDestinies.java b/Mage.Sets/src/mage/sets/prereleaseevents/DoorOfDestinies.java
index 62e3c86772..3339da31f5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DoorOfDestinies.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DoorOfDestinies.java
@@ -38,7 +38,7 @@ public class DoorOfDestinies extends mage.sets.magic2014.DoorOfDestinies {
 
     public DoorOfDestinies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonBroodmother.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonBroodmother.java
index 27436010d5..1bb105bd3c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonBroodmother.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonBroodmother.java
@@ -38,7 +38,7 @@ public class DragonBroodmother extends mage.sets.alarareborn.DragonBroodmother {
 
     public DragonBroodmother(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonStyleTwins.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonStyleTwins.java
index e5265ad0cf..f2dab13b76 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonStyleTwins.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonStyleTwins.java
@@ -38,7 +38,7 @@ public class DragonStyleTwins extends mage.sets.khansoftarkir.DragonStyleTwins {
 
     public DragonStyleTwins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordAtarka.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordAtarka.java
index 979ba92310..ea05ba42e0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordAtarka.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordAtarka.java
@@ -37,7 +37,7 @@ public class DragonlordAtarka extends mage.sets.dragonsoftarkir.DragonlordAtarka
 
     public DragonlordAtarka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordDromoka.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordDromoka.java
index 826f430282..130821ef40 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordDromoka.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordDromoka.java
@@ -37,7 +37,7 @@ public class DragonlordDromoka extends mage.sets.dragonsoftarkir.DragonlordDromo
 
     public DragonlordDromoka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordKolaghan.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordKolaghan.java
index df3649fa74..0eed73e12c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordKolaghan.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordKolaghan.java
@@ -38,7 +38,7 @@ public class DragonlordKolaghan extends mage.sets.dragonsoftarkir.DragonlordKola
 
     public DragonlordKolaghan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordOjutai.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordOjutai.java
index 80b4649faf..3e85d4dbb3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordOjutai.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordOjutai.java
@@ -37,7 +37,7 @@ public class DragonlordOjutai extends mage.sets.dragonsoftarkir.DragonlordOjutai
 
     public DragonlordOjutai(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordSilumgar.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordSilumgar.java
index b8d507f3a5..fbca360b3f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordSilumgar.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonlordSilumgar.java
@@ -37,7 +37,7 @@ public class DragonlordSilumgar extends mage.sets.dragonsoftarkir.DragonlordSilu
 
     public DragonlordSilumgar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonmasterOutcast.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonmasterOutcast.java
index 15402f30d2..ade3e0e258 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonmasterOutcast.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonmasterOutcast.java
@@ -37,7 +37,7 @@ public class DragonmasterOutcast extends mage.sets.worldwake.DragonmasterOutcast
 
     public DragonmasterOutcast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DragonscaleGeneral.java b/Mage.Sets/src/mage/sets/prereleaseevents/DragonscaleGeneral.java
index abe3817b2d..681ae66916 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DragonscaleGeneral.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DragonscaleGeneral.java
@@ -37,7 +37,7 @@ public class DragonscaleGeneral extends mage.sets.fatereforged.DragonscaleGenera
 
     public DragonscaleGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DranaLiberatorOfMalakir.java b/Mage.Sets/src/mage/sets/prereleaseevents/DranaLiberatorOfMalakir.java
index 851fa92564..42a35b49de 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DranaLiberatorOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DranaLiberatorOfMalakir.java
@@ -37,7 +37,7 @@ public class DranaLiberatorOfMalakir extends mage.sets.battleforzendikar.DranaLi
 
     public DranaLiberatorOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DromokaTheEternal.java b/Mage.Sets/src/mage/sets/prereleaseevents/DromokaTheEternal.java
index 2700769185..173b81d57b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DromokaTheEternal.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DromokaTheEternal.java
@@ -37,7 +37,7 @@ public class DromokaTheEternal extends mage.sets.fatereforged.DromokaTheEternal
 
     public DromokaTheEternal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DromokasCommand.java b/Mage.Sets/src/mage/sets/prereleaseevents/DromokasCommand.java
index bf94cd2c3a..3521cc9a58 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DromokasCommand.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DromokasCommand.java
@@ -37,7 +37,7 @@ public class DromokasCommand extends mage.sets.dragonsoftarkir.DromokasCommand {
 
     public DromokasCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DrownerOfHope.java b/Mage.Sets/src/mage/sets/prereleaseevents/DrownerOfHope.java
index a8f30e9717..f0f7c1419d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DrownerOfHope.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DrownerOfHope.java
@@ -37,7 +37,7 @@ public class DrownerOfHope extends mage.sets.battleforzendikar.DrownerOfHope {
 
     public DrownerOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Duneblast.java b/Mage.Sets/src/mage/sets/prereleaseevents/Duneblast.java
index 9432c721f8..3b9ac38577 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Duneblast.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Duneblast.java
@@ -38,7 +38,7 @@ public class Duneblast extends mage.sets.khansoftarkir.Duneblast {
 
     public Duneblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DustStalker.java b/Mage.Sets/src/mage/sets/prereleaseevents/DustStalker.java
index f89f3dad29..d1b371bde1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DustStalker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DustStalker.java
@@ -37,7 +37,7 @@ public class DustStalker extends mage.sets.battleforzendikar.DustStalker {
 
     public DustStalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/DwynenGiltLeafDaen.java b/Mage.Sets/src/mage/sets/prereleaseevents/DwynenGiltLeafDaen.java
index 5723d1d67f..75c2e57db2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/DwynenGiltLeafDaen.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/DwynenGiltLeafDaen.java
@@ -37,7 +37,7 @@ public class DwynenGiltLeafDaen extends mage.sets.magicorigins.DwynenGiltLeafDae
 
     public DwynenGiltLeafDaen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EaterOfHope.java b/Mage.Sets/src/mage/sets/prereleaseevents/EaterOfHope.java
index d40cefac6f..212e57955b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EaterOfHope.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EaterOfHope.java
@@ -38,7 +38,7 @@ public class EaterOfHope extends mage.sets.bornofthegods.EaterOfHope {
 
     public EaterOfHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EmberSwallower.java b/Mage.Sets/src/mage/sets/prereleaseevents/EmberSwallower.java
index 5ad4036d73..27e16c07ed 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EmberSwallower.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EmberSwallower.java
@@ -38,7 +38,7 @@ public class EmberSwallower extends mage.sets.theros.EmberSwallower {
 
     public EmberSwallower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EmbermawHellion.java b/Mage.Sets/src/mage/sets/prereleaseevents/EmbermawHellion.java
index f84d646a23..dc932f39b6 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EmbermawHellion.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EmbermawHellion.java
@@ -37,7 +37,7 @@ public class EmbermawHellion extends mage.sets.magicorigins.EmbermawHellion {
 
     public EmbermawHellion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EmeriaShepherd.java b/Mage.Sets/src/mage/sets/prereleaseevents/EmeriaShepherd.java
index 9ee87fbd50..5e3d177b6f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EmeriaShepherd.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EmeriaShepherd.java
@@ -37,7 +37,7 @@ public class EmeriaShepherd extends mage.sets.battleforzendikar.EmeriaShepherd {
 
     public EmeriaShepherd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/sets/prereleaseevents/EmrakulTheAeonsTorn.java
index c0386a5503..4d4999081f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EmrakulTheAeonsTorn.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EmrakulTheAeonsTorn.java
@@ -38,7 +38,7 @@ public class EmrakulTheAeonsTorn extends mage.sets.riseoftheeldrazi.EmrakulTheAe
 
     public EmrakulTheAeonsTorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EndlessOne.java b/Mage.Sets/src/mage/sets/prereleaseevents/EndlessOne.java
index 5f1940cb2d..b949570da4 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EndlessOne.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EndlessOne.java
@@ -37,7 +37,7 @@ public class EndlessOne extends mage.sets.battleforzendikar.EndlessOne {
 
     public EndlessOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/EvolutionaryLeap.java b/Mage.Sets/src/mage/sets/prereleaseevents/EvolutionaryLeap.java
index 20ad78fe79..6f9a8789e8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/EvolutionaryLeap.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/EvolutionaryLeap.java
@@ -37,7 +37,7 @@ public class EvolutionaryLeap extends mage.sets.magicorigins.EvolutionaryLeap {
 
     public EvolutionaryLeap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ExertInfluence.java b/Mage.Sets/src/mage/sets/prereleaseevents/ExertInfluence.java
index af7673c749..7928c54e22 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ExertInfluence.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ExertInfluence.java
@@ -37,7 +37,7 @@ public class ExertInfluence extends mage.sets.battleforzendikar.ExertInfluence {
 
     public ExertInfluence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ExquisiteFirecraft.java b/Mage.Sets/src/mage/sets/prereleaseevents/ExquisiteFirecraft.java
index 6a48e5a55b..ed189a3da2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ExquisiteFirecraft.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ExquisiteFirecraft.java
@@ -37,7 +37,7 @@ public class ExquisiteFirecraft extends mage.sets.magicorigins.ExquisiteFirecraf
 
     public ExquisiteFirecraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FalseProphet.java b/Mage.Sets/src/mage/sets/prereleaseevents/FalseProphet.java
index a5a03c2930..a03894187a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FalseProphet.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FalseProphet.java
@@ -39,7 +39,7 @@ public class FalseProphet extends mage.sets.urzasdestiny.FalseProphet {
 
     public FalseProphet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FathomFeeder.java b/Mage.Sets/src/mage/sets/prereleaseevents/FathomFeeder.java
index d3d12c0fed..37508c6f36 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FathomFeeder.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FathomFeeder.java
@@ -37,7 +37,7 @@ public class FathomFeeder extends mage.sets.battleforzendikar.FathomFeeder {
 
     public FathomFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FathomMage.java b/Mage.Sets/src/mage/sets/prereleaseevents/FathomMage.java
index bea778e4d1..4a1781916a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FathomMage.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FathomMage.java
@@ -38,7 +38,7 @@ public class FathomMage extends mage.sets.gatecrash.FathomMage {
 
     public FathomMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FelidarSovereign.java b/Mage.Sets/src/mage/sets/prereleaseevents/FelidarSovereign.java
index 5ca4f5b800..1948ef36dd 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FelidarSovereign.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FelidarSovereign.java
@@ -38,7 +38,7 @@ public class FelidarSovereign extends mage.sets.zendikar.FelidarSovereign {
 
     public FelidarSovereign(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FlamerushRider.java b/Mage.Sets/src/mage/sets/prereleaseevents/FlamerushRider.java
index 0f8b86506a..65b714347b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FlamerushRider.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FlamerushRider.java
@@ -37,7 +37,7 @@ public class FlamerushRider extends mage.sets.fatereforged.FlamerushRider {
 
     public FlamerushRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FlamewakePhoenix.java b/Mage.Sets/src/mage/sets/prereleaseevents/FlamewakePhoenix.java
index 6ef0548f83..43079f151e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FlamewakePhoenix.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FlamewakePhoenix.java
@@ -37,7 +37,7 @@ public class FlamewakePhoenix extends mage.sets.fatereforged.FlamewakePhoenix {
 
     public FlamewakePhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FlyingCraneTechnique.java b/Mage.Sets/src/mage/sets/prereleaseevents/FlyingCraneTechnique.java
index 7a038d0f88..547d59f169 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FlyingCraneTechnique.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FlyingCraneTechnique.java
@@ -38,7 +38,7 @@ public class FlyingCraneTechnique extends mage.sets.khansoftarkir.FlyingCraneTec
 
     public FlyingCraneTechnique(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FoeRazerRegent.java b/Mage.Sets/src/mage/sets/prereleaseevents/FoeRazerRegent.java
index 700f0c1048..d290d05f5f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FoeRazerRegent.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FoeRazerRegent.java
@@ -37,7 +37,7 @@ public class FoeRazerRegent extends mage.sets.dragonsoftarkir.FoeRazerRegent {
 
     public FoeRazerRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ForgestokerDragon.java b/Mage.Sets/src/mage/sets/prereleaseevents/ForgestokerDragon.java
index 5d9f0d82bb..f9bb9272ea 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ForgestokerDragon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ForgestokerDragon.java
@@ -38,7 +38,7 @@ public class ForgestokerDragon extends mage.sets.bornofthegods.ForgestokerDragon
 
     public ForgestokerDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FoundryChampion.java b/Mage.Sets/src/mage/sets/prereleaseevents/FoundryChampion.java
index a1bbf2d639..d6545e4192 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FoundryChampion.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FoundryChampion.java
@@ -38,7 +38,7 @@ public class FoundryChampion extends mage.sets.gatecrash.FoundryChampion {
 
     public FoundryChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FromBeyond.java b/Mage.Sets/src/mage/sets/prereleaseevents/FromBeyond.java
index 855087d29f..b40c61e544 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FromBeyond.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FromBeyond.java
@@ -37,7 +37,7 @@ public class FromBeyond extends mage.sets.battleforzendikar.FromBeyond {
 
     public FromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/FungalShambler.java b/Mage.Sets/src/mage/sets/prereleaseevents/FungalShambler.java
index 622a92e577..277c0d7558 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/FungalShambler.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/FungalShambler.java
@@ -38,7 +38,7 @@ public class FungalShambler extends mage.sets.apocalypse.FungalShambler {
 
     public FungalShambler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GaeasRevenge.java b/Mage.Sets/src/mage/sets/prereleaseevents/GaeasRevenge.java
index 11e9e51920..77eba6b3d8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GaeasRevenge.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GaeasRevenge.java
@@ -38,7 +38,7 @@ public class GaeasRevenge extends mage.sets.magic2011.GaeasRevenge {
 
     public GaeasRevenge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GideonAllyOfZendikar.java b/Mage.Sets/src/mage/sets/prereleaseevents/GideonAllyOfZendikar.java
index ecf4209b61..7e4fa55c2f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GideonAllyOfZendikar.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GideonAllyOfZendikar.java
@@ -37,7 +37,7 @@ public class GideonAllyOfZendikar extends mage.sets.battleforzendikar.GideonAlly
 
     public GideonAllyOfZendikar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GideonsPhalanx.java b/Mage.Sets/src/mage/sets/prereleaseevents/GideonsPhalanx.java
index ee9fc6150b..7228267fd4 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GideonsPhalanx.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GideonsPhalanx.java
@@ -37,7 +37,7 @@ public class GideonsPhalanx extends mage.sets.magicorigins.GideonsPhalanx {
 
     public GideonsPhalanx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GiltLeafWinnower.java b/Mage.Sets/src/mage/sets/prereleaseevents/GiltLeafWinnower.java
index 8ff944f296..e694d274d2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GiltLeafWinnower.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GiltLeafWinnower.java
@@ -37,7 +37,7 @@ public class GiltLeafWinnower extends mage.sets.magicorigins.GiltLeafWinnower {
 
     public GiltLeafWinnower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GlissaTheTraitor.java b/Mage.Sets/src/mage/sets/prereleaseevents/GlissaTheTraitor.java
index 2d9e11d0fa..c43a85e774 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GlissaTheTraitor.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GlissaTheTraitor.java
@@ -38,7 +38,7 @@ public class GlissaTheTraitor extends mage.sets.mirrodinbesieged.GlissaTheTraito
 
     public GlissaTheTraitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/prereleaseevents/GoblinPiledriver.java
index acef10a667..0915b9a9fd 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GoblinPiledriver.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GoblinPiledriver.java
@@ -37,7 +37,7 @@ public class GoblinPiledriver extends mage.sets.onslaught.GoblinPiledriver {
 
     public GoblinPiledriver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GravebladeMarauder.java b/Mage.Sets/src/mage/sets/prereleaseevents/GravebladeMarauder.java
index 6b43b37d4b..b67e2226ad 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GravebladeMarauder.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GravebladeMarauder.java
@@ -37,7 +37,7 @@ public class GravebladeMarauder extends mage.sets.magicorigins.GravebladeMaraude
 
     public GravebladeMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GreenwardenOfMurasa.java b/Mage.Sets/src/mage/sets/prereleaseevents/GreenwardenOfMurasa.java
index c00d93ad6e..2879124d69 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GreenwardenOfMurasa.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GreenwardenOfMurasa.java
@@ -37,7 +37,7 @@ public class GreenwardenOfMurasa extends mage.sets.battleforzendikar.Greenwarden
 
     public GreenwardenOfMurasa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GrimHaruspex.java b/Mage.Sets/src/mage/sets/prereleaseevents/GrimHaruspex.java
index 6bfb61bbe0..0dc96cf69e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GrimHaruspex.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GrimHaruspex.java
@@ -38,7 +38,7 @@ public class GrimHaruspex extends mage.sets.khansoftarkir.GrimHaruspex {
 
     public GrimHaruspex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GroveOfTheGuardian.java b/Mage.Sets/src/mage/sets/prereleaseevents/GroveOfTheGuardian.java
index adc674dea6..d2a8c6991f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GroveOfTheGuardian.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GroveOfTheGuardian.java
@@ -38,7 +38,7 @@ public class GroveOfTheGuardian extends mage.sets.returntoravnica.GroveOfTheGuar
 
     public GroveOfTheGuardian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GruesomeSlaughter.java b/Mage.Sets/src/mage/sets/prereleaseevents/GruesomeSlaughter.java
index 18098026c4..9a05f39214 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GruesomeSlaughter.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GruesomeSlaughter.java
@@ -37,7 +37,7 @@ public class GruesomeSlaughter extends mage.sets.battleforzendikar.GruesomeSlaug
 
     public GruesomeSlaughter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GuardianOfTazeem.java b/Mage.Sets/src/mage/sets/prereleaseevents/GuardianOfTazeem.java
index 222956139c..3f5e8b04ac 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GuardianOfTazeem.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GuardianOfTazeem.java
@@ -37,7 +37,7 @@ public class GuardianOfTazeem extends mage.sets.battleforzendikar.GuardianOfTaze
 
     public GuardianOfTazeem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/GuulDrazOverseer.java b/Mage.Sets/src/mage/sets/prereleaseevents/GuulDrazOverseer.java
index 6a831fce4a..a8a1e22548 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/GuulDrazOverseer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/GuulDrazOverseer.java
@@ -37,7 +37,7 @@ public class GuulDrazOverseer extends mage.sets.battleforzendikar.GuulDrazOverse
 
     public GuulDrazOverseer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheHunt.java b/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheHunt.java
index 558cebbb3a..375cb96077 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheHunt.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheHunt.java
@@ -37,7 +37,7 @@ public class HarbingerOfTheHunt extends mage.sets.dragonsoftarkir.HarbingerOfThe
 
     public HarbingerOfTheHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheTides.java b/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheTides.java
index 1b6c3ef54f..d895105479 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheTides.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HarbingerOfTheTides.java
@@ -37,7 +37,7 @@ public class HarbingerOfTheTides extends mage.sets.magicorigins.HarbingerOfTheTi
 
     public HarbingerOfTheTides(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HardenedScales.java b/Mage.Sets/src/mage/sets/prereleaseevents/HardenedScales.java
index eecf68d2c0..69e41d198f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HardenedScales.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HardenedScales.java
@@ -38,7 +38,7 @@ public class HardenedScales extends mage.sets.khansoftarkir.HardenedScales {
 
     public HardenedScales(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HelmOfKaldra.java b/Mage.Sets/src/mage/sets/prereleaseevents/HelmOfKaldra.java
index 3090dd8a97..266bc86de9 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HelmOfKaldra.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HelmOfKaldra.java
@@ -38,7 +38,7 @@ public class HelmOfKaldra extends mage.sets.fifthdawn.HelmOfKaldra {
 
     public HelmOfKaldra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HeraldOfAnafenza.java b/Mage.Sets/src/mage/sets/prereleaseevents/HeraldOfAnafenza.java
index 50f5f4b820..979f47f516 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HeraldOfAnafenza.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HeraldOfAnafenza.java
@@ -38,7 +38,7 @@ public class HeraldOfAnafenza extends mage.sets.khansoftarkir.HeraldOfAnafenza {
 
     public HeraldOfAnafenza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfBladehold.java b/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfBladehold.java
index 5e33e9dc31..c0b1874d32 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfBladehold.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfBladehold.java
@@ -38,7 +38,7 @@ public class HeroOfBladehold extends mage.sets.mirrodinbesieged.HeroOfBladehold
 
     public HeroOfBladehold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfGomaFada.java b/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfGomaFada.java
index 69d9c2be14..91532f0144 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfGomaFada.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HeroOfGomaFada.java
@@ -37,7 +37,7 @@ public class HeroOfGomaFada extends mage.sets.battleforzendikar.HeroOfGomaFada {
 
     public HeroOfGomaFada(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HeroesBane.java b/Mage.Sets/src/mage/sets/prereleaseevents/HeroesBane.java
index 78eae10413..4577592ff1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HeroesBane.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HeroesBane.java
@@ -38,7 +38,7 @@ public class HeroesBane extends mage.sets.journeyintonyx.HeroesBane {
 
     public HeroesBane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HiddenDragonslayer.java b/Mage.Sets/src/mage/sets/prereleaseevents/HiddenDragonslayer.java
index 5ce1785fec..bb718bca49 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HiddenDragonslayer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HiddenDragonslayer.java
@@ -37,7 +37,7 @@ public class HiddenDragonslayer extends mage.sets.dragonsoftarkir.HiddenDragonsl
 
     public HiddenDragonslayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HighSentinelsOfArashin.java b/Mage.Sets/src/mage/sets/prereleaseevents/HighSentinelsOfArashin.java
index 636613167f..7ed6c57b85 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HighSentinelsOfArashin.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HighSentinelsOfArashin.java
@@ -38,7 +38,7 @@ public class HighSentinelsOfArashin extends mage.sets.khansoftarkir.HighSentinel
 
     public HighSentinelsOfArashin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HixusPrisonWarden.java b/Mage.Sets/src/mage/sets/prereleaseevents/HixusPrisonWarden.java
index 6cb7f05c64..c2c1c81d89 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HixusPrisonWarden.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HixusPrisonWarden.java
@@ -37,7 +37,7 @@ public class HixusPrisonWarden extends mage.sets.magicorigins.HixusPrisonWarden
 
     public HixusPrisonWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HonoredHierarch.java b/Mage.Sets/src/mage/sets/prereleaseevents/HonoredHierarch.java
index 0918a3afb7..fe205251a5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HonoredHierarch.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HonoredHierarch.java
@@ -37,7 +37,7 @@ public class HonoredHierarch extends mage.sets.magicorigins.HonoredHierarch {
 
     public HonoredHierarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HowlpackAlpha.java b/Mage.Sets/src/mage/sets/prereleaseevents/HowlpackAlpha.java
index 85803c5640..cebf404531 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HowlpackAlpha.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HowlpackAlpha.java
@@ -38,7 +38,7 @@ public class HowlpackAlpha extends mage.sets.innistrad.HowlpackAlpha {
 
     public HowlpackAlpha(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/HypersonicDragon.java b/Mage.Sets/src/mage/sets/prereleaseevents/HypersonicDragon.java
index e948c23ccd..ff1d8aaa15 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/HypersonicDragon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/HypersonicDragon.java
@@ -38,7 +38,7 @@ public class HypersonicDragon extends mage.sets.returntoravnica.HypersonicDragon
 
     public HypersonicDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/IcefallRegent.java b/Mage.Sets/src/mage/sets/prereleaseevents/IcefallRegent.java
index f6d42fd036..9eb7562385 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/IcefallRegent.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/IcefallRegent.java
@@ -37,7 +37,7 @@ public class IcefallRegent extends mage.sets.dragonsoftarkir.IcefallRegent {
 
     public IcefallRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/IcyBlast.java b/Mage.Sets/src/mage/sets/prereleaseevents/IcyBlast.java
index 7771217d3e..77107c808a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/IcyBlast.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/IcyBlast.java
@@ -38,7 +38,7 @@ public class IcyBlast extends mage.sets.khansoftarkir.IcyBlast {
 
     public IcyBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/IndulgentTormentor.java b/Mage.Sets/src/mage/sets/prereleaseevents/IndulgentTormentor.java
index 17e05f5782..efedf07b48 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/IndulgentTormentor.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/IndulgentTormentor.java
@@ -38,7 +38,7 @@ public class IndulgentTormentor extends mage.sets.magic2015.IndulgentTormentor {
 
     public IndulgentTormentor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/InkEyesServantOfOni.java b/Mage.Sets/src/mage/sets/prereleaseevents/InkEyesServantOfOni.java
index b817c41498..c03120290d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/InkEyesServantOfOni.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/InkEyesServantOfOni.java
@@ -38,7 +38,7 @@ public class InkEyesServantOfOni extends mage.sets.betrayersofkamigawa.InkEyesSe
 
     public InkEyesServantOfOni(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/IreShaman.java b/Mage.Sets/src/mage/sets/prereleaseevents/IreShaman.java
index 498182280f..28aa689408 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/IreShaman.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/IreShaman.java
@@ -37,7 +37,7 @@ public class IreShaman extends mage.sets.dragonsoftarkir.IreShaman {
 
     public IreShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/IvorytuskFortress.java b/Mage.Sets/src/mage/sets/prereleaseevents/IvorytuskFortress.java
index ac156a6990..28391fe647 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/IvorytuskFortress.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/IvorytuskFortress.java
@@ -38,7 +38,7 @@ public class IvorytuskFortress extends mage.sets.khansoftarkir.IvorytuskFortress
 
     public IvorytuskFortress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/JaceVrynsProdigy.java b/Mage.Sets/src/mage/sets/prereleaseevents/JaceVrynsProdigy.java
index 3c4b41864d..7cef2c66de 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/JaceVrynsProdigy.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/JaceVrynsProdigy.java
@@ -37,7 +37,7 @@ public class JaceVrynsProdigy extends mage.sets.magicorigins.JaceVrynsProdigy {
 
     public JaceVrynsProdigy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/JeeringInstigator.java b/Mage.Sets/src/mage/sets/prereleaseevents/JeeringInstigator.java
index 3400d2dc50..0cd571315a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/JeeringInstigator.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/JeeringInstigator.java
@@ -38,7 +38,7 @@ public class JeeringInstigator extends mage.sets.khansoftarkir.JeeringInstigator
 
     public JeeringInstigator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiAscendancy.java b/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiAscendancy.java
index 3963a5ce91..a3ab3a5626 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiAscendancy.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiAscendancy.java
@@ -38,7 +38,7 @@ public class JeskaiAscendancy extends mage.sets.khansoftarkir.JeskaiAscendancy {
 
     public JeskaiAscendancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiInfiltrator.java b/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiInfiltrator.java
index 77a1e94dc8..41195388eb 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiInfiltrator.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/JeskaiInfiltrator.java
@@ -37,7 +37,7 @@ public class JeskaiInfiltrator extends mage.sets.fatereforged.JeskaiInfiltrator
 
     public JeskaiInfiltrator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KheruLichLord.java b/Mage.Sets/src/mage/sets/prereleaseevents/KheruLichLord.java
index 7744fed3a3..127a2ed969 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KheruLichLord.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KheruLichLord.java
@@ -38,7 +38,7 @@ public class KheruLichLord extends mage.sets.khansoftarkir.KheruLichLord {
 
     public KheruLichLord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KioraMasterOfTheDepths.java b/Mage.Sets/src/mage/sets/prereleaseevents/KioraMasterOfTheDepths.java
index b21bf717ae..e781140dd8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KioraMasterOfTheDepths.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KioraMasterOfTheDepths.java
@@ -37,7 +37,7 @@ public class KioraMasterOfTheDepths extends mage.sets.battleforzendikar.KioraMas
 
     public KioraMasterOfTheDepths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KolaghanTheStormsFury.java b/Mage.Sets/src/mage/sets/prereleaseevents/KolaghanTheStormsFury.java
index 66b07c62e6..eee86845d4 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KolaghanTheStormsFury.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KolaghanTheStormsFury.java
@@ -37,7 +37,7 @@ public class KolaghanTheStormsFury extends mage.sets.fatereforged.KolaghanTheSto
 
     public KolaghanTheStormsFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KolaghansCommand.java b/Mage.Sets/src/mage/sets/prereleaseevents/KolaghansCommand.java
index bd58bda909..64965caf06 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KolaghansCommand.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KolaghansCommand.java
@@ -37,7 +37,7 @@ public class KolaghansCommand extends mage.sets.dragonsoftarkir.KolaghansCommand
 
     public KolaghansCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KorlashHeirToBlackblade.java b/Mage.Sets/src/mage/sets/prereleaseevents/KorlashHeirToBlackblade.java
index dd1cd9a2a6..d4b9a20c6c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KorlashHeirToBlackblade.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KorlashHeirToBlackblade.java
@@ -38,7 +38,7 @@ public class KorlashHeirToBlackblade extends mage.sets.futuresight.KorlashHeirTo
 
     public KorlashHeirToBlackblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KothophedSoulHoarder.java b/Mage.Sets/src/mage/sets/prereleaseevents/KothophedSoulHoarder.java
index 58db1c230e..410b6d22c5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KothophedSoulHoarder.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KothophedSoulHoarder.java
@@ -37,7 +37,7 @@ public class KothophedSoulHoarder extends mage.sets.magicorigins.KothophedSoulHo
 
     public KothophedSoulHoarder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KytheonHeroOfAkros.java b/Mage.Sets/src/mage/sets/prereleaseevents/KytheonHeroOfAkros.java
index cf7ed2c28d..afe8714eb9 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KytheonHeroOfAkros.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KytheonHeroOfAkros.java
@@ -37,7 +37,7 @@ public class KytheonHeroOfAkros extends mage.sets.magicorigins.KytheonHeroOfAkro
 
     public KytheonHeroOfAkros(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/KytheonsIrregulars.java b/Mage.Sets/src/mage/sets/prereleaseevents/KytheonsIrregulars.java
index c61012b4b8..f48c4cdfb3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/KytheonsIrregulars.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/KytheonsIrregulars.java
@@ -37,7 +37,7 @@ public class KytheonsIrregulars extends mage.sets.magicorigins.KytheonsIrregular
 
     public KytheonsIrregulars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Languish.java b/Mage.Sets/src/mage/sets/prereleaseevents/Languish.java
index 555c0f3530..68ac070336 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Languish.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Languish.java
@@ -37,7 +37,7 @@ public class Languish extends mage.sets.magicorigins.Languish {
 
     public Languish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LanternScout.java b/Mage.Sets/src/mage/sets/prereleaseevents/LanternScout.java
index 55a57bd479..4f5051c4b5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LanternScout.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LanternScout.java
@@ -37,7 +37,7 @@ public class LanternScout extends mage.sets.battleforzendikar.LanternScout {
 
     public LanternScout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LaquatussChampion.java b/Mage.Sets/src/mage/sets/prereleaseevents/LaquatussChampion.java
index c7cd4965ad..f7dc5383f7 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LaquatussChampion.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LaquatussChampion.java
@@ -38,7 +38,7 @@ public class LaquatussChampion extends mage.sets.torment.LaquatussChampion {
 
     public LaquatussChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LilianaHereticalHealer.java b/Mage.Sets/src/mage/sets/prereleaseevents/LilianaHereticalHealer.java
index 71bca6f027..b692fb3f87 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LilianaHereticalHealer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LilianaHereticalHealer.java
@@ -37,7 +37,7 @@ public class LilianaHereticalHealer extends mage.sets.magicorigins.LilianaHereti
 
     public LilianaHereticalHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LivingLore.java b/Mage.Sets/src/mage/sets/prereleaseevents/LivingLore.java
index 7a1682503f..9f1734fb48 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LivingLore.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LivingLore.java
@@ -37,7 +37,7 @@ public class LivingLore extends mage.sets.dragonsoftarkir.LivingLore {
 
     public LivingLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LotusBloom.java b/Mage.Sets/src/mage/sets/prereleaseevents/LotusBloom.java
index d3bf3d377e..6c4a81efb0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LotusBloom.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LotusBloom.java
@@ -38,7 +38,7 @@ public class LotusBloom extends mage.sets.timespiral.LotusBloom {
 
     public LotusBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LuBuMasterAtArms.java b/Mage.Sets/src/mage/sets/prereleaseevents/LuBuMasterAtArms.java
index 84cfffc90e..2182cdda42 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LuBuMasterAtArms.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LuBuMasterAtArms.java
@@ -38,7 +38,7 @@ public class LuBuMasterAtArms extends mage.sets.masterseditioniii.LuBuMasterAtAr
 
     public LuBuMasterAtArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/LumberingFalls.java b/Mage.Sets/src/mage/sets/prereleaseevents/LumberingFalls.java
index a622f0781f..2ed42471b1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/LumberingFalls.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/LumberingFalls.java
@@ -37,7 +37,7 @@ public class LumberingFalls extends mage.sets.battleforzendikar.LumberingFalls {
 
     public LumberingFalls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Malfegor.java b/Mage.Sets/src/mage/sets/prereleaseevents/Malfegor.java
index a020d29287..e8f21b3233 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Malfegor.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Malfegor.java
@@ -38,7 +38,7 @@ public class Malfegor extends mage.sets.conflux.Malfegor {
 
     public Malfegor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ManagorgerHydra.java b/Mage.Sets/src/mage/sets/prereleaseevents/ManagorgerHydra.java
index 17a4377dcc..f9c54ee5a7 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ManagorgerHydra.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ManagorgerHydra.java
@@ -37,7 +37,7 @@ public class ManagorgerHydra extends mage.sets.magicorigins.ManagorgerHydra {
 
     public ManagorgerHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MarchFromTheTomb.java b/Mage.Sets/src/mage/sets/prereleaseevents/MarchFromTheTomb.java
index 2ba88c94c0..0bf5c2db5d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MarchFromTheTomb.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MarchFromTheTomb.java
@@ -37,7 +37,7 @@ public class MarchFromTheTomb extends mage.sets.battleforzendikar.MarchFromTheTo
 
     public MarchFromTheTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MarduAscendancy.java b/Mage.Sets/src/mage/sets/prereleaseevents/MarduAscendancy.java
index 001251273c..22078fee8f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MarduAscendancy.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MarduAscendancy.java
@@ -38,7 +38,7 @@ public class MarduAscendancy extends mage.sets.khansoftarkir.MarduAscendancy {
 
     public MarduAscendancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MarduStrikeLeader.java b/Mage.Sets/src/mage/sets/prereleaseevents/MarduStrikeLeader.java
index 90f798d6b3..12a8f96f81 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MarduStrikeLeader.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MarduStrikeLeader.java
@@ -37,7 +37,7 @@ public class MarduStrikeLeader extends mage.sets.fatereforged.MarduStrikeLeader
 
     public MarduStrikeLeader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MasterOfPearls.java b/Mage.Sets/src/mage/sets/prereleaseevents/MasterOfPearls.java
index 4311f63fdf..dc57c9823f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MasterOfPearls.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MasterOfPearls.java
@@ -38,7 +38,7 @@ public class MasterOfPearls extends mage.sets.khansoftarkir.MasterOfPearls {
 
     public MasterOfPearls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MasteryOfTheUnseen.java b/Mage.Sets/src/mage/sets/prereleaseevents/MasteryOfTheUnseen.java
index 4e507baf13..fda5bcfdcd 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MasteryOfTheUnseen.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MasteryOfTheUnseen.java
@@ -37,7 +37,7 @@ public class MasteryOfTheUnseen extends mage.sets.fatereforged.MasteryOfTheUnsee
 
     public MasteryOfTheUnseen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MayorOfAvabruck.java b/Mage.Sets/src/mage/sets/prereleaseevents/MayorOfAvabruck.java
index 4f91e1e36f..c547bcdc47 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MayorOfAvabruck.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MayorOfAvabruck.java
@@ -38,7 +38,7 @@ public class MayorOfAvabruck extends mage.sets.innistrad.MayorOfAvabruck {
 
     public MayorOfAvabruck(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MazesEnd.java b/Mage.Sets/src/mage/sets/prereleaseevents/MazesEnd.java
index 4c43cad5ab..466c2b5448 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MazesEnd.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MazesEnd.java
@@ -38,7 +38,7 @@ public class MazesEnd extends mage.sets.dragonsmaze.MazesEnd {
 
     public MazesEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MeganticSliver.java b/Mage.Sets/src/mage/sets/prereleaseevents/MeganticSliver.java
index a25a6f8fda..3d931bcca1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MeganticSliver.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MeganticSliver.java
@@ -38,7 +38,7 @@ public class MeganticSliver extends mage.sets.magic2014.MeganticSliver {
 
     public MeganticSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MercurialPretender.java b/Mage.Sets/src/mage/sets/prereleaseevents/MercurialPretender.java
index 0dbea82e80..6def780c0a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MercurialPretender.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MercurialPretender.java
@@ -38,7 +38,7 @@ public class MercurialPretender extends mage.sets.magic2015.MercurialPretender {
 
     public MercurialPretender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MizziumMeddler.java b/Mage.Sets/src/mage/sets/prereleaseevents/MizziumMeddler.java
index 102aea5b58..07e96d10d6 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MizziumMeddler.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MizziumMeddler.java
@@ -37,7 +37,7 @@ public class MizziumMeddler extends mage.sets.magicorigins.MizziumMeddler {
 
     public MizziumMeddler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MoonsilverSpear.java b/Mage.Sets/src/mage/sets/prereleaseevents/MoonsilverSpear.java
index adbbf28731..726132ffe8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MoonsilverSpear.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MoonsilverSpear.java
@@ -38,7 +38,7 @@ public class MoonsilverSpear extends mage.sets.avacynrestored.MoonsilverSpear {
 
     public MoonsilverSpear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MundaAmbushLeader.java b/Mage.Sets/src/mage/sets/prereleaseevents/MundaAmbushLeader.java
index dc6b4e2223..0b3d2b5102 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MundaAmbushLeader.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MundaAmbushLeader.java
@@ -37,7 +37,7 @@ public class MundaAmbushLeader extends mage.sets.battleforzendikar.MundaAmbushLe
 
     public MundaAmbushLeader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/MythRealized.java b/Mage.Sets/src/mage/sets/prereleaseevents/MythRealized.java
index d543563cf7..a617d46196 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/MythRealized.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/MythRealized.java
@@ -37,7 +37,7 @@ public class MythRealized extends mage.sets.dragonsoftarkir.MythRealized {
 
     public MythRealized(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NarsetEnlightenedMaster.java b/Mage.Sets/src/mage/sets/prereleaseevents/NarsetEnlightenedMaster.java
index 25bf081683..d35619506c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NarsetEnlightenedMaster.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NarsetEnlightenedMaster.java
@@ -38,7 +38,7 @@ public class NarsetEnlightenedMaster extends mage.sets.khansoftarkir.NarsetEnlig
 
     public NarsetEnlightenedMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NecromasterDragon.java b/Mage.Sets/src/mage/sets/prereleaseevents/NecromasterDragon.java
index ef96cb2aa5..3d73942e85 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NecromasterDragon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NecromasterDragon.java
@@ -37,7 +37,7 @@ public class NecromasterDragon extends mage.sets.dragonsoftarkir.NecromasterDrag
 
     public NecromasterDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NecropolisFiend.java b/Mage.Sets/src/mage/sets/prereleaseevents/NecropolisFiend.java
index 7bddb3fcbf..6271695dca 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NecropolisFiend.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NecropolisFiend.java
@@ -38,7 +38,7 @@ public class NecropolisFiend extends mage.sets.khansoftarkir.NecropolisFiend {
 
     public NecropolisFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NessianWildsRavager.java b/Mage.Sets/src/mage/sets/prereleaseevents/NessianWildsRavager.java
index b205a13d59..bc5af71034 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NessianWildsRavager.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NessianWildsRavager.java
@@ -38,7 +38,7 @@ public class NessianWildsRavager extends mage.sets.bornofthegods.NessianWildsRav
 
     public NessianWildsRavager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NissaVastwoodSeer.java b/Mage.Sets/src/mage/sets/prereleaseevents/NissaVastwoodSeer.java
index f05a811f0c..2c51f5d334 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NissaVastwoodSeer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NissaVastwoodSeer.java
@@ -37,7 +37,7 @@ public class NissaVastwoodSeer extends mage.sets.magicorigins.NissaVastwoodSeer
 
     public NissaVastwoodSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NissasRenewal.java b/Mage.Sets/src/mage/sets/prereleaseevents/NissasRenewal.java
index 0f057b0dcb..475457fd2d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NissasRenewal.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NissasRenewal.java
@@ -37,7 +37,7 @@ public class NissasRenewal extends mage.sets.battleforzendikar.NissasRenewal {
 
     public NissasRenewal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NissasRevelation.java b/Mage.Sets/src/mage/sets/prereleaseevents/NissasRevelation.java
index 39d51dbd51..a71cec8ec1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NissasRevelation.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NissasRevelation.java
@@ -37,7 +37,7 @@ public class NissasRevelation extends mage.sets.magicorigins.NissasRevelation {
 
     public NissasRevelation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/NoyanDarRoilShaper.java b/Mage.Sets/src/mage/sets/prereleaseevents/NoyanDarRoilShaper.java
index 5f318500ef..15e9e3006b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/NoyanDarRoilShaper.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/NoyanDarRoilShaper.java
@@ -37,7 +37,7 @@ public class NoyanDarRoilShaper extends mage.sets.battleforzendikar.NoyanDarRoil
 
     public NoyanDarRoilShaper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ObNixilisReignited.java b/Mage.Sets/src/mage/sets/prereleaseevents/ObNixilisReignited.java
index ab07067824..8bf535ac9d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ObNixilisReignited.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ObNixilisReignited.java
@@ -37,7 +37,7 @@ public class ObNixilisReignited extends mage.sets.battleforzendikar.ObNixilisRei
 
     public ObNixilisReignited(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OblivionSower.java b/Mage.Sets/src/mage/sets/prereleaseevents/OblivionSower.java
index 3d00fc2475..7ec45190c5 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OblivionSower.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OblivionSower.java
@@ -37,7 +37,7 @@ public class OblivionSower extends mage.sets.battleforzendikar.OblivionSower {
 
     public OblivionSower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OjutaiSoulOfWinter.java b/Mage.Sets/src/mage/sets/prereleaseevents/OjutaiSoulOfWinter.java
index 2893b8446f..0bdf91a3ca 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OjutaiSoulOfWinter.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OjutaiSoulOfWinter.java
@@ -37,7 +37,7 @@ public class OjutaiSoulOfWinter extends mage.sets.fatereforged.OjutaiSoulOfWinte
 
     public OjutaiSoulOfWinter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OjutaisCommand.java b/Mage.Sets/src/mage/sets/prereleaseevents/OjutaisCommand.java
index 190376ce32..4a2ebbc585 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OjutaisCommand.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OjutaisCommand.java
@@ -37,7 +37,7 @@ public class OjutaisCommand extends mage.sets.dragonsoftarkir.OjutaisCommand {
 
     public OjutaisCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OmnathLocusOfRage.java b/Mage.Sets/src/mage/sets/prereleaseevents/OmnathLocusOfRage.java
index 89e9da89c9..82e419be5c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OmnathLocusOfRage.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OmnathLocusOfRage.java
@@ -37,7 +37,7 @@ public class OmnathLocusOfRage extends mage.sets.battleforzendikar.OmnathLocusOf
 
     public OmnathLocusOfRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OranRiefHydra.java b/Mage.Sets/src/mage/sets/prereleaseevents/OranRiefHydra.java
index 8cfbd14a92..29789e0877 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OranRiefHydra.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OranRiefHydra.java
@@ -37,7 +37,7 @@ public class OranRiefHydra extends mage.sets.battleforzendikar.OranRiefHydra {
 
     public OranRiefHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OrosTheAvenger.java b/Mage.Sets/src/mage/sets/prereleaseevents/OrosTheAvenger.java
index c8cca69b96..0b44b1e4bb 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OrosTheAvenger.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OrosTheAvenger.java
@@ -38,7 +38,7 @@ public class OrosTheAvenger extends mage.sets.commander.OrosTheAvenger {
 
     public OrosTheAvenger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OutlandColossus.java b/Mage.Sets/src/mage/sets/prereleaseevents/OutlandColossus.java
index 0671feaa8a..5135a2fb8d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OutlandColossus.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OutlandColossus.java
@@ -37,7 +37,7 @@ public class OutlandColossus extends mage.sets.magicorigins.OutlandColossus {
 
     public OutlandColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/OverbeingOfMyth.java b/Mage.Sets/src/mage/sets/prereleaseevents/OverbeingOfMyth.java
index 05d85eba3a..ad9e9d6493 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/OverbeingOfMyth.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/OverbeingOfMyth.java
@@ -38,7 +38,7 @@ public class OverbeingOfMyth extends mage.sets.eventide.OverbeingOfMyth {
 
     public OverbeingOfMyth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Overtaker.java b/Mage.Sets/src/mage/sets/prereleaseevents/Overtaker.java
index 01ece0181e..5b74808398 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Overtaker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Overtaker.java
@@ -38,7 +38,7 @@ public class Overtaker extends mage.sets.mercadianmasques.Overtaker {
 
     public Overtaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PainfulTruths.java b/Mage.Sets/src/mage/sets/prereleaseevents/PainfulTruths.java
index 36814cfb6d..f0f3847340 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PainfulTruths.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PainfulTruths.java
@@ -37,7 +37,7 @@ public class PainfulTruths extends mage.sets.battleforzendikar.PainfulTruths {
 
     public PainfulTruths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PartTheWaterveil.java b/Mage.Sets/src/mage/sets/prereleaseevents/PartTheWaterveil.java
index c15e2e5155..0b07d01746 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PartTheWaterveil.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PartTheWaterveil.java
@@ -37,7 +37,7 @@ public class PartTheWaterveil extends mage.sets.battleforzendikar.PartTheWaterve
 
     public PartTheWaterveil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Phytotitan.java b/Mage.Sets/src/mage/sets/prereleaseevents/Phytotitan.java
index 9de7c22c97..952bcffb0b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Phytotitan.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Phytotitan.java
@@ -38,7 +38,7 @@ public class Phytotitan extends mage.sets.magic2015.Phytotitan {
 
     public Phytotitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/sets/prereleaseevents/PiaAndKiranNalaar.java
index ca8232ff49..b19cda06b3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PiaAndKiranNalaar.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PiaAndKiranNalaar.java
@@ -37,7 +37,7 @@ public class PiaAndKiranNalaar extends mage.sets.magicorigins.PiaAndKiranNalaar
 
     public PiaAndKiranNalaar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PitilessHorde.java b/Mage.Sets/src/mage/sets/prereleaseevents/PitilessHorde.java
index 578c193eeb..c467b2ed0a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PitilessHorde.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PitilessHorde.java
@@ -37,7 +37,7 @@ public class PitilessHorde extends mage.sets.dragonsoftarkir.PitilessHorde {
 
     public PitilessHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PlanarOutburst.java b/Mage.Sets/src/mage/sets/prereleaseevents/PlanarOutburst.java
index 8493688725..c3512014b1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PlanarOutburst.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PlanarOutburst.java
@@ -37,7 +37,7 @@ public class PlanarOutburst extends mage.sets.battleforzendikar.PlanarOutburst {
 
     public PlanarOutburst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PrairieStream.java b/Mage.Sets/src/mage/sets/prereleaseevents/PrairieStream.java
index 99504be02a..723bbcd99b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PrairieStream.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PrairieStream.java
@@ -37,7 +37,7 @@ public class PrairieStream extends mage.sets.battleforzendikar.PrairieStream {
 
     public PrairieStream(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PriestOfTheBloodRite.java b/Mage.Sets/src/mage/sets/prereleaseevents/PriestOfTheBloodRite.java
index f4a19fce0c..6613daafcd 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PriestOfTheBloodRite.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PriestOfTheBloodRite.java
@@ -37,7 +37,7 @@ public class PriestOfTheBloodRite extends mage.sets.magicorigins.PriestOfTheBloo
 
     public PriestOfTheBloodRite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PrismArray.java b/Mage.Sets/src/mage/sets/prereleaseevents/PrismArray.java
index 58c2853673..a781f5dbfc 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PrismArray.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PrismArray.java
@@ -37,7 +37,7 @@ public class PrismArray extends mage.sets.battleforzendikar.PrismArray {
 
     public PrismArray(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/PristineSkywise.java b/Mage.Sets/src/mage/sets/prereleaseevents/PristineSkywise.java
index 7eb2a7a048..590a7441fb 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/PristineSkywise.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/PristineSkywise.java
@@ -37,7 +37,7 @@ public class PristineSkywise extends mage.sets.dragonsoftarkir.PristineSkywise {
 
     public PristineSkywise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ProfanerOfTheDead.java b/Mage.Sets/src/mage/sets/prereleaseevents/ProfanerOfTheDead.java
index 457d2857bb..080053ec30 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ProfanerOfTheDead.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ProfanerOfTheDead.java
@@ -37,7 +37,7 @@ public class ProfanerOfTheDead extends mage.sets.dragonsoftarkir.ProfanerOfTheDe
 
     public ProfanerOfTheDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/QuarantineField.java b/Mage.Sets/src/mage/sets/prereleaseevents/QuarantineField.java
index af624428b1..7370292687 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/QuarantineField.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/QuarantineField.java
@@ -37,7 +37,7 @@ public class QuarantineField extends mage.sets.battleforzendikar.QuarantineField
 
     public QuarantineField(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 286;
+        this.cardNumber = "286";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RadiantFlames.java b/Mage.Sets/src/mage/sets/prereleaseevents/RadiantFlames.java
index efd3219d95..3b402af876 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RadiantFlames.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RadiantFlames.java
@@ -37,7 +37,7 @@ public class RadiantFlames extends mage.sets.battleforzendikar.RadiantFlames {
 
     public RadiantFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RagingKavu.java b/Mage.Sets/src/mage/sets/prereleaseevents/RagingKavu.java
index 41f48281f0..18d1303ac2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RagingKavu.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RagingKavu.java
@@ -38,7 +38,7 @@ public class RagingKavu extends mage.sets.invasion.RagingKavu {
 
     public RagingKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RakshasaVizier.java b/Mage.Sets/src/mage/sets/prereleaseevents/RakshasaVizier.java
index aff536d2fc..b55db43ee6 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RakshasaVizier.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RakshasaVizier.java
@@ -38,7 +38,7 @@ public class RakshasaVizier extends mage.sets.khansoftarkir.RakshasaVizier {
 
     public RakshasaVizier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RallyTheAncestors.java b/Mage.Sets/src/mage/sets/prereleaseevents/RallyTheAncestors.java
index b79b72220f..1e0d37fc5a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RallyTheAncestors.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RallyTheAncestors.java
@@ -37,7 +37,7 @@ public class RallyTheAncestors extends mage.sets.fatereforged.RallyTheAncestors
 
     public RallyTheAncestors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RampagingBaloths.java b/Mage.Sets/src/mage/sets/prereleaseevents/RampagingBaloths.java
index aad752e611..12a9b34b0c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RampagingBaloths.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RampagingBaloths.java
@@ -38,7 +38,7 @@ public class RampagingBaloths extends mage.sets.zendikar.RampagingBaloths {
 
     public RampagingBaloths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RathiAssassin.java b/Mage.Sets/src/mage/sets/prereleaseevents/RathiAssassin.java
index 923ce58938..3ee8b38989 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RathiAssassin.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RathiAssassin.java
@@ -38,7 +38,7 @@ public class RathiAssassin extends mage.sets.nemesis.RathiAssassin {
 
     public RathiAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RattleclawMystic.java b/Mage.Sets/src/mage/sets/prereleaseevents/RattleclawMystic.java
index baf52e44e6..0951f6af4e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RattleclawMystic.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RattleclawMystic.java
@@ -38,7 +38,7 @@ public class RattleclawMystic extends mage.sets.khansoftarkir.RattleclawMystic {
 
     public RattleclawMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java b/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java
index 2a8993b528..8506c0d52d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java
@@ -38,7 +38,7 @@ public class RavenousDemon extends mage.sets.darkascension.RavenousDemon {
 
     public RavenousDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RelicSeeker.java b/Mage.Sets/src/mage/sets/prereleaseevents/RelicSeeker.java
index 5919f322db..f4b223581b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RelicSeeker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RelicSeeker.java
@@ -37,7 +37,7 @@ public class RelicSeeker extends mage.sets.magicorigins.RelicSeeker {
 
     public RelicSeeker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ResoluteArchangel.java b/Mage.Sets/src/mage/sets/prereleaseevents/ResoluteArchangel.java
index 85989969b4..00e38cfa63 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ResoluteArchangel.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ResoluteArchangel.java
@@ -38,7 +38,7 @@ public class ResoluteArchangel extends mage.sets.magic2015.ResoluteArchangel {
 
     public ResoluteArchangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Revenant.java b/Mage.Sets/src/mage/sets/prereleaseevents/Revenant.java
index 9e961fb766..15623100a8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Revenant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Revenant.java
@@ -38,7 +38,7 @@ public class Revenant extends mage.sets.tempestremastered.Revenant {
 
     public Revenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Rubblehulk.java b/Mage.Sets/src/mage/sets/prereleaseevents/Rubblehulk.java
index 97a9b91cc4..8fe7e7a735 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Rubblehulk.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Rubblehulk.java
@@ -38,7 +38,7 @@ public class Rubblehulk extends mage.sets.gatecrash.Rubblehulk {
 
     public Rubblehulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RuinousPath.java b/Mage.Sets/src/mage/sets/prereleaseevents/RuinousPath.java
index 1fe45c98b3..a03f0a3a73 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RuinousPath.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RuinousPath.java
@@ -37,7 +37,7 @@ public class RuinousPath extends mage.sets.battleforzendikar.RuinousPath {
 
     public RuinousPath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/prereleaseevents/RyuseiTheFallingStar.java
index 930f9627d3..6f71f53f45 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/RyuseiTheFallingStar.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/RyuseiTheFallingStar.java
@@ -38,7 +38,7 @@ public class RyuseiTheFallingStar extends mage.sets.championsofkamigawa.RyuseiTh
 
     public RyuseiTheFallingStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SageOfTheInwardEye.java b/Mage.Sets/src/mage/sets/prereleaseevents/SageOfTheInwardEye.java
index b565ebf3a0..f73f59a5b1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SageOfTheInwardEye.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SageOfTheInwardEye.java
@@ -38,7 +38,7 @@ public class SageOfTheInwardEye extends mage.sets.khansoftarkir.SageOfTheInwardE
 
     public SageOfTheInwardEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SanctumOfUgin.java b/Mage.Sets/src/mage/sets/prereleaseevents/SanctumOfUgin.java
index 00aa9c0fbb..fbb1f2876a 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SanctumOfUgin.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SanctumOfUgin.java
@@ -37,7 +37,7 @@ public class SanctumOfUgin extends mage.sets.battleforzendikar.SanctumOfUgin {
 
     public SanctumOfUgin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SandsteppeMastodon.java b/Mage.Sets/src/mage/sets/prereleaseevents/SandsteppeMastodon.java
index a93d62cb3c..78ae28f948 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SandsteppeMastodon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SandsteppeMastodon.java
@@ -37,7 +37,7 @@ public class SandsteppeMastodon extends mage.sets.fatereforged.SandsteppeMastodo
 
     public SandsteppeMastodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ScabClanBerserker.java b/Mage.Sets/src/mage/sets/prereleaseevents/ScabClanBerserker.java
index cff2170723..3377f674c2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ScabClanBerserker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ScabClanBerserker.java
@@ -37,7 +37,7 @@ public class ScabClanBerserker extends mage.sets.magicorigins.ScabClanBerserker
 
     public ScabClanBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ScatterToTheWinds.java b/Mage.Sets/src/mage/sets/prereleaseevents/ScatterToTheWinds.java
index 31aa466229..92c2475c0c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ScatterToTheWinds.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ScatterToTheWinds.java
@@ -37,7 +37,7 @@ public class ScatterToTheWinds extends mage.sets.battleforzendikar.ScatterToTheW
 
     public ScatterToTheWinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ScourgeOfFleets.java b/Mage.Sets/src/mage/sets/prereleaseevents/ScourgeOfFleets.java
index 59d55f0760..f8b3a9557c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ScourgeOfFleets.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ScourgeOfFleets.java
@@ -38,7 +38,7 @@ public class ScourgeOfFleets extends mage.sets.journeyintonyx.ScourgeOfFleets {
 
     public ScourgeOfFleets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SerpentineSpike.java b/Mage.Sets/src/mage/sets/prereleaseevents/SerpentineSpike.java
index 6638574c6b..466889feb8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SerpentineSpike.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SerpentineSpike.java
@@ -37,7 +37,7 @@ public class SerpentineSpike extends mage.sets.battleforzendikar.SerpentineSpike
 
     public SerpentineSpike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShamanOfTheGreatHunt.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShamanOfTheGreatHunt.java
index 28a59d6e44..4624b65679 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShamanOfTheGreatHunt.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShamanOfTheGreatHunt.java
@@ -37,7 +37,7 @@ public class ShamanOfTheGreatHunt extends mage.sets.fatereforged.ShamanOfTheGrea
 
     public ShamanOfTheGreatHunt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShamanicRevelation.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShamanicRevelation.java
index e05ce93843..7ac275378d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShamanicRevelation.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShamanicRevelation.java
@@ -37,7 +37,7 @@ public class ShamanicRevelation extends mage.sets.fatereforged.ShamanicRevelatio
 
     public ShamanicRevelation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShamblingVent.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShamblingVent.java
index a23d9d27d2..6fec95b550 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShamblingVent.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShamblingVent.java
@@ -37,7 +37,7 @@ public class ShamblingVent extends mage.sets.battleforzendikar.ShamblingVent {
 
     public ShamblingVent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SheoldredWhisperingOne.java b/Mage.Sets/src/mage/sets/prereleaseevents/SheoldredWhisperingOne.java
index 7cea4bcaf8..67465089b2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SheoldredWhisperingOne.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SheoldredWhisperingOne.java
@@ -38,7 +38,7 @@ public class SheoldredWhisperingOne extends mage.sets.newphyrexia.SheoldredWhisp
 
     public SheoldredWhisperingOne(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShieldOfKaldra.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShieldOfKaldra.java
index 4a7731dd43..d02d21bfee 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShieldOfKaldra.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShieldOfKaldra.java
@@ -38,7 +38,7 @@ public class ShieldOfKaldra extends mage.sets.darksteel.ShieldOfKaldra {
 
     public ShieldOfKaldra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShipbreakerKraken.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShipbreakerKraken.java
index 3f065c12c3..a9dfb5dbdd 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShipbreakerKraken.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShipbreakerKraken.java
@@ -38,7 +38,7 @@ public class ShipbreakerKraken extends mage.sets.theros.ShipbreakerKraken {
 
     public ShipbreakerKraken(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShrineOfTheForsakenGods.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShrineOfTheForsakenGods.java
index ff2b9cd8a3..b453a306ad 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShrineOfTheForsakenGods.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShrineOfTheForsakenGods.java
@@ -37,7 +37,7 @@ public class ShrineOfTheForsakenGods extends mage.sets.battleforzendikar.ShrineO
 
     public ShrineOfTheForsakenGods(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ShuYunTheSilentTempest.java b/Mage.Sets/src/mage/sets/prereleaseevents/ShuYunTheSilentTempest.java
index 674cc2af95..25210cb6a3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ShuYunTheSilentTempest.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ShuYunTheSilentTempest.java
@@ -37,7 +37,7 @@ public class ShuYunTheSilentTempest extends mage.sets.fatereforged.ShuYunTheSile
 
     public ShuYunTheSilentTempest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SidisiBroodTyrant.java b/Mage.Sets/src/mage/sets/prereleaseevents/SidisiBroodTyrant.java
index d1b9205fa0..177d492182 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SidisiBroodTyrant.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SidisiBroodTyrant.java
@@ -38,7 +38,7 @@ public class SidisiBroodTyrant extends mage.sets.khansoftarkir.SidisiBroodTyrant
 
     public SidisiBroodTyrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SidisiUndeadVizier.java b/Mage.Sets/src/mage/sets/prereleaseevents/SidisiUndeadVizier.java
index 81f35f5d4b..e76bc48c31 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SidisiUndeadVizier.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SidisiUndeadVizier.java
@@ -37,7 +37,7 @@ public class SidisiUndeadVizier extends mage.sets.dragonsoftarkir.SidisiUndeadVi
 
     public SidisiUndeadVizier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SiegeDragon.java b/Mage.Sets/src/mage/sets/prereleaseevents/SiegeDragon.java
index 695c906d60..224bd87dde 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SiegeDragon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SiegeDragon.java
@@ -38,7 +38,7 @@ public class SiegeDragon extends mage.sets.magic2015.SiegeDragon {
 
     public SiegeDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SiegeRhino.java b/Mage.Sets/src/mage/sets/prereleaseevents/SiegeRhino.java
index 5161ddf9d9..6312b3ea34 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SiegeRhino.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SiegeRhino.java
@@ -38,7 +38,7 @@ public class SiegeRhino extends mage.sets.khansoftarkir.SiegeRhino {
 
     public SiegeRhino(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SilentSentinel.java b/Mage.Sets/src/mage/sets/prereleaseevents/SilentSentinel.java
index a113e4b4f8..1a8013d5f8 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SilentSentinel.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SilentSentinel.java
@@ -38,7 +38,7 @@ public class SilentSentinel extends mage.sets.bornofthegods.SilentSentinel {
 
     public SilentSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SilentSpecter.java b/Mage.Sets/src/mage/sets/prereleaseevents/SilentSpecter.java
index c6d7550aa9..757c57e65f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SilentSpecter.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SilentSpecter.java
@@ -38,7 +38,7 @@ public class SilentSpecter extends mage.sets.onslaught.SilentSpecter {
 
     public SilentSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarAssassin.java b/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarAssassin.java
index 24b24c287d..bddada6dbe 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarAssassin.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarAssassin.java
@@ -37,7 +37,7 @@ public class SilumgarAssassin extends mage.sets.dragonsoftarkir.SilumgarAssassin
 
     public SilumgarAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarTheDriftingDeath.java b/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarTheDriftingDeath.java
index 2365124e27..96f462177b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarTheDriftingDeath.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarTheDriftingDeath.java
@@ -37,7 +37,7 @@ public class SilumgarTheDriftingDeath extends mage.sets.fatereforged.SilumgarThe
 
     public SilumgarTheDriftingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarsCommand.java b/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarsCommand.java
index 5736841ccb..baa79fdc91 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarsCommand.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SilumgarsCommand.java
@@ -37,7 +37,7 @@ public class SilumgarsCommand extends mage.sets.dragonsoftarkir.SilumgarsCommand
 
     public SilumgarsCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SireOfStagnation.java b/Mage.Sets/src/mage/sets/prereleaseevents/SireOfStagnation.java
index 0dd3430438..431cca4e1d 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SireOfStagnation.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SireOfStagnation.java
@@ -37,7 +37,7 @@ public class SireOfStagnation extends mage.sets.battleforzendikar.SireOfStagnati
 
     public SireOfStagnation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SmolderingMarsh.java b/Mage.Sets/src/mage/sets/prereleaseevents/SmolderingMarsh.java
index 55f0d6a0a1..85ec756ce2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SmolderingMarsh.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SmolderingMarsh.java
@@ -37,7 +37,7 @@ public class SmolderingMarsh extends mage.sets.battleforzendikar.SmolderingMarsh
 
     public SmolderingMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SmotheringAbomination.java b/Mage.Sets/src/mage/sets/prereleaseevents/SmotheringAbomination.java
index 53f5427bc1..4f72e4ec73 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SmotheringAbomination.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SmotheringAbomination.java
@@ -37,7 +37,7 @@ public class SmotheringAbomination extends mage.sets.battleforzendikar.Smotherin
 
     public SmotheringAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SoulCollector.java b/Mage.Sets/src/mage/sets/prereleaseevents/SoulCollector.java
index cb947e8fed..98661c4364 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SoulCollector.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SoulCollector.java
@@ -37,7 +37,7 @@ public class SoulCollector extends mage.sets.timeshifted.SoulCollector {
 
     public SoulCollector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SoulbladeDjinn.java b/Mage.Sets/src/mage/sets/prereleaseevents/SoulbladeDjinn.java
index 99cb386b55..1a743413fe 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SoulbladeDjinn.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SoulbladeDjinn.java
@@ -37,7 +37,7 @@ public class SoulbladeDjinn extends mage.sets.magicorigins.SoulbladeDjinn {
 
     public SoulbladeDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SoulfireGrandMaster.java b/Mage.Sets/src/mage/sets/prereleaseevents/SoulfireGrandMaster.java
index 44de6b1bf5..f6529a5aa0 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SoulfireGrandMaster.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SoulfireGrandMaster.java
@@ -37,7 +37,7 @@ public class SoulfireGrandMaster extends mage.sets.fatereforged.SoulfireGrandMas
 
     public SoulfireGrandMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Soulflayer.java b/Mage.Sets/src/mage/sets/prereleaseevents/Soulflayer.java
index a735672029..7f7689f387 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Soulflayer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Soulflayer.java
@@ -37,7 +37,7 @@ public class Soulflayer extends mage.sets.fatereforged.Soulflayer {
 
     public Soulflayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SpawnOfThraxes.java b/Mage.Sets/src/mage/sets/prereleaseevents/SpawnOfThraxes.java
index a477521d33..5585e2a249 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SpawnOfThraxes.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SpawnOfThraxes.java
@@ -38,7 +38,7 @@ public class SpawnOfThraxes extends mage.sets.journeyintonyx.SpawnOfThraxes {
 
     public SpawnOfThraxes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/StratusDancer.java b/Mage.Sets/src/mage/sets/prereleaseevents/StratusDancer.java
index 8e3ad4d814..62809eaa91 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/StratusDancer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/StratusDancer.java
@@ -37,7 +37,7 @@ public class StratusDancer extends mage.sets.dragonsoftarkir.StratusDancer {
 
     public StratusDancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SultaiAscendancy.java b/Mage.Sets/src/mage/sets/prereleaseevents/SultaiAscendancy.java
index 5499ee0d18..eb6267fdbf 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SultaiAscendancy.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SultaiAscendancy.java
@@ -38,7 +38,7 @@ public class SultaiAscendancy extends mage.sets.khansoftarkir.SultaiAscendancy {
 
     public SultaiAscendancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SunTitan.java b/Mage.Sets/src/mage/sets/prereleaseevents/SunTitan.java
index 8ba782b3c2..e3404f42c3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SunTitan.java
@@ -38,7 +38,7 @@ public class SunTitan extends mage.sets.magic2011.SunTitan {
 
     public SunTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SunkenHollow.java b/Mage.Sets/src/mage/sets/prereleaseevents/SunkenHollow.java
index e8c0f2c9be..c716678a79 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SunkenHollow.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SunkenHollow.java
@@ -37,7 +37,7 @@ public class SunkenHollow extends mage.sets.battleforzendikar.SunkenHollow {
 
     public SunkenHollow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SunscorchRegent.java b/Mage.Sets/src/mage/sets/prereleaseevents/SunscorchRegent.java
index d048d93fe8..fd03e51818 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SunscorchRegent.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SunscorchRegent.java
@@ -37,7 +37,7 @@ public class SunscorchRegent extends mage.sets.dragonsoftarkir.SunscorchRegent {
 
     public SunscorchRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SupplantForm.java b/Mage.Sets/src/mage/sets/prereleaseevents/SupplantForm.java
index 918fef1736..0dd46c7f33 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SupplantForm.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SupplantForm.java
@@ -37,7 +37,7 @@ public class SupplantForm extends mage.sets.fatereforged.SupplantForm {
 
     public SupplantForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SurrakDragonclaw.java b/Mage.Sets/src/mage/sets/prereleaseevents/SurrakDragonclaw.java
index f4beffdf77..a100ef3f1e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SurrakDragonclaw.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SurrakDragonclaw.java
@@ -38,7 +38,7 @@ public class SurrakDragonclaw extends mage.sets.khansoftarkir.SurrakDragonclaw {
 
     public SurrakDragonclaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SurrakTheHuntCaller.java b/Mage.Sets/src/mage/sets/prereleaseevents/SurrakTheHuntCaller.java
index c4689f520d..084ae58164 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SurrakTheHuntCaller.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SurrakTheHuntCaller.java
@@ -37,7 +37,7 @@ public class SurrakTheHuntCaller extends mage.sets.dragonsoftarkir.SurrakTheHunt
 
     public SurrakTheHuntCaller(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/SwordOfKaldra.java b/Mage.Sets/src/mage/sets/prereleaseevents/SwordOfKaldra.java
index d78df20753..2eeaa94618 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/SwordOfKaldra.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/SwordOfKaldra.java
@@ -38,7 +38,7 @@ public class SwordOfKaldra extends mage.sets.mirrodin.SwordOfKaldra {
 
     public SwordOfKaldra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TalentOfTheTelepath.java b/Mage.Sets/src/mage/sets/prereleaseevents/TalentOfTheTelepath.java
index a7a6cb9612..6f17aaeaba 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TalentOfTheTelepath.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TalentOfTheTelepath.java
@@ -37,7 +37,7 @@ public class TalentOfTheTelepath extends mage.sets.magicorigins.TalentOfTheTelep
 
     public TalentOfTheTelepath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TasigurTheGoldenFang.java b/Mage.Sets/src/mage/sets/prereleaseevents/TasigurTheGoldenFang.java
index 92c270f264..00a8aa85b1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TasigurTheGoldenFang.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TasigurTheGoldenFang.java
@@ -37,7 +37,7 @@ public class TasigurTheGoldenFang extends mage.sets.fatereforged.TasigurTheGolde
 
     public TasigurTheGoldenFang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TemurAscendancy.java b/Mage.Sets/src/mage/sets/prereleaseevents/TemurAscendancy.java
index 3d0ea71a37..0942fa3ee7 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TemurAscendancy.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TemurAscendancy.java
@@ -38,7 +38,7 @@ public class TemurAscendancy extends mage.sets.khansoftarkir.TemurAscendancy {
 
     public TemurAscendancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ThopterSpyNetwork.java b/Mage.Sets/src/mage/sets/prereleaseevents/ThopterSpyNetwork.java
index 29fff7ff73..39aa34f449 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ThopterSpyNetwork.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ThopterSpyNetwork.java
@@ -37,7 +37,7 @@ public class ThopterSpyNetwork extends mage.sets.magicorigins.ThopterSpyNetwork
 
     public ThopterSpyNetwork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ThousandWinds.java b/Mage.Sets/src/mage/sets/prereleaseevents/ThousandWinds.java
index 6aefc4cf91..63b791fad3 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ThousandWinds.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ThousandWinds.java
@@ -38,7 +38,7 @@ public class ThousandWinds extends mage.sets.khansoftarkir.ThousandWinds {
 
     public ThousandWinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ThunderbreakRegent.java b/Mage.Sets/src/mage/sets/prereleaseevents/ThunderbreakRegent.java
index fffcdfdbf7..4f35fbb040 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ThunderbreakRegent.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ThunderbreakRegent.java
@@ -37,7 +37,7 @@ public class ThunderbreakRegent extends mage.sets.gameday.ThunderbreakRegent {
 
     public ThunderbreakRegent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TorrentElemental.java b/Mage.Sets/src/mage/sets/prereleaseevents/TorrentElemental.java
index ddf7b05b01..be43d5a993 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TorrentElemental.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TorrentElemental.java
@@ -37,7 +37,7 @@ public class TorrentElemental extends mage.sets.fatereforged.TorrentElemental {
 
     public TorrentElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TragicArrogance.java b/Mage.Sets/src/mage/sets/prereleaseevents/TragicArrogance.java
index 6b7ea81d99..17fa48a1d2 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TragicArrogance.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TragicArrogance.java
@@ -37,7 +37,7 @@ public class TragicArrogance extends mage.sets.magicorigins.TragicArrogance {
 
     public TragicArrogance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TrailOfMystery.java b/Mage.Sets/src/mage/sets/prereleaseevents/TrailOfMystery.java
index b3d0a6853e..e35e7c3152 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TrailOfMystery.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TrailOfMystery.java
@@ -38,7 +38,7 @@ public class TrailOfMystery extends mage.sets.khansoftarkir.TrailOfMystery {
 
     public TrailOfMystery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TrapEssence.java b/Mage.Sets/src/mage/sets/prereleaseevents/TrapEssence.java
index 2e4b0af729..2bcb70dfad 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TrapEssence.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TrapEssence.java
@@ -38,7 +38,7 @@ public class TrapEssence extends mage.sets.khansoftarkir.TrapEssence {
 
     public TrapEssence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/TreasuryThrull.java b/Mage.Sets/src/mage/sets/prereleaseevents/TreasuryThrull.java
index 38101405bb..9c1525a773 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/TreasuryThrull.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/TreasuryThrull.java
@@ -38,7 +38,7 @@ public class TreasuryThrull extends mage.sets.gatecrash.TreasuryThrull {
 
     public TreasuryThrull(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/UginsInsight.java b/Mage.Sets/src/mage/sets/prereleaseevents/UginsInsight.java
index 814aac6fa9..fa056e277c 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/UginsInsight.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/UginsInsight.java
@@ -37,7 +37,7 @@ public class UginsInsight extends mage.sets.battleforzendikar.UginsInsight {
 
     public UginsInsight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/UlamogTheCeaselessHunger.java b/Mage.Sets/src/mage/sets/prereleaseevents/UlamogTheCeaselessHunger.java
index 77bc9fbb5b..a37c02ba3e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/UlamogTheCeaselessHunger.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/UlamogTheCeaselessHunger.java
@@ -37,7 +37,7 @@ public class UlamogTheCeaselessHunger extends mage.sets.battleforzendikar.Ulamog
 
     public UlamogTheCeaselessHunger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/UndergrowthChampion.java b/Mage.Sets/src/mage/sets/prereleaseevents/UndergrowthChampion.java
index c75e7d54da..913165909f 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/UndergrowthChampion.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/UndergrowthChampion.java
@@ -37,7 +37,7 @@ public class UndergrowthChampion extends mage.sets.battleforzendikar.Undergrowth
 
     public UndergrowthChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/UtterEnd.java b/Mage.Sets/src/mage/sets/prereleaseevents/UtterEnd.java
index ba62998c0a..79aed8bf15 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/UtterEnd.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/UtterEnd.java
@@ -38,7 +38,7 @@ public class UtterEnd extends mage.sets.khansoftarkir.UtterEnd {
 
     public UtterEnd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/VampireNocturnus.java b/Mage.Sets/src/mage/sets/prereleaseevents/VampireNocturnus.java
index bf71dfc560..d5c1496fff 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/VampireNocturnus.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/VampireNocturnus.java
@@ -38,7 +38,7 @@ public class VampireNocturnus extends mage.sets.magic2010.VampireNocturnus {
 
     public VampireNocturnus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/VeteranWarleader.java b/Mage.Sets/src/mage/sets/prereleaseevents/VeteranWarleader.java
index 01f63b8197..ecaa46daa6 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/VeteranWarleader.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/VeteranWarleader.java
@@ -37,7 +37,7 @@ public class VeteranWarleader extends mage.sets.zendikarvseldrazi.VeteranWarlead
 
     public VeteranWarleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/VillainousWealth.java b/Mage.Sets/src/mage/sets/prereleaseevents/VillainousWealth.java
index af28b6b0be..e1eff70a4e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/VillainousWealth.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/VillainousWealth.java
@@ -38,7 +38,7 @@ public class VillainousWealth extends mage.sets.khansoftarkir.VillainousWealth {
 
     public VillainousWealth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/VoidWinnower.java b/Mage.Sets/src/mage/sets/prereleaseevents/VoidWinnower.java
index d4b81bbd1f..ad7c9799fa 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/VoidWinnower.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/VoidWinnower.java
@@ -37,7 +37,7 @@ public class VoidWinnower extends mage.sets.battleforzendikar.VoidWinnower {
 
     public VoidWinnower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/VolcanicVision.java b/Mage.Sets/src/mage/sets/prereleaseevents/VolcanicVision.java
index 2561476ef7..3827ae7a18 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/VolcanicVision.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/VolcanicVision.java
@@ -37,7 +37,7 @@ public class VolcanicVision extends mage.sets.dragonsoftarkir.VolcanicVision {
 
     public VolcanicVision(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/VrynWingmare.java b/Mage.Sets/src/mage/sets/prereleaseevents/VrynWingmare.java
index eac42f0f93..3878dd49e1 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/VrynWingmare.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/VrynWingmare.java
@@ -37,7 +37,7 @@ public class VrynWingmare extends mage.sets.magicorigins.VrynWingmare {
 
     public VrynWingmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/WardenOfTheFirstTree.java b/Mage.Sets/src/mage/sets/prereleaseevents/WardenOfTheFirstTree.java
index 26f9e5d672..080d8006b9 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/WardenOfTheFirstTree.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/WardenOfTheFirstTree.java
@@ -37,7 +37,7 @@ public class WardenOfTheFirstTree extends mage.sets.fatereforged.WardenOfTheFirs
 
     public WardenOfTheFirstTree(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/WastelandStrangler.java b/Mage.Sets/src/mage/sets/prereleaseevents/WastelandStrangler.java
index f67c6a651d..7558956c29 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/WastelandStrangler.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/WastelandStrangler.java
@@ -37,7 +37,7 @@ public class WastelandStrangler extends mage.sets.battleforzendikar.WastelandStr
 
     public WastelandStrangler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Wildcall.java b/Mage.Sets/src/mage/sets/prereleaseevents/Wildcall.java
index 2131a45d8a..3c3313f843 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Wildcall.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Wildcall.java
@@ -37,7 +37,7 @@ public class Wildcall extends mage.sets.fatereforged.Wildcall {
 
     public Wildcall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Willbreaker.java b/Mage.Sets/src/mage/sets/prereleaseevents/Willbreaker.java
index 3b8231afcc..8d28970470 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/Willbreaker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/Willbreaker.java
@@ -37,7 +37,7 @@ public class Willbreaker extends mage.sets.magicorigins.Willbreaker {
 
     public Willbreaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/WoodlandWanderer.java b/Mage.Sets/src/mage/sets/prereleaseevents/WoodlandWanderer.java
index 25588e7604..d48a7da73b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/WoodlandWanderer.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/WoodlandWanderer.java
@@ -37,7 +37,7 @@ public class WoodlandWanderer extends mage.sets.battleforzendikar.WoodlandWander
 
     public WoodlandWanderer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/WrensRunPackmaster.java b/Mage.Sets/src/mage/sets/prereleaseevents/WrensRunPackmaster.java
index 4e4aa19eef..f035fbe2fa 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/WrensRunPackmaster.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/WrensRunPackmaster.java
@@ -38,7 +38,7 @@ public class WrensRunPackmaster extends mage.sets.lorwyn.WrensRunPackmaster {
 
     public WrensRunPackmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/WurmcoilEngine.java b/Mage.Sets/src/mage/sets/prereleaseevents/WurmcoilEngine.java
index 6e0b24355d..6e626aad83 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/WurmcoilEngine.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/WurmcoilEngine.java
@@ -38,7 +38,7 @@ public class WurmcoilEngine extends mage.sets.scarsofmirrodin.WurmcoilEngine {
 
     public WurmcoilEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/XathridGorgon.java b/Mage.Sets/src/mage/sets/prereleaseevents/XathridGorgon.java
index 2719a16993..85978290a7 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/XathridGorgon.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/XathridGorgon.java
@@ -38,7 +38,7 @@ public class XathridGorgon extends mage.sets.magic2013.XathridGorgon {
 
     public XathridGorgon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/YasovaDragonclaw.java b/Mage.Sets/src/mage/sets/prereleaseevents/YasovaDragonclaw.java
index afba308336..c5bb567edf 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/YasovaDragonclaw.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/YasovaDragonclaw.java
@@ -37,7 +37,7 @@ public class YasovaDragonclaw extends mage.sets.fatereforged.YasovaDragonclaw {
 
     public YasovaDragonclaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ZadaHedronGrinder.java b/Mage.Sets/src/mage/sets/prereleaseevents/ZadaHedronGrinder.java
index 8871b029ca..c1f9b6439b 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ZadaHedronGrinder.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ZadaHedronGrinder.java
@@ -37,7 +37,7 @@ public class ZadaHedronGrinder extends mage.sets.battleforzendikar.ZadaHedronGri
 
     public ZadaHedronGrinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoBellstriker.java b/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoBellstriker.java
index d1c6067518..e2d21e5fc4 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoBellstriker.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoBellstriker.java
@@ -37,7 +37,7 @@ public class ZurgoBellstriker extends mage.sets.dragonsoftarkir.ZurgoBellstriker
 
     public ZurgoBellstriker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "PTC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoHelmsmasher.java
index 8154bbb64d..c97e05a63e 100644
--- a/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoHelmsmasher.java
+++ b/Mage.Sets/src/mage/sets/prereleaseevents/ZurgoHelmsmasher.java
@@ -38,7 +38,7 @@ public class ZurgoHelmsmasher extends mage.sets.khansoftarkir.ZurgoHelmsmasher {
 
     public ZurgoHelmsmasher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "PTC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/prophecy/AvatarOfWoe.java b/Mage.Sets/src/mage/sets/prophecy/AvatarOfWoe.java
index a32a243bbe..7e13851a5a 100644
--- a/Mage.Sets/src/mage/sets/prophecy/AvatarOfWoe.java
+++ b/Mage.Sets/src/mage/sets/prophecy/AvatarOfWoe.java
@@ -37,7 +37,7 @@ public class AvatarOfWoe extends mage.sets.archenemy.AvatarOfWoe {
 
     public AvatarOfWoe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "PCY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prophecy/DivingGriffin.java b/Mage.Sets/src/mage/sets/prophecy/DivingGriffin.java
index bd05eaf00c..ffdb735e9b 100644
--- a/Mage.Sets/src/mage/sets/prophecy/DivingGriffin.java
+++ b/Mage.Sets/src/mage/sets/prophecy/DivingGriffin.java
@@ -37,7 +37,7 @@ public class DivingGriffin extends mage.sets.eighthedition.DivingGriffin {
 
     public DivingGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "PCY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prophecy/PanicAttack.java b/Mage.Sets/src/mage/sets/prophecy/PanicAttack.java
index 6bcde50593..7a66ed4f50 100644
--- a/Mage.Sets/src/mage/sets/prophecy/PanicAttack.java
+++ b/Mage.Sets/src/mage/sets/prophecy/PanicAttack.java
@@ -37,7 +37,7 @@ public class PanicAttack extends mage.sets.magic2010.PanicAttack {
 
     public PanicAttack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "PCY";
     }
 
diff --git a/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java b/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java
index dbd2e1fbaa..e74f7a7d48 100644
--- a/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java
+++ b/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java
@@ -38,7 +38,7 @@ public class SpiketailHatchling extends mage.sets.tenthedition.SpiketailHatchlin
 
     public SpiketailHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "PCY";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/ravnica/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/ravnica/BirdsOfParadise.java
index 51154a92c8..a4d8a8bf3a 100644
--- a/Mage.Sets/src/mage/sets/ravnica/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/ravnica/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/BorosGarrison.java b/Mage.Sets/src/mage/sets/ravnica/BorosGarrison.java
index c721cbc492..2316cdb42d 100644
--- a/Mage.Sets/src/mage/sets/ravnica/BorosGarrison.java
+++ b/Mage.Sets/src/mage/sets/ravnica/BorosGarrison.java
@@ -37,7 +37,7 @@ public class BorosGarrison extends mage.sets.planechase.BorosGarrison {
 
     public BorosGarrison(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/BorosSwiftblade.java b/Mage.Sets/src/mage/sets/ravnica/BorosSwiftblade.java
index 48aced6a8c..1af2c59748 100644
--- a/Mage.Sets/src/mage/sets/ravnica/BorosSwiftblade.java
+++ b/Mage.Sets/src/mage/sets/ravnica/BorosSwiftblade.java
@@ -37,7 +37,7 @@ public class BorosSwiftblade extends mage.sets.planechase.BorosSwiftblade {
 
     public BorosSwiftblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/ChorusOfTheConclave.java b/Mage.Sets/src/mage/sets/ravnica/ChorusOfTheConclave.java
index f5e3437b08..ac672fd300 100644
--- a/Mage.Sets/src/mage/sets/ravnica/ChorusOfTheConclave.java
+++ b/Mage.Sets/src/mage/sets/ravnica/ChorusOfTheConclave.java
@@ -38,7 +38,7 @@ public class ChorusOfTheConclave extends mage.sets.commander.ChorusOfTheConclave
 
     public ChorusOfTheConclave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/CivicWayfinder.java b/Mage.Sets/src/mage/sets/ravnica/CivicWayfinder.java
index 5b1153954a..5a30c6964c 100644
--- a/Mage.Sets/src/mage/sets/ravnica/CivicWayfinder.java
+++ b/Mage.Sets/src/mage/sets/ravnica/CivicWayfinder.java
@@ -37,7 +37,7 @@ public class CivicWayfinder extends mage.sets.tenthedition.CivicWayfinder {
 
     public CivicWayfinder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/ConclaveEquenaut.java b/Mage.Sets/src/mage/sets/ravnica/ConclaveEquenaut.java
index d29cda1587..8b177926a0 100644
--- a/Mage.Sets/src/mage/sets/ravnica/ConclaveEquenaut.java
+++ b/Mage.Sets/src/mage/sets/ravnica/ConclaveEquenaut.java
@@ -37,7 +37,7 @@ public class ConclaveEquenaut extends mage.sets.elspethvstezzeret.ConclaveEquena
 
     public ConclaveEquenaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/ConclavePhalanx.java b/Mage.Sets/src/mage/sets/ravnica/ConclavePhalanx.java
index b0195c9073..e7eac75f57 100644
--- a/Mage.Sets/src/mage/sets/ravnica/ConclavePhalanx.java
+++ b/Mage.Sets/src/mage/sets/ravnica/ConclavePhalanx.java
@@ -37,7 +37,7 @@ public class ConclavePhalanx extends mage.sets.elspethvstezzeret.ConclavePhalanx
 
     public ConclavePhalanx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/DoublingSeason.java b/Mage.Sets/src/mage/sets/ravnica/DoublingSeason.java
index f52539f852..4e0e5b0ed5 100644
--- a/Mage.Sets/src/mage/sets/ravnica/DoublingSeason.java
+++ b/Mage.Sets/src/mage/sets/ravnica/DoublingSeason.java
@@ -37,7 +37,7 @@ public class DoublingSeason extends mage.sets.modernmasters.DoublingSeason {
 
     public DoublingSeason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/DroolingGroodion.java b/Mage.Sets/src/mage/sets/ravnica/DroolingGroodion.java
index 2821977e10..ab69b33322 100644
--- a/Mage.Sets/src/mage/sets/ravnica/DroolingGroodion.java
+++ b/Mage.Sets/src/mage/sets/ravnica/DroolingGroodion.java
@@ -37,7 +37,7 @@ public class DroolingGroodion extends mage.sets.jacevsvraska.DroolingGroodion {
 
     public DroolingGroodion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/FaithsFetters.java b/Mage.Sets/src/mage/sets/ravnica/FaithsFetters.java
index 6d70b7db71..1e4b87ce91 100644
--- a/Mage.Sets/src/mage/sets/ravnica/FaithsFetters.java
+++ b/Mage.Sets/src/mage/sets/ravnica/FaithsFetters.java
@@ -37,7 +37,7 @@ public class FaithsFetters extends mage.sets.divinevsdemonic.FaithsFetters {
 
     public FaithsFetters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/Flickerform.java b/Mage.Sets/src/mage/sets/ravnica/Flickerform.java
index cb66daa89b..c8031a9442 100644
--- a/Mage.Sets/src/mage/sets/ravnica/Flickerform.java
+++ b/Mage.Sets/src/mage/sets/ravnica/Flickerform.java
@@ -37,7 +37,7 @@ public class Flickerform extends mage.sets.commander2013.Flickerform {
 
     public Flickerform(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/FlowOfIdeas.java b/Mage.Sets/src/mage/sets/ravnica/FlowOfIdeas.java
index 24c1c29395..fa5f5804af 100644
--- a/Mage.Sets/src/mage/sets/ravnica/FlowOfIdeas.java
+++ b/Mage.Sets/src/mage/sets/ravnica/FlowOfIdeas.java
@@ -37,7 +37,7 @@ public class FlowOfIdeas extends mage.sets.shadowmoor.FlowOfIdeas {
 
     public FlowOfIdeas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/Gleancrawler.java b/Mage.Sets/src/mage/sets/ravnica/Gleancrawler.java
index 15578bc2d3..18f6bc8f7f 100644
--- a/Mage.Sets/src/mage/sets/ravnica/Gleancrawler.java
+++ b/Mage.Sets/src/mage/sets/ravnica/Gleancrawler.java
@@ -38,7 +38,7 @@ public class Gleancrawler extends mage.sets.prereleaseevents.Gleancrawler {
 
     public Gleancrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "RAV";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/ravnica/Helldozer.java b/Mage.Sets/src/mage/sets/ravnica/Helldozer.java
index e09119f5bd..618a463bad 100644
--- a/Mage.Sets/src/mage/sets/ravnica/Helldozer.java
+++ b/Mage.Sets/src/mage/sets/ravnica/Helldozer.java
@@ -37,7 +37,7 @@ public class Helldozer extends mage.sets.planechase.Helldozer {
 
     public Helldozer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/PeelFromReality.java b/Mage.Sets/src/mage/sets/ravnica/PeelFromReality.java
index dedd057031..91eefb6e7c 100644
--- a/Mage.Sets/src/mage/sets/ravnica/PeelFromReality.java
+++ b/Mage.Sets/src/mage/sets/ravnica/PeelFromReality.java
@@ -37,7 +37,7 @@ public class PeelFromReality extends mage.sets.avacynrestored.PeelFromReality {
 
     public PeelFromReality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/PlagueBoiler.java b/Mage.Sets/src/mage/sets/ravnica/PlagueBoiler.java
index 171e38355f..7190668a2b 100644
--- a/Mage.Sets/src/mage/sets/ravnica/PlagueBoiler.java
+++ b/Mage.Sets/src/mage/sets/ravnica/PlagueBoiler.java
@@ -37,7 +37,7 @@ public class PlagueBoiler extends mage.sets.commander2013.PlagueBoiler {
 
     public PlagueBoiler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/PollenbrightWings.java b/Mage.Sets/src/mage/sets/ravnica/PollenbrightWings.java
index cda16719af..82b4cf8d32 100644
--- a/Mage.Sets/src/mage/sets/ravnica/PollenbrightWings.java
+++ b/Mage.Sets/src/mage/sets/ravnica/PollenbrightWings.java
@@ -37,7 +37,7 @@ public class PollenbrightWings extends mage.sets.planechase2012.PollenbrightWing
 
     public PollenbrightWings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/RaziaBorosArchangel.java b/Mage.Sets/src/mage/sets/ravnica/RaziaBorosArchangel.java
index 37416aa9b8..e38acf9130 100644
--- a/Mage.Sets/src/mage/sets/ravnica/RaziaBorosArchangel.java
+++ b/Mage.Sets/src/mage/sets/ravnica/RaziaBorosArchangel.java
@@ -37,7 +37,7 @@ public class RaziaBorosArchangel extends mage.sets.planechase.RaziaBorosArchange
 
     public RaziaBorosArchangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/Recollect.java b/Mage.Sets/src/mage/sets/ravnica/Recollect.java
index 8defbf4c0f..8c6ccbf971 100644
--- a/Mage.Sets/src/mage/sets/ravnica/Recollect.java
+++ b/Mage.Sets/src/mage/sets/ravnica/Recollect.java
@@ -37,7 +37,7 @@ public class Recollect extends mage.sets.tenthedition.Recollect {
 
     public Recollect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/SadisticAugermage.java b/Mage.Sets/src/mage/sets/ravnica/SadisticAugermage.java
index 47cae249a1..dca47cac16 100644
--- a/Mage.Sets/src/mage/sets/ravnica/SadisticAugermage.java
+++ b/Mage.Sets/src/mage/sets/ravnica/SadisticAugermage.java
@@ -37,7 +37,7 @@ public class SadisticAugermage extends mage.sets.jacevsvraska.SadisticAugermage
 
     public SadisticAugermage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/ScionOfTheWild.java b/Mage.Sets/src/mage/sets/ravnica/ScionOfTheWild.java
index 53a9d85c02..fe31a663d5 100644
--- a/Mage.Sets/src/mage/sets/ravnica/ScionOfTheWild.java
+++ b/Mage.Sets/src/mage/sets/ravnica/ScionOfTheWild.java
@@ -37,7 +37,7 @@ public class ScionOfTheWild extends mage.sets.tenthedition.ScionOfTheWild {
 
     public ScionOfTheWild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/Smash.java b/Mage.Sets/src/mage/sets/ravnica/Smash.java
index 1896469712..1716b2fbc1 100644
--- a/Mage.Sets/src/mage/sets/ravnica/Smash.java
+++ b/Mage.Sets/src/mage/sets/ravnica/Smash.java
@@ -37,7 +37,7 @@ public class Smash extends mage.sets.apocalypse.Smash {
 
     public Smash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/SparkmageApprentice.java b/Mage.Sets/src/mage/sets/ravnica/SparkmageApprentice.java
index 778a116f33..d66c8d9161 100644
--- a/Mage.Sets/src/mage/sets/ravnica/SparkmageApprentice.java
+++ b/Mage.Sets/src/mage/sets/ravnica/SparkmageApprentice.java
@@ -37,7 +37,7 @@ public class SparkmageApprentice extends mage.sets.magic2010.SparkmageApprentice
 
     public SparkmageApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/SunhomeFortressOfTheLegion.java b/Mage.Sets/src/mage/sets/ravnica/SunhomeFortressOfTheLegion.java
index a910188497..6111d932e7 100644
--- a/Mage.Sets/src/mage/sets/ravnica/SunhomeFortressOfTheLegion.java
+++ b/Mage.Sets/src/mage/sets/ravnica/SunhomeFortressOfTheLegion.java
@@ -37,7 +37,7 @@ public class SunhomeFortressOfTheLegion extends mage.sets.planechase.SunhomeFort
 
     public SunhomeFortressOfTheLegion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/SvogthosTheRestlessTomb.java b/Mage.Sets/src/mage/sets/ravnica/SvogthosTheRestlessTomb.java
index 5afa92f2e3..b26e6b238d 100644
--- a/Mage.Sets/src/mage/sets/ravnica/SvogthosTheRestlessTomb.java
+++ b/Mage.Sets/src/mage/sets/ravnica/SvogthosTheRestlessTomb.java
@@ -37,7 +37,7 @@ public class SvogthosTheRestlessTomb extends mage.sets.commander.SvogthosTheRest
 
     public SvogthosTheRestlessTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/SzadekLordOfSecrets.java b/Mage.Sets/src/mage/sets/ravnica/SzadekLordOfSecrets.java
index 118cc60435..06a69cc241 100644
--- a/Mage.Sets/src/mage/sets/ravnica/SzadekLordOfSecrets.java
+++ b/Mage.Sets/src/mage/sets/ravnica/SzadekLordOfSecrets.java
@@ -38,7 +38,7 @@ public class SzadekLordOfSecrets extends mage.sets.commander.SzadekLordOfSecrets
 
     public SzadekLordOfSecrets(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/TellingTime.java b/Mage.Sets/src/mage/sets/ravnica/TellingTime.java
index 82b3d755bd..5bce75a55f 100644
--- a/Mage.Sets/src/mage/sets/ravnica/TellingTime.java
+++ b/Mage.Sets/src/mage/sets/ravnica/TellingTime.java
@@ -37,7 +37,7 @@ public class TellingTime extends mage.sets.tenthedition.TellingTime {
 
     public TellingTime(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/ThreeDreams.java b/Mage.Sets/src/mage/sets/ravnica/ThreeDreams.java
index 3fe9add0ba..aa6421414e 100644
--- a/Mage.Sets/src/mage/sets/ravnica/ThreeDreams.java
+++ b/Mage.Sets/src/mage/sets/ravnica/ThreeDreams.java
@@ -37,7 +37,7 @@ public class ThreeDreams extends mage.sets.planechase2012.ThreeDreams {
 
     public ThreeDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/VulturousZombie.java b/Mage.Sets/src/mage/sets/ravnica/VulturousZombie.java
index c85fde633d..d8fa3a2f92 100644
--- a/Mage.Sets/src/mage/sets/ravnica/VulturousZombie.java
+++ b/Mage.Sets/src/mage/sets/ravnica/VulturousZombie.java
@@ -38,7 +38,7 @@ public class VulturousZombie extends mage.sets.commander.VulturousZombie {
 
     public VulturousZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnica/WarpWorld.java b/Mage.Sets/src/mage/sets/ravnica/WarpWorld.java
index fa6fb9bc0b..57d6954032 100644
--- a/Mage.Sets/src/mage/sets/ravnica/WarpWorld.java
+++ b/Mage.Sets/src/mage/sets/ravnica/WarpWorld.java
@@ -37,7 +37,7 @@ public class WarpWorld extends mage.sets.magic2010.WarpWorld {
 
     public WarpWorld(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "RAV";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java b/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java
index 40e66c9491..b339de9c5a 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java
@@ -38,7 +38,7 @@ public class Arrest extends mage.sets.mirrodin.Arrest {
 
     public Arrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "RTR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BloodCrypt.java b/Mage.Sets/src/mage/sets/returntoravnica/BloodCrypt.java
index 6074b5e4fe..d3bf2dc5e2 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/BloodCrypt.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/BloodCrypt.java
@@ -37,7 +37,7 @@ public class BloodCrypt extends mage.sets.dissension.BloodCrypt {
 
     public BloodCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Cancel.java b/Mage.Sets/src/mage/sets/returntoravnica/Cancel.java
index c77eabd9f8..c97294353c 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Cancel.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Cremate.java b/Mage.Sets/src/mage/sets/returntoravnica/Cremate.java
index 98d1621f84..88b4d754a6 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Cremate.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Cremate.java
@@ -37,7 +37,7 @@ public class Cremate extends mage.sets.guildpact.Cremate {
 
     public Cremate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dispel.java b/Mage.Sets/src/mage/sets/returntoravnica/Dispel.java
index 78a0cd180e..8de6b4ab4b 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Dispel.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Dispel.java
@@ -37,7 +37,7 @@ public class Dispel extends mage.sets.worldwake.Dispel {
 
     public Dispel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GiantGrowth.java b/Mage.Sets/src/mage/sets/returntoravnica/GiantGrowth.java
index 8a967e0dc8..3e39df8c33 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/GiantGrowth.java
@@ -38,7 +38,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HallowedFountain.java b/Mage.Sets/src/mage/sets/returntoravnica/HallowedFountain.java
index 127d063c35..cd5ac15173 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/HallowedFountain.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/HallowedFountain.java
@@ -37,7 +37,7 @@ public class HallowedFountain extends mage.sets.dissension.HallowedFountain {
 
     public HallowedFountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HeroesReunion.java b/Mage.Sets/src/mage/sets/returntoravnica/HeroesReunion.java
index 4ecb966896..9b2474ae02 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/HeroesReunion.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/HeroesReunion.java
@@ -37,7 +37,7 @@ public class HeroesReunion extends mage.sets.invasion.HeroesReunion {
 
     public HeroesReunion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MindRot.java b/Mage.Sets/src/mage/sets/returntoravnica/MindRot.java
index 2d86ad4c4a..88617fcafb 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/MindRot.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/OvergrownTomb.java b/Mage.Sets/src/mage/sets/returntoravnica/OvergrownTomb.java
index 11eb2efc5f..421e5a389f 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/OvergrownTomb.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/OvergrownTomb.java
@@ -37,7 +37,7 @@ public class OvergrownTomb extends mage.sets.ravnica.OvergrownTomb {
 
     public OvergrownTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ParalyzingGrasp.java b/Mage.Sets/src/mage/sets/returntoravnica/ParalyzingGrasp.java
index 00e2cd30ae..8cc1e1eaa3 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ParalyzingGrasp.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ParalyzingGrasp.java
@@ -37,7 +37,7 @@ public class ParalyzingGrasp extends mage.sets.zendikar.ParalyzingGrasp {
 
     public ParalyzingGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PithingNeedle.java b/Mage.Sets/src/mage/sets/returntoravnica/PithingNeedle.java
index 333448d2dd..20c4f29b20 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/PithingNeedle.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/PithingNeedle.java
@@ -37,7 +37,7 @@ public class PithingNeedle extends mage.sets.saviorsofkamigawa.PithingNeedle {
 
     public PithingNeedle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SeekTheHorizon.java b/Mage.Sets/src/mage/sets/returntoravnica/SeekTheHorizon.java
index 526b7d0c20..b035067d7e 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SeekTheHorizon.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SeekTheHorizon.java
@@ -37,7 +37,7 @@ public class SeekTheHorizon extends mage.sets.saviorsofkamigawa.SeekTheHorizon {
 
     public SeekTheHorizon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SteamVents.java b/Mage.Sets/src/mage/sets/returntoravnica/SteamVents.java
index 966ccf228b..9db1b5bf15 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SteamVents.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SteamVents.java
@@ -37,7 +37,7 @@ public class SteamVents extends mage.sets.guildpact.SteamVents {
 
     public SteamVents(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TempleGarden.java b/Mage.Sets/src/mage/sets/returntoravnica/TempleGarden.java
index 2965a48b05..337c1814f8 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/TempleGarden.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/TempleGarden.java
@@ -37,7 +37,7 @@ public class TempleGarden extends mage.sets.ravnica.TempleGarden {
 
     public TempleGarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "RTR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java b/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java
index 7891826f23..15e0f43670 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java
@@ -38,7 +38,7 @@ public class TraitorousInstinct extends mage.sets.riseoftheeldrazi.TraitorousIns
 
     public TraitorousInstinct(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "RTR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/AirElemental.java b/Mage.Sets/src/mage/sets/revisededition/AirElemental.java
index a6f5aa5ea8..de34adb9b1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/revisededition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/AladdinsRing.java b/Mage.Sets/src/mage/sets/revisededition/AladdinsRing.java
index e5d0c9558d..a8f76febd1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/AladdinsRing.java
+++ b/Mage.Sets/src/mage/sets/revisededition/AladdinsRing.java
@@ -37,7 +37,7 @@ public class AladdinsRing extends mage.sets.seventhedition.AladdinsRing {
 
     public AladdinsRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/AnimateDead.java b/Mage.Sets/src/mage/sets/revisededition/AnimateDead.java
index 41a87c685a..4bb4af86ce 100644
--- a/Mage.Sets/src/mage/sets/revisededition/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/revisededition/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/AnimateWall.java b/Mage.Sets/src/mage/sets/revisededition/AnimateWall.java
index bd0a04e437..e9668aa18d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/revisededition/AnimateWall.java
@@ -37,7 +37,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/revisededition/AnkhOfMishra.java
index d99fe0ec77..bf79e9f57c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/revisededition/AnkhOfMishra.java
@@ -38,7 +38,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Armageddon.java b/Mage.Sets/src/mage/sets/revisededition/Armageddon.java
index c02601d019..29d2086ca4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ArmageddonClock.java b/Mage.Sets/src/mage/sets/revisededition/ArmageddonClock.java
index 229d15e6e5..399684d72e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ArmageddonClock.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ArmageddonClock.java
@@ -37,7 +37,7 @@ public class ArmageddonClock extends mage.sets.masterseditioniv.ArmageddonClock
 
     public ArmageddonClock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/AspectOfWolf.java b/Mage.Sets/src/mage/sets/revisededition/AspectOfWolf.java
index 2fead1ac19..3198830348 100644
--- a/Mage.Sets/src/mage/sets/revisededition/AspectOfWolf.java
+++ b/Mage.Sets/src/mage/sets/revisededition/AspectOfWolf.java
@@ -38,7 +38,7 @@ public class AspectOfWolf extends mage.sets.limitedalpha.AspectOfWolf {
 
     public AspectOfWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Atog.java b/Mage.Sets/src/mage/sets/revisededition/Atog.java
index 93c80176ae..2faef4a402 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Atog.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Atog.java
@@ -38,7 +38,7 @@ public class Atog extends mage.sets.mirrodin.Atog {
 
     public Atog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/BadMoon.java b/Mage.Sets/src/mage/sets/revisededition/BadMoon.java
index 204f175ced..92b5f53704 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Badlands.java b/Mage.Sets/src/mage/sets/revisededition/Badlands.java
index a78ed3663c..604efa10d3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Badlands.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Badlands.java
@@ -37,7 +37,7 @@ public class Badlands extends mage.sets.limitedalpha.Badlands {
 
     public Badlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Balance.java b/Mage.Sets/src/mage/sets/revisededition/Balance.java
index 6fa294c28a..7045f208e0 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Balance.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Balance.java
@@ -37,7 +37,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BasaltMonolith.java b/Mage.Sets/src/mage/sets/revisededition/BasaltMonolith.java
index 5e76161d65..4b9a6a7687 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BasaltMonolith.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BasaltMonolith.java
@@ -37,7 +37,7 @@ public class BasaltMonolith extends mage.sets.limitedalpha.BasaltMonolith {
 
     public BasaltMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Bayou.java b/Mage.Sets/src/mage/sets/revisededition/Bayou.java
index 5e52b5af70..f0767f854b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Bayou.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Bayou.java
@@ -37,7 +37,7 @@ public class Bayou extends mage.sets.limitedalpha.Bayou {
 
     public Bayou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/revisededition/BirdsOfParadise.java
index 355a918163..5432df27f9 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BlackKnight.java b/Mage.Sets/src/mage/sets/revisededition/BlackKnight.java
index d423dc6f00..6efaac49f6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BlackVise.java b/Mage.Sets/src/mage/sets/revisededition/BlackVise.java
index a6a09e5004..cda9b29320 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BlackVise.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BlackVise.java
@@ -37,7 +37,7 @@ public class BlackVise extends mage.sets.limitedalpha.BlackVise {
 
     public BlackVise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Blessing.java b/Mage.Sets/src/mage/sets/revisededition/Blessing.java
index 4d3b3a0fb9..dc76efb22a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Blessing.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Blessing.java
@@ -37,7 +37,7 @@ public class Blessing extends mage.sets.fourthedition.Blessing {
 
     public Blessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/revisededition/BlueElementalBlast.java
index ded983f81f..66bd971325 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BlueElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BlueElementalBlast.java
@@ -37,7 +37,7 @@ public class BlueElementalBlast extends mage.sets.limitedalpha.BlueElementalBlas
 
     public BlueElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BlueWard.java b/Mage.Sets/src/mage/sets/revisededition/BlueWard.java
index 76072de6b1..747651e921 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BlueWard.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BlueWard.java
@@ -37,7 +37,7 @@ public class BlueWard extends mage.sets.unlimitededition.BlueWard {
 
     public BlueWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BogWraith.java b/Mage.Sets/src/mage/sets/revisededition/BogWraith.java
index 2678a79244..adf8d2e59d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BottleOfSuleiman.java b/Mage.Sets/src/mage/sets/revisededition/BottleOfSuleiman.java
index 1cedab3959..25c69c66bf 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BottleOfSuleiman.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BottleOfSuleiman.java
@@ -37,7 +37,7 @@ public class BottleOfSuleiman extends mage.sets.fifthedition.BottleOfSuleiman {
 
     public BottleOfSuleiman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Braingeyser.java b/Mage.Sets/src/mage/sets/revisededition/Braingeyser.java
index fa7044d7bb..fcf26a7091 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Braingeyser.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Braingeyser.java
@@ -38,7 +38,7 @@ public class Braingeyser extends mage.sets.limitedalpha.Braingeyser {
 
     public Braingeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/BrassMan.java b/Mage.Sets/src/mage/sets/revisededition/BrassMan.java
index a3687df8db..98cf856f6b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/BrassMan.java
+++ b/Mage.Sets/src/mage/sets/revisededition/BrassMan.java
@@ -37,7 +37,7 @@ public class BrassMan extends mage.sets.fourthedition.BrassMan {
 
     public BrassMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Burrowing.java b/Mage.Sets/src/mage/sets/revisededition/Burrowing.java
index ffffd8bc18..63bec73dfa 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Burrowing.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Burrowing.java
@@ -38,7 +38,7 @@ public class Burrowing extends mage.sets.limitedalpha.Burrowing {
 
     public Burrowing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Castle.java b/Mage.Sets/src/mage/sets/revisededition/Castle.java
index bfec428234..3834fb0162 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Castle.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CelestialPrism.java b/Mage.Sets/src/mage/sets/revisededition/CelestialPrism.java
index 3226bbaad7..f1dea69518 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CelestialPrism.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CelestialPrism.java
@@ -37,7 +37,7 @@ public class CelestialPrism extends mage.sets.limitedalpha.CelestialPrism {
 
     public CelestialPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Chaoslace.java b/Mage.Sets/src/mage/sets/revisededition/Chaoslace.java
index 247ae5fe06..1592d3538a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Chaoslace.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Chaoslace.java
@@ -37,7 +37,7 @@ public class Chaoslace extends mage.sets.fourthedition.Chaoslace {
 
     public Chaoslace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlack.java
index b3b4133396..1fc0da6589 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlue.java
index bb4ce62393..d2a66119d4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionGreen.java
index 5ad055b937..f00e551273 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionRed.java
index 10c7830e56..d0579a1fe4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionWhite.java
index ddca7d9065..653e8275db 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ClockworkBeast.java b/Mage.Sets/src/mage/sets/revisededition/ClockworkBeast.java
index e68dd766c4..43abcdbb79 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ClockworkBeast.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ClockworkBeast.java
@@ -37,7 +37,7 @@ public class ClockworkBeast extends mage.sets.limitedalpha.ClockworkBeast {
 
     public ClockworkBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Clone.java b/Mage.Sets/src/mage/sets/revisededition/Clone.java
index 24c192e854..7167419c67 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Clone.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Clone.java
@@ -38,7 +38,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Cockatrice.java b/Mage.Sets/src/mage/sets/revisededition/Cockatrice.java
index 5845f30baa..191c025cb0 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Cockatrice.java
@@ -37,7 +37,7 @@ public class Cockatrice extends mage.sets.limitedalpha.Cockatrice {
 
     public Cockatrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Conservator.java b/Mage.Sets/src/mage/sets/revisededition/Conservator.java
index fb0020ff85..8207148449 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Conservator.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Conservator.java
@@ -38,7 +38,7 @@ public class Conservator extends mage.sets.limitedalpha.Conservator {
 
     public Conservator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ControlMagic.java b/Mage.Sets/src/mage/sets/revisededition/ControlMagic.java
index 12f35b8275..4ccba8604b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Conversion.java b/Mage.Sets/src/mage/sets/revisededition/Conversion.java
index e10d3dac20..7920cf7542 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Conversion.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Conversion.java
@@ -37,7 +37,7 @@ public class Conversion extends mage.sets.limitedalpha.Conversion {
 
     public Conversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CopyArtifact.java b/Mage.Sets/src/mage/sets/revisededition/CopyArtifact.java
index 510df8e824..a856d60e83 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CopyArtifact.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CopyArtifact.java
@@ -38,7 +38,7 @@ public class CopyArtifact extends mage.sets.limitedalpha.CopyArtifact {
 
     public CopyArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Counterspell.java b/Mage.Sets/src/mage/sets/revisededition/Counterspell.java
index 5f7092d545..0abc0cc595 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/CrawWurm.java b/Mage.Sets/src/mage/sets/revisededition/CrawWurm.java
index 8e3d8f3177..266bfaeee1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Crumble.java b/Mage.Sets/src/mage/sets/revisededition/Crumble.java
index 9e5ba1fb29..407ddb3c16 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Crumble.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Crumble.java
@@ -38,7 +38,7 @@ public class Crumble extends mage.sets.masterseditioniv.Crumble {
 
     public Crumble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Crusade.java b/Mage.Sets/src/mage/sets/revisededition/Crusade.java
index f9db59caa2..279851f81c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Crusade.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CrystalRod.java b/Mage.Sets/src/mage/sets/revisededition/CrystalRod.java
index caf2a5c2e4..1e87a0d38f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/CursedLand.java b/Mage.Sets/src/mage/sets/revisededition/CursedLand.java
index 5abe594f4e..14af5aa77b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/CursedLand.java
+++ b/Mage.Sets/src/mage/sets/revisededition/CursedLand.java
@@ -37,7 +37,7 @@ public class CursedLand extends mage.sets.fourthedition.CursedLand {
 
     public CursedLand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java b/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java
index 640b074da9..c9616d0342 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java
@@ -38,7 +38,7 @@ public class DancingScimitar extends mage.sets.ninthedition.DancingScimitar {
 
     public DancingScimitar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/DarkRitual.java b/Mage.Sets/src/mage/sets/revisededition/DarkRitual.java
index 8919203659..e060896310 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DeathWard.java b/Mage.Sets/src/mage/sets/revisededition/DeathWard.java
index 7998c2bb17..88eb533397 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DeathWard.java
@@ -38,7 +38,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Deathgrip.java b/Mage.Sets/src/mage/sets/revisededition/Deathgrip.java
index 026bbd0b94..8f5f2981e5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Deathgrip.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Deathgrip.java
@@ -37,7 +37,7 @@ public class Deathgrip extends mage.sets.limitedbeta.Deathgrip {
 
     public Deathgrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Deathlace.java b/Mage.Sets/src/mage/sets/revisededition/Deathlace.java
index 55e0d3a6a9..110f5021b3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Deathlace.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Deathlace.java
@@ -37,7 +37,7 @@ public class Deathlace extends mage.sets.limitedbeta.Deathlace {
 
     public Deathlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DemonicHordes.java b/Mage.Sets/src/mage/sets/revisededition/DemonicHordes.java
index a901c3958e..431ca78078 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DemonicHordes.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DemonicHordes.java
@@ -37,7 +37,7 @@ public class DemonicHordes extends mage.sets.limitedalpha.DemonicHordes {
 
     public DemonicHordes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DemonicTutor.java b/Mage.Sets/src/mage/sets/revisededition/DemonicTutor.java
index 09fed392c7..3e0f36ed34 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DemonicTutor.java
@@ -38,7 +38,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DingusEgg.java b/Mage.Sets/src/mage/sets/revisededition/DingusEgg.java
index 30441cc6b0..2b4941b804 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Disenchant.java b/Mage.Sets/src/mage/sets/revisededition/Disenchant.java
index cc0749bcd3..8a076f0087 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Disintegrate.java b/Mage.Sets/src/mage/sets/revisededition/Disintegrate.java
index 10646f6a87..4d42d17823 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Disintegrate.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Disintegrate.java
@@ -37,7 +37,7 @@ public class Disintegrate extends mage.sets.limitedalpha.Disintegrate {
 
     public Disintegrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/revisededition/DisruptingScepter.java
index a6e95e0eae..5ef2a8c95c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DragonEngine.java b/Mage.Sets/src/mage/sets/revisededition/DragonEngine.java
index e38c230bd1..3d8e36d1d8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DragonEngine.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DragonEngine.java
@@ -37,7 +37,7 @@ public class DragonEngine extends mage.sets.fifthedition.DragonEngine {
 
     public DragonEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DragonWhelp.java b/Mage.Sets/src/mage/sets/revisededition/DragonWhelp.java
index a427d6b98e..1bef46c0f9 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DrainLife.java b/Mage.Sets/src/mage/sets/revisededition/DrainLife.java
index 3bb5142653..da31681e2e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/revisededition/DrudgeSkeletons.java
index 35fcbaa1e1..abe46f0eb1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/revisededition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/EarthElemental.java b/Mage.Sets/src/mage/sets/revisededition/EarthElemental.java
index 35244d6f38..863bd26a54 100644
--- a/Mage.Sets/src/mage/sets/revisededition/EarthElemental.java
+++ b/Mage.Sets/src/mage/sets/revisededition/EarthElemental.java
@@ -37,7 +37,7 @@ public class EarthElemental extends mage.sets.tenthedition.EarthElemental {
 
     public EarthElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Earthbind.java b/Mage.Sets/src/mage/sets/revisededition/Earthbind.java
index e9895ce966..5ec447494c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Earthbind.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Earthbind.java
@@ -37,7 +37,7 @@ public class Earthbind extends mage.sets.limitedbeta.Earthbind {
 
     public Earthbind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Earthquake.java b/Mage.Sets/src/mage/sets/revisededition/Earthquake.java
index 95fff9ec43..1d6a151fb6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/EbonyHorse.java b/Mage.Sets/src/mage/sets/revisededition/EbonyHorse.java
index cede8444bc..b65c5614f1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/EbonyHorse.java
+++ b/Mage.Sets/src/mage/sets/revisededition/EbonyHorse.java
@@ -37,7 +37,7 @@ public class EbonyHorse extends mage.sets.fourthedition.EbonyHorse {
 
     public EbonyHorse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ElHajjaj.java b/Mage.Sets/src/mage/sets/revisededition/ElHajjaj.java
index ea0b5826aa..3a71c7eecd 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ElHajjaj.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ElHajjaj.java
@@ -37,7 +37,7 @@ public class ElHajjaj extends mage.sets.arabiannights.ElHajjaj {
 
     public ElHajjaj(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ElvishArchers.java b/Mage.Sets/src/mage/sets/revisededition/ElvishArchers.java
index 397a059f71..5e2e5b261e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/EnergyFlux.java b/Mage.Sets/src/mage/sets/revisededition/EnergyFlux.java
index 47da3adb10..56eedece73 100644
--- a/Mage.Sets/src/mage/sets/revisededition/EnergyFlux.java
+++ b/Mage.Sets/src/mage/sets/revisededition/EnergyFlux.java
@@ -37,7 +37,7 @@ public class EnergyFlux extends mage.sets.antiquities.EnergyFlux {
 
     public EnergyFlux(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ErgRaiders.java b/Mage.Sets/src/mage/sets/revisededition/ErgRaiders.java
index ff3daef28b..8c146cee0f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ErgRaiders.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ErgRaiders.java
@@ -38,7 +38,7 @@ public class ErgRaiders extends mage.sets.fourthedition.ErgRaiders {
 
     public ErgRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java b/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java
index 3a4695484a..468857194c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java
@@ -38,7 +38,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/EyeForAnEye.java b/Mage.Sets/src/mage/sets/revisededition/EyeForAnEye.java
index ad174a62d0..9bb3399dcd 100644
--- a/Mage.Sets/src/mage/sets/revisededition/EyeForAnEye.java
+++ b/Mage.Sets/src/mage/sets/revisededition/EyeForAnEye.java
@@ -38,7 +38,7 @@ public class EyeForAnEye extends mage.sets.arabiannights.EyeForAnEye {
 
     public EyeForAnEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Farmstead.java b/Mage.Sets/src/mage/sets/revisededition/Farmstead.java
index ef9ba665e4..a700062636 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Farmstead.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Farmstead.java
@@ -37,7 +37,7 @@ public class Farmstead extends mage.sets.unlimitededition.Farmstead {
 
     public Farmstead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Fastbond.java b/Mage.Sets/src/mage/sets/revisededition/Fastbond.java
index 7f78b52a7c..9e3d0a17e4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Fastbond.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Fastbond.java
@@ -37,7 +37,7 @@ public class Fastbond extends mage.sets.limitedalpha.Fastbond {
 
     public Fastbond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Fear.java b/Mage.Sets/src/mage/sets/revisededition/Fear.java
index 1b6fe2de0a..ab04abdf6c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Fear.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Feedback.java b/Mage.Sets/src/mage/sets/revisededition/Feedback.java
index 78a55e3387..c35e6962e8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Feedback.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Feedback.java
@@ -37,7 +37,7 @@ public class Feedback extends mage.sets.limitedalpha.Feedback {
 
     public Feedback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/FireElemental.java b/Mage.Sets/src/mage/sets/revisededition/FireElemental.java
index f5570bd877..618bbc49ad 100644
--- a/Mage.Sets/src/mage/sets/revisededition/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/revisededition/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Fireball.java b/Mage.Sets/src/mage/sets/revisededition/Fireball.java
index fc7763940e..0cc447da22 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Fireball.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Firebreathing.java b/Mage.Sets/src/mage/sets/revisededition/Firebreathing.java
index 39380172da..2a6d221304 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Flashfires.java b/Mage.Sets/src/mage/sets/revisededition/Flashfires.java
index 4c57416d0b..b4c99874ed 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Flight.java b/Mage.Sets/src/mage/sets/revisededition/Flight.java
index 365138b060..1b74f7af4f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Flight.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/revisededition/FlyingCarpet.java
index f36ce41e3f..dbf864b767 100644
--- a/Mage.Sets/src/mage/sets/revisededition/FlyingCarpet.java
+++ b/Mage.Sets/src/mage/sets/revisededition/FlyingCarpet.java
@@ -37,7 +37,7 @@ public class FlyingCarpet extends mage.sets.seventhedition.FlyingCarpet {
 
     public FlyingCarpet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Fog.java b/Mage.Sets/src/mage/sets/revisededition/Fog.java
index 059a5cd7dd..d41946834a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Fog.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ForceOfNature.java b/Mage.Sets/src/mage/sets/revisededition/ForceOfNature.java
index 9565c59810..0806676b1d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Fork.java b/Mage.Sets/src/mage/sets/revisededition/Fork.java
index 9bd9f333bd..7a3da0599d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Fork.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Fork.java
@@ -37,7 +37,7 @@ public class Fork extends mage.sets.limitedbeta.Fork {
 
     public Fork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/FrozenShade.java b/Mage.Sets/src/mage/sets/revisededition/FrozenShade.java
index 5bed8ed218..581432ad74 100644
--- a/Mage.Sets/src/mage/sets/revisededition/FrozenShade.java
+++ b/Mage.Sets/src/mage/sets/revisededition/FrozenShade.java
@@ -38,7 +38,7 @@ public class FrozenShade extends mage.sets.limitedalpha.FrozenShade {
 
     public FrozenShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Fungusaur.java b/Mage.Sets/src/mage/sets/revisededition/Fungusaur.java
index 61c58adc2f..1d043894df 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Fungusaur.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Fungusaur.java
@@ -37,7 +37,7 @@ public class Fungusaur extends mage.sets.limitedalpha.Fungusaur {
 
     public Fungusaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GiantGrowth.java b/Mage.Sets/src/mage/sets/revisededition/GiantGrowth.java
index d22f9826df..0a4de217f8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GiantSpider.java b/Mage.Sets/src/mage/sets/revisededition/GiantSpider.java
index 86613c8dad..ea2b326070 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/revisededition/GlassesOfUrza.java
index c24ecac481..0fe36062b8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GlassesOfUrza.java
@@ -37,7 +37,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Gloom.java b/Mage.Sets/src/mage/sets/revisededition/Gloom.java
index e406453f3f..9750e0b4b9 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Gloom.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Gloom.java
@@ -37,7 +37,7 @@ public class Gloom extends mage.sets.limitedalpha.Gloom {
 
     public Gloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java
index 59cd9ef905..24cd0bdbae 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java
@@ -38,7 +38,7 @@ public class GoblinBalloonBrigade extends mage.sets.magic2011.GoblinBalloonBriga
 
     public GoblinBalloonBrigade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/GoblinKing.java b/Mage.Sets/src/mage/sets/revisededition/GoblinKing.java
index 30daa531aa..a201961642 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GrayOgre.java b/Mage.Sets/src/mage/sets/revisededition/GrayOgre.java
index a7d6177724..e4075066ec 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GrayOgre.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GrayOgre.java
@@ -37,7 +37,7 @@ public class GrayOgre extends mage.sets.fourthedition.GrayOgre {
 
     public GrayOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GreenWard.java b/Mage.Sets/src/mage/sets/revisededition/GreenWard.java
index 57c2a7f59a..49bfe51e7f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GreenWard.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GreenWard.java
@@ -37,7 +37,7 @@ public class GreenWard extends mage.sets.unlimitededition.GreenWard {
 
     public GreenWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/revisededition/GrizzlyBears.java
index 931c8a3536..606e56c4f5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/revisededition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HealingSalve.java b/Mage.Sets/src/mage/sets/revisededition/HealingSalve.java
index aa96953b56..a623e9e69a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HillGiant.java b/Mage.Sets/src/mage/sets/revisededition/HillGiant.java
index 134227cd0d..3569a29d58 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HolyArmor.java b/Mage.Sets/src/mage/sets/revisededition/HolyArmor.java
index dccf5e4391..5169926149 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HolyArmor.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HolyArmor.java
@@ -37,7 +37,7 @@ public class HolyArmor extends mage.sets.fourthedition.HolyArmor {
 
     public HolyArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HolyStrength.java b/Mage.Sets/src/mage/sets/revisededition/HolyStrength.java
index 2ad8c1db87..2fbdc6bb6b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/revisededition/HowlFromBeyond.java
index d812528284..020c81c051 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HowlingMine.java b/Mage.Sets/src/mage/sets/revisededition/HowlingMine.java
index 501316c7ac..4aa1464cbe 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HurkylsRecall.java b/Mage.Sets/src/mage/sets/revisededition/HurkylsRecall.java
index 024e3abc0e..2b6013ee05 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HurkylsRecall.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HurkylsRecall.java
@@ -37,7 +37,7 @@ public class HurkylsRecall extends mage.sets.fifthedition.HurkylsRecall {
 
     public HurkylsRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/revisededition/HurloonMinotaur.java
index 5e48299e44..8ee8b1ca49 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HurloonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HurloonMinotaur.java
@@ -37,7 +37,7 @@ public class HurloonMinotaur extends mage.sets.fifthedition.HurloonMinotaur {
 
     public HurloonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Hurricane.java b/Mage.Sets/src/mage/sets/revisededition/Hurricane.java
index f99b27a9f5..ce2cd2b9fe 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Hurricane.java
@@ -37,7 +37,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java
index e02c51a1e5..a387a3d256 100644
--- a/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java
@@ -38,7 +38,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/InstillEnergy.java b/Mage.Sets/src/mage/sets/revisededition/InstillEnergy.java
index c961e331c3..a2d0b589e2 100644
--- a/Mage.Sets/src/mage/sets/revisededition/InstillEnergy.java
+++ b/Mage.Sets/src/mage/sets/revisededition/InstillEnergy.java
@@ -37,7 +37,7 @@ public class InstillEnergy extends mage.sets.fifthedition.InstillEnergy {
 
     public InstillEnergy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/IronStar.java b/Mage.Sets/src/mage/sets/revisededition/IronStar.java
index baee5cb9b6..19986ac7d5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/revisededition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/revisededition/IronrootTreefolk.java
index 891337c026..8431093bba 100644
--- a/Mage.Sets/src/mage/sets/revisededition/IronrootTreefolk.java
+++ b/Mage.Sets/src/mage/sets/revisededition/IronrootTreefolk.java
@@ -37,7 +37,7 @@ public class IronrootTreefolk extends mage.sets.fifthedition.IronrootTreefolk {
 
     public IronrootTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/IslandFishJasconius.java b/Mage.Sets/src/mage/sets/revisededition/IslandFishJasconius.java
index a3174bbcb7..738f7b4936 100644
--- a/Mage.Sets/src/mage/sets/revisededition/IslandFishJasconius.java
+++ b/Mage.Sets/src/mage/sets/revisededition/IslandFishJasconius.java
@@ -37,7 +37,7 @@ public class IslandFishJasconius extends mage.sets.fourthedition.IslandFishJasco
 
     public IslandFishJasconius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/IslandSanctuary.java b/Mage.Sets/src/mage/sets/revisededition/IslandSanctuary.java
index 8fbf3ad79e..542eab18be 100644
--- a/Mage.Sets/src/mage/sets/revisededition/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/sets/revisededition/IslandSanctuary.java
@@ -37,7 +37,7 @@ public class IslandSanctuary extends mage.sets.limitedalpha.IslandSanctuary {
 
     public IslandSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/IvoryCup.java b/Mage.Sets/src/mage/sets/revisededition/IvoryCup.java
index 0e147e20fc..6d10409e83 100644
--- a/Mage.Sets/src/mage/sets/revisededition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/revisededition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java b/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java
index 5b3bb5ff7f..dd6fd39100 100644
--- a/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java
+++ b/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java
@@ -39,7 +39,7 @@ public class IvoryTower extends mage.sets.antiquities.IvoryTower {
 
     public IvoryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/JadeMonolith.java b/Mage.Sets/src/mage/sets/revisededition/JadeMonolith.java
index d14393cdae..78446cf016 100644
--- a/Mage.Sets/src/mage/sets/revisededition/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/revisededition/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/JandorsSaddlebags.java b/Mage.Sets/src/mage/sets/revisededition/JandorsSaddlebags.java
index f821f68d7a..05509d2537 100644
--- a/Mage.Sets/src/mage/sets/revisededition/JandorsSaddlebags.java
+++ b/Mage.Sets/src/mage/sets/revisededition/JandorsSaddlebags.java
@@ -37,7 +37,7 @@ public class JandorsSaddlebags extends mage.sets.seventhedition.JandorsSaddlebag
 
     public JandorsSaddlebags(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/revisededition/JayemdaeTome.java
index 1754ef9116..b8945bd72f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/revisededition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Juggernaut.java b/Mage.Sets/src/mage/sets/revisededition/Juggernaut.java
index 85becd80f8..80232af7cd 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Jump.java b/Mage.Sets/src/mage/sets/revisededition/Jump.java
index 62cf6fa257..75646a03bb 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Jump.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Jump.java
@@ -37,7 +37,7 @@ public class Jump extends mage.sets.magic2010.Jump {
 
     public Jump(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Karma.java b/Mage.Sets/src/mage/sets/revisededition/Karma.java
index 2920357080..75522173fe 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Karma.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Karma.java
@@ -37,7 +37,7 @@ public class Karma extends mage.sets.fifthedition.Karma {
 
     public Karma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/KeldonWarlord.java b/Mage.Sets/src/mage/sets/revisededition/KeldonWarlord.java
index 430d38efb7..e42214008a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/KeldonWarlord.java
+++ b/Mage.Sets/src/mage/sets/revisededition/KeldonWarlord.java
@@ -37,7 +37,7 @@ public class KeldonWarlord extends mage.sets.unlimitededition.KeldonWarlord {
 
     public KeldonWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/KirdApe.java b/Mage.Sets/src/mage/sets/revisededition/KirdApe.java
index f8682db5d6..392cbdf941 100644
--- a/Mage.Sets/src/mage/sets/revisededition/KirdApe.java
+++ b/Mage.Sets/src/mage/sets/revisededition/KirdApe.java
@@ -38,7 +38,7 @@ public class KirdApe extends mage.sets.ninthedition.KirdApe {
 
     public KirdApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/KormusBell.java b/Mage.Sets/src/mage/sets/revisededition/KormusBell.java
index eab0ab18ec..f7efa87cd5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/KormusBell.java
+++ b/Mage.Sets/src/mage/sets/revisededition/KormusBell.java
@@ -38,7 +38,7 @@ public class KormusBell extends mage.sets.limitedalpha.KormusBell {
 
     public KormusBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Lance.java b/Mage.Sets/src/mage/sets/revisededition/Lance.java
index d318c8a6ff..a02f08fd0e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Lance.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Lance.java
@@ -37,7 +37,7 @@ public class Lance extends mage.sets.limitedalpha.Lance {
 
     public Lance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LeyDruid.java b/Mage.Sets/src/mage/sets/revisededition/LeyDruid.java
index 77c9ec7cef..f3cb8e1267 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LeyDruid.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LeyDruid.java
@@ -38,7 +38,7 @@ public class LeyDruid extends mage.sets.limitedalpha.LeyDruid {
 
     public LeyDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LibraryOfLeng.java b/Mage.Sets/src/mage/sets/revisededition/LibraryOfLeng.java
index c5135c9ee6..d7c64dae84 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LibraryOfLeng.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LibraryOfLeng.java
@@ -37,7 +37,7 @@ public class LibraryOfLeng extends mage.sets.limitedbeta.LibraryOfLeng {
 
     public LibraryOfLeng(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Lifeforce.java b/Mage.Sets/src/mage/sets/revisededition/Lifeforce.java
index b95a3856cf..5f1d34e44b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Lifeforce.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Lifeforce.java
@@ -38,7 +38,7 @@ public class Lifeforce extends mage.sets.masterseditioniv.Lifeforce {
 
     public Lifeforce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Lifelace.java b/Mage.Sets/src/mage/sets/revisededition/Lifelace.java
index 3012b263eb..570cfa46e6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Lifelace.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Lifelace.java
@@ -37,7 +37,7 @@ public class Lifelace extends mage.sets.limitedalpha.Lifelace {
 
     public Lifelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Lifetap.java b/Mage.Sets/src/mage/sets/revisededition/Lifetap.java
index 647589a865..d4b4897140 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Lifetap.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Lifetap.java
@@ -37,7 +37,7 @@ public class Lifetap extends mage.sets.fifthedition.Lifetap {
 
     public Lifetap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LightningBolt.java b/Mage.Sets/src/mage/sets/revisededition/LightningBolt.java
index b3eca9f2b5..887453afea 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LivingArtifact.java b/Mage.Sets/src/mage/sets/revisededition/LivingArtifact.java
index fc2b13e37b..1c06c3a0e4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LivingArtifact.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LivingArtifact.java
@@ -37,7 +37,7 @@ public class LivingArtifact extends mage.sets.fifthedition.LivingArtifact {
 
     public LivingArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LivingLands.java b/Mage.Sets/src/mage/sets/revisededition/LivingLands.java
index be5ce02e10..e99c85ff8f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LivingWall.java b/Mage.Sets/src/mage/sets/revisededition/LivingWall.java
index b195f7f435..fb06693ce3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LivingWall.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LivingWall.java
@@ -37,7 +37,7 @@ public class LivingWall extends mage.sets.unlimitededition.LivingWall {
 
     public LivingWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LlanowarElves.java b/Mage.Sets/src/mage/sets/revisededition/LlanowarElves.java
index b4075c1119..a7c11f3de1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/revisededition/LordOfAtlantis.java
index a18d20fdc5..071a10d469 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/LordOfThePit.java b/Mage.Sets/src/mage/sets/revisededition/LordOfThePit.java
index f3efebc9be..daa71e7cda 100644
--- a/Mage.Sets/src/mage/sets/revisededition/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/revisededition/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/Lure.java b/Mage.Sets/src/mage/sets/revisededition/Lure.java
index 697fcbc85b..d56180f9f6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Lure.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/MagneticMountain.java b/Mage.Sets/src/mage/sets/revisededition/MagneticMountain.java
index a614b78534..4ceec9b65c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/MagneticMountain.java
+++ b/Mage.Sets/src/mage/sets/revisededition/MagneticMountain.java
@@ -38,7 +38,7 @@ public class MagneticMountain extends mage.sets.arabiannights.MagneticMountain {
 
     public MagneticMountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/revisededition/MahamotiDjinn.java
index dc4ae163d5..512c89dbec 100644
--- a/Mage.Sets/src/mage/sets/revisededition/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/revisededition/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ManaFlare.java b/Mage.Sets/src/mage/sets/revisededition/ManaFlare.java
index 40855ae8a7..7e15b5d9b7 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ManaFlare.java
@@ -37,7 +37,7 @@ public class ManaFlare extends mage.sets.fourthedition.ManaFlare {
 
     public ManaFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ManaShort.java b/Mage.Sets/src/mage/sets/revisededition/ManaShort.java
index 617c16281f..781b983719 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ManaShort.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ManaShort.java
@@ -37,7 +37,7 @@ public class ManaShort extends mage.sets.limitedalpha.ManaShort {
 
     public ManaShort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ManaVault.java b/Mage.Sets/src/mage/sets/revisededition/ManaVault.java
index 50940b79db..a862b3bfd5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Manabarbs.java b/Mage.Sets/src/mage/sets/revisededition/Manabarbs.java
index bb72334ca7..f30156896d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Meekstone.java b/Mage.Sets/src/mage/sets/revisededition/Meekstone.java
index 2a803ff028..3b2a894add 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/revisededition/MerfolkOfThePearlTrident.java
index 0c035563bb..1a958203d3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/revisededition/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/MijaeDjinn.java b/Mage.Sets/src/mage/sets/revisededition/MijaeDjinn.java
index 3bb1969e87..200d89f426 100644
--- a/Mage.Sets/src/mage/sets/revisededition/MijaeDjinn.java
+++ b/Mage.Sets/src/mage/sets/revisededition/MijaeDjinn.java
@@ -37,7 +37,7 @@ public class MijaeDjinn extends mage.sets.masterseditioniv.MijaeDjinn {
 
     public MijaeDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Millstone.java b/Mage.Sets/src/mage/sets/revisededition/Millstone.java
index ced35f3d55..5ea1f3ef45 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/MindTwist.java b/Mage.Sets/src/mage/sets/revisededition/MindTwist.java
index 27ff011e7d..0e194df308 100644
--- a/Mage.Sets/src/mage/sets/revisededition/MindTwist.java
+++ b/Mage.Sets/src/mage/sets/revisededition/MindTwist.java
@@ -37,7 +37,7 @@ public class MindTwist extends mage.sets.limitedalpha.MindTwist {
 
     public MindTwist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/revisededition/MonssGoblinRaiders.java
index 27d27ee299..b6e1da855a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/revisededition/MonssGoblinRaiders.java
@@ -37,7 +37,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/NetherShadow.java b/Mage.Sets/src/mage/sets/revisededition/NetherShadow.java
index 94cba84482..9600287fb7 100644
--- a/Mage.Sets/src/mage/sets/revisededition/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/revisededition/NetherShadow.java
@@ -37,7 +37,7 @@ public class NetherShadow extends mage.sets.limitedalpha.NetherShadow {
 
     public NetherShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/revisededition/NevinyrralsDisk.java
index 98e1573c4b..b8aec6b815 100644
--- a/Mage.Sets/src/mage/sets/revisededition/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/revisededition/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Nightmare.java b/Mage.Sets/src/mage/sets/revisededition/Nightmare.java
index 7568436c04..054e5a003f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/NorthernPaladin.java b/Mage.Sets/src/mage/sets/revisededition/NorthernPaladin.java
index 15cef2e290..278a2caf07 100644
--- a/Mage.Sets/src/mage/sets/revisededition/NorthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/revisededition/NorthernPaladin.java
@@ -37,7 +37,7 @@ public class NorthernPaladin extends mage.sets.limitedalpha.NorthernPaladin {
 
     public NorthernPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java
index a4cab22d7e..eafdbbe738 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java
@@ -37,7 +37,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Onulet.java b/Mage.Sets/src/mage/sets/revisededition/Onulet.java
index 02813e1c91..d50c1db792 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Onulet.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Onulet.java
@@ -38,7 +38,7 @@ public class Onulet extends mage.sets.mastersedition.Onulet {
 
     public Onulet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/revisededition/OrcishArtillery.java
index 992447d5c8..9d6b5b790f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/revisededition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/revisededition/OrcishOriflamme.java
index a20439fd7d..57d10ea8e8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/revisededition/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Ornithopter.java b/Mage.Sets/src/mage/sets/revisededition/Ornithopter.java
index 58e510c5e5..910d2e8c70 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Ornithopter.java
@@ -37,7 +37,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Paralyze.java b/Mage.Sets/src/mage/sets/revisededition/Paralyze.java
index 62ef239f7b..02a1d02b1e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PearledUnicorn.java b/Mage.Sets/src/mage/sets/revisededition/PearledUnicorn.java
index 06082571aa..4a45d0e61c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PearledUnicorn.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PearledUnicorn.java
@@ -37,7 +37,7 @@ public class PearledUnicorn extends mage.sets.fifthedition.PearledUnicorn {
 
     public PearledUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Pestilence.java b/Mage.Sets/src/mage/sets/revisededition/Pestilence.java
index 54583444a8..15f1e67a7a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java
index 928fed59ac..defe34150c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java
@@ -37,7 +37,7 @@ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
 
     public PhantasmalForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/revisededition/PhantasmalTerrain.java
index d63910cb82..459fd20ec3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PhantomMonster.java b/Mage.Sets/src/mage/sets/revisededition/PhantomMonster.java
index 1a0dfffe02..1c0e000c32 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PhantomMonster.java
@@ -37,7 +37,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PirateShip.java b/Mage.Sets/src/mage/sets/revisededition/PirateShip.java
index c9e2a831a8..5db498da0b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PirateShip.java
@@ -38,7 +38,7 @@ public class PirateShip extends mage.sets.limitedalpha.PirateShip {
 
     public PirateShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PlagueRats.java b/Mage.Sets/src/mage/sets/revisededition/PlagueRats.java
index 1cd997ef10..27a7cec3d6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PlagueRats.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PlagueRats.java
@@ -37,7 +37,7 @@ public class PlagueRats extends mage.sets.unlimitededition.PlagueRats {
 
     public PlagueRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Plateau.java b/Mage.Sets/src/mage/sets/revisededition/Plateau.java
index e9f6ab5659..ca2441db4e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Plateau.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Plateau.java
@@ -37,7 +37,7 @@ public class Plateau extends mage.sets.limitedalpha.Plateau {
 
     public Plateau(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PowerSink.java b/Mage.Sets/src/mage/sets/revisededition/PowerSink.java
index 24b3c1d392..6fde20937f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/PrimalClay.java b/Mage.Sets/src/mage/sets/revisededition/PrimalClay.java
index 7da4a5d5e1..5e87e08fc0 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PrimalClay.java
@@ -37,7 +37,7 @@ public class PrimalClay extends mage.sets.fifthedition.PrimalClay {
 
     public PrimalClay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java
index f33dcb343f..0c2da11599 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/PsychicVenom.java b/Mage.Sets/src/mage/sets/revisededition/PsychicVenom.java
index d03b59ea41..ba4ce498d7 100644
--- a/Mage.Sets/src/mage/sets/revisededition/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/revisededition/PsychicVenom.java
@@ -38,7 +38,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Purelace.java b/Mage.Sets/src/mage/sets/revisededition/Purelace.java
index 35bf375c63..ce4abfc6eb 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Purelace.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Purelace.java
@@ -37,7 +37,7 @@ public class Purelace extends mage.sets.unlimitededition.Purelace {
 
     public Purelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/RaiseDead.java b/Mage.Sets/src/mage/sets/revisededition/RaiseDead.java
index 628f4b26a3..2a6f8a41f1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/revisededition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Reconstruction.java b/Mage.Sets/src/mage/sets/revisededition/Reconstruction.java
index 4f26241469..c75673c30a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Reconstruction.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Reconstruction.java
@@ -37,7 +37,7 @@ public class Reconstruction extends mage.sets.antiquities.Reconstruction {
 
     public Reconstruction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/RedElementalBlast.java b/Mage.Sets/src/mage/sets/revisededition/RedElementalBlast.java
index c20b0df46f..187f19d38f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/RedElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/revisededition/RedElementalBlast.java
@@ -37,7 +37,7 @@ public class RedElementalBlast extends mage.sets.limitedalpha.RedElementalBlast
 
     public RedElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Regeneration.java b/Mage.Sets/src/mage/sets/revisededition/Regeneration.java
index fee71ca81a..40220478c5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Regrowth.java b/Mage.Sets/src/mage/sets/revisededition/Regrowth.java
index 335e874762..598f045857 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Regrowth.java
@@ -38,7 +38,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Resurrection.java b/Mage.Sets/src/mage/sets/revisededition/Resurrection.java
index 390a0863f2..e0f916536f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Resurrection.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Resurrection.java
@@ -38,7 +38,7 @@ public class Resurrection extends mage.sets.limitedalpha.Resurrection {
 
     public Resurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ReverseDamage.java b/Mage.Sets/src/mage/sets/revisededition/ReverseDamage.java
index 0d21af9178..4511a82a57 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Righteousness.java b/Mage.Sets/src/mage/sets/revisededition/Righteousness.java
index 4b51781545..10a0e39e91 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/RocOfKherRidges.java b/Mage.Sets/src/mage/sets/revisededition/RocOfKherRidges.java
index 565780ecca..2c7cd3764f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/RocOfKherRidges.java
+++ b/Mage.Sets/src/mage/sets/revisededition/RocOfKherRidges.java
@@ -37,7 +37,7 @@ public class RocOfKherRidges extends mage.sets.limitedalpha.RocOfKherRidges {
 
     public RocOfKherRidges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/RodOfRuin.java b/Mage.Sets/src/mage/sets/revisededition/RodOfRuin.java
index 9e8d6434cb..5eca96f3a9 100644
--- a/Mage.Sets/src/mage/sets/revisededition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/revisededition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/RoyalAssassin.java b/Mage.Sets/src/mage/sets/revisededition/RoyalAssassin.java
index befcd8584e..a6bb35cdd9 100644
--- a/Mage.Sets/src/mage/sets/revisededition/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/revisededition/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Sacrifice.java b/Mage.Sets/src/mage/sets/revisededition/Sacrifice.java
index 93439100dd..ac8ab047b6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Sacrifice.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Sacrifice.java
@@ -37,7 +37,7 @@ public class Sacrifice extends mage.sets.unlimitededition.Sacrifice {
 
     public Sacrifice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SamiteHealer.java b/Mage.Sets/src/mage/sets/revisededition/SamiteHealer.java
index 58b250dae2..c70280c6ed 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Savannah.java b/Mage.Sets/src/mage/sets/revisededition/Savannah.java
index d872816a2d..736084df19 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Savannah.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Savannah.java
@@ -37,7 +37,7 @@ public class Savannah extends mage.sets.limitedalpha.Savannah {
 
     public Savannah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SavannahLions.java b/Mage.Sets/src/mage/sets/revisededition/SavannahLions.java
index 5e0f2527d4..c65c724887 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SavannahLions.java
@@ -37,7 +37,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ScatheZombies.java b/Mage.Sets/src/mage/sets/revisededition/ScatheZombies.java
index 2c019fa19e..823d52f51c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ScavengingGhoul.java b/Mage.Sets/src/mage/sets/revisededition/ScavengingGhoul.java
index 367f4aa5e7..8de4d36777 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ScavengingGhoul.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ScavengingGhoul.java
@@ -37,7 +37,7 @@ public class ScavengingGhoul extends mage.sets.limitedalpha.ScavengingGhoul {
 
     public ScavengingGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Scrubland.java b/Mage.Sets/src/mage/sets/revisededition/Scrubland.java
index 23ad430492..1a2e33aa21 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Scrubland.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Scrubland.java
@@ -37,7 +37,7 @@ public class Scrubland extends mage.sets.limitedalpha.Scrubland {
 
     public Scrubland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ScrybSprites.java b/Mage.Sets/src/mage/sets/revisededition/ScrybSprites.java
index bcd617bd7a..97a7db5281 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SeaSerpent.java b/Mage.Sets/src/mage/sets/revisededition/SeaSerpent.java
index c2dadc7e32..c92bb915f6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SeaSerpent.java
@@ -38,7 +38,7 @@ public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
 
     public SeaSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java b/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java
index 8822262f9a..a6d9e14ff3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java
@@ -37,7 +37,7 @@ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
 
     public SedgeTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java b/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java
index 5af7e14c7d..aaf7ec57c1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/SerendibEfreet.java b/Mage.Sets/src/mage/sets/revisededition/SerendibEfreet.java
index de8f3077b2..90755ec140 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SerendibEfreet.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SerendibEfreet.java
@@ -38,7 +38,7 @@ public class SerendibEfreet extends mage.sets.vintagemasters.SerendibEfreet {
 
     public SerendibEfreet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java b/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java
index 5963830727..6bdfc8e1c8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "3ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/revisededition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/revisededition/ShanodinDryads.java
index 684e270096..ab7af77e12 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Shatter.java b/Mage.Sets/src/mage/sets/revisededition/Shatter.java
index 0cec73ca23..6089d6d366 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Shatterstorm.java b/Mage.Sets/src/mage/sets/revisededition/Shatterstorm.java
index b7bff19b48..8afc89ff5c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Shatterstorm.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Shatterstorm.java
@@ -37,7 +37,7 @@ public class Shatterstorm extends mage.sets.fifthedition.Shatterstorm {
 
     public Shatterstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ShivanDragon.java b/Mage.Sets/src/mage/sets/revisededition/ShivanDragon.java
index 8596dafe76..9e8c15a4d6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SirensCall.java b/Mage.Sets/src/mage/sets/revisededition/SirensCall.java
index 985ed05ff7..9ad890f147 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SirensCall.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SirensCall.java
@@ -37,7 +37,7 @@ public class SirensCall extends mage.sets.fourthedition.SirensCall {
 
     public SirensCall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Smoke.java b/Mage.Sets/src/mage/sets/revisededition/Smoke.java
index 0753998a9b..a4d91dd455 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Smoke.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Smoke.java
@@ -38,7 +38,7 @@ public class Smoke extends mage.sets.limitedalpha.Smoke {
 
     public Smoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SoulNet.java b/Mage.Sets/src/mage/sets/revisededition/SoulNet.java
index 859d4394f1..cf0851f7c0 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SpellBlast.java b/Mage.Sets/src/mage/sets/revisededition/SpellBlast.java
index 4650661f81..b786a8b45d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Stasis.java b/Mage.Sets/src/mage/sets/revisededition/Stasis.java
index 73248a29e5..5f08f4ce4e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Stasis.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Stasis.java
@@ -37,7 +37,7 @@ public class Stasis extends mage.sets.fifthedition.Stasis {
 
     public Stasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/StealArtifact.java b/Mage.Sets/src/mage/sets/revisededition/StealArtifact.java
index 60d9155f6f..6f0c9a4cb9 100644
--- a/Mage.Sets/src/mage/sets/revisededition/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/revisededition/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/StoneGiant.java b/Mage.Sets/src/mage/sets/revisededition/StoneGiant.java
index 4ccec498dd..1a6b19d996 100644
--- a/Mage.Sets/src/mage/sets/revisededition/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/revisededition/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/StoneRain.java b/Mage.Sets/src/mage/sets/revisededition/StoneRain.java
index 4d64ca7ec5..bb78401a07 100644
--- a/Mage.Sets/src/mage/sets/revisededition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/revisededition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/StreamOfLife.java b/Mage.Sets/src/mage/sets/revisededition/StreamOfLife.java
index 1400ae3ded..f6aea25058 100644
--- a/Mage.Sets/src/mage/sets/revisededition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/revisededition/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SunglassesOfUrza.java b/Mage.Sets/src/mage/sets/revisededition/SunglassesOfUrza.java
index e362a3def2..17b06eea51 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SunglassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SunglassesOfUrza.java
@@ -37,7 +37,7 @@ public class SunglassesOfUrza extends mage.sets.limitedalpha.SunglassesOfUrza {
 
     public SunglassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/revisededition/SwordsToPlowshares.java
index 380d2fbc72..87ded28d2c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/revisededition/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Taiga.java b/Mage.Sets/src/mage/sets/revisededition/Taiga.java
index 5c25b18f6d..101355e443 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Taiga.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Taiga.java
@@ -37,7 +37,7 @@ public class Taiga extends mage.sets.limitedalpha.Taiga {
 
     public Taiga(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Terror.java b/Mage.Sets/src/mage/sets/revisededition/Terror.java
index 6aaf6b1131..e474241632 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Terror.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/TheHive.java b/Mage.Sets/src/mage/sets/revisededition/TheHive.java
index 0ec91c0f90..aa2f7bb208 100644
--- a/Mage.Sets/src/mage/sets/revisededition/TheHive.java
+++ b/Mage.Sets/src/mage/sets/revisededition/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/TheRack.java b/Mage.Sets/src/mage/sets/revisededition/TheRack.java
index 2b74e8e34e..818efb3a94 100644
--- a/Mage.Sets/src/mage/sets/revisededition/TheRack.java
+++ b/Mage.Sets/src/mage/sets/revisededition/TheRack.java
@@ -37,7 +37,7 @@ public class TheRack extends mage.sets.fourthedition.TheRack {
 
     public TheRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/revisededition/ThicketBasilisk.java
index 9bc0b6f43e..5a1ad86a58 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Thoughtlace.java b/Mage.Sets/src/mage/sets/revisededition/Thoughtlace.java
index a0415d3b7e..b6d800378d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Thoughtlace.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Thoughtlace.java
@@ -37,7 +37,7 @@ public class Thoughtlace extends mage.sets.limitedbeta.Thoughtlace {
 
     public Thoughtlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/revisededition/ThroneOfBone.java
index b75e771187..0bb533681d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/TitaniasSong.java b/Mage.Sets/src/mage/sets/revisededition/TitaniasSong.java
index 4a37eade65..3c6453644d 100644
--- a/Mage.Sets/src/mage/sets/revisededition/TitaniasSong.java
+++ b/Mage.Sets/src/mage/sets/revisededition/TitaniasSong.java
@@ -37,7 +37,7 @@ public class TitaniasSong extends mage.sets.fourthedition.TitaniasSong {
 
     public TitaniasSong(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Tranquility.java b/Mage.Sets/src/mage/sets/revisededition/Tranquility.java
index 92d5481e30..f34951221b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/TropicalIsland.java b/Mage.Sets/src/mage/sets/revisededition/TropicalIsland.java
index 5323531a79..79a57a60b7 100644
--- a/Mage.Sets/src/mage/sets/revisededition/TropicalIsland.java
+++ b/Mage.Sets/src/mage/sets/revisededition/TropicalIsland.java
@@ -37,7 +37,7 @@ public class TropicalIsland extends mage.sets.limitedalpha.TropicalIsland {
 
     public TropicalIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Tsunami.java b/Mage.Sets/src/mage/sets/revisededition/Tsunami.java
index 6c38ca174e..bcc162f56e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Tsunami.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Tsunami.java
@@ -37,7 +37,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
 
     public Tsunami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Tundra.java b/Mage.Sets/src/mage/sets/revisededition/Tundra.java
index 53cae7f1a6..4d229b58f7 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Tundra.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Tundra.java
@@ -37,7 +37,7 @@ public class Tundra extends mage.sets.limitedalpha.Tundra {
 
     public Tundra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/UndergroundSea.java b/Mage.Sets/src/mage/sets/revisededition/UndergroundSea.java
index 377d548f80..3db9cafe0c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/UndergroundSea.java
+++ b/Mage.Sets/src/mage/sets/revisededition/UndergroundSea.java
@@ -37,7 +37,7 @@ public class UndergroundSea extends mage.sets.limitedalpha.UndergroundSea {
 
     public UndergroundSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/UnholyStrength.java b/Mage.Sets/src/mage/sets/revisededition/UnholyStrength.java
index c61db880cf..1d37eec608 100644
--- a/Mage.Sets/src/mage/sets/revisededition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/revisededition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/UnstableMutation.java b/Mage.Sets/src/mage/sets/revisededition/UnstableMutation.java
index a1e569a9b0..2708a68999 100644
--- a/Mage.Sets/src/mage/sets/revisededition/UnstableMutation.java
+++ b/Mage.Sets/src/mage/sets/revisededition/UnstableMutation.java
@@ -38,7 +38,7 @@ public class UnstableMutation extends mage.sets.arabiannights.UnstableMutation {
 
     public UnstableMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Unsummon.java b/Mage.Sets/src/mage/sets/revisededition/Unsummon.java
index 2da4ec43cf..9aecf1fa2f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/UthdenTroll.java b/Mage.Sets/src/mage/sets/revisededition/UthdenTroll.java
index abe6f897f1..c55a6376e0 100644
--- a/Mage.Sets/src/mage/sets/revisededition/UthdenTroll.java
+++ b/Mage.Sets/src/mage/sets/revisededition/UthdenTroll.java
@@ -37,7 +37,7 @@ public class UthdenTroll extends mage.sets.limitedalpha.UthdenTroll {
 
     public UthdenTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/revisededition/VerduranEnchantress.java
index b6f9614b99..97244006a5 100644
--- a/Mage.Sets/src/mage/sets/revisededition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/revisededition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/VesuvanDoppelganger.java b/Mage.Sets/src/mage/sets/revisededition/VesuvanDoppelganger.java
index 5fd71e36ee..00718c65dc 100644
--- a/Mage.Sets/src/mage/sets/revisededition/VesuvanDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/revisededition/VesuvanDoppelganger.java
@@ -37,7 +37,7 @@ public class VesuvanDoppelganger extends mage.sets.unlimitededition.VesuvanDoppe
 
     public VesuvanDoppelganger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/VolcanicEruption.java b/Mage.Sets/src/mage/sets/revisededition/VolcanicEruption.java
index e49007e924..379997b843 100644
--- a/Mage.Sets/src/mage/sets/revisededition/VolcanicEruption.java
+++ b/Mage.Sets/src/mage/sets/revisededition/VolcanicEruption.java
@@ -37,7 +37,7 @@ public class VolcanicEruption extends mage.sets.unlimitededition.VolcanicEruptio
 
     public VolcanicEruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/VolcanicIsland.java b/Mage.Sets/src/mage/sets/revisededition/VolcanicIsland.java
index 7779a25185..399fe000b4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/VolcanicIsland.java
+++ b/Mage.Sets/src/mage/sets/revisededition/VolcanicIsland.java
@@ -37,7 +37,7 @@ public class VolcanicIsland extends mage.sets.unlimitededition.VolcanicIsland {
 
     public VolcanicIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfAir.java b/Mage.Sets/src/mage/sets/revisededition/WallOfAir.java
index f8ca2f30b1..ede16aa9cf 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfBone.java b/Mage.Sets/src/mage/sets/revisededition/WallOfBone.java
index 39aa0d9e71..5c49e7a19a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfBrambles.java b/Mage.Sets/src/mage/sets/revisededition/WallOfBrambles.java
index 73124ae816..2c9f2eab4c 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfBrambles.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfBrambles.java
@@ -37,7 +37,7 @@ public class WallOfBrambles extends mage.sets.limitedalpha.WallOfBrambles {
 
     public WallOfBrambles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfFire.java b/Mage.Sets/src/mage/sets/revisededition/WallOfFire.java
index 5983d90d3f..a857d50540 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfIce.java b/Mage.Sets/src/mage/sets/revisededition/WallOfIce.java
index 3de3ef32cc..61f1b5e539 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfIce.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfIce.java
@@ -37,7 +37,7 @@ public class WallOfIce extends mage.sets.fourthedition.WallOfIce {
 
     public WallOfIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfStone.java b/Mage.Sets/src/mage/sets/revisededition/WallOfStone.java
index 724691cf5a..5463b14e7a 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfStone.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfStone.java
@@ -37,7 +37,7 @@ public class WallOfStone extends mage.sets.fifthedition.WallOfStone {
 
     public WallOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfSwords.java b/Mage.Sets/src/mage/sets/revisededition/WallOfSwords.java
index 7933df26b2..63d713c778 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java b/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java
index 61a9f94299..5dad2b9ac3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java
@@ -38,7 +38,7 @@ public class WallOfWater extends mage.sets.limitedalpha.WallOfWater {
 
     public WallOfWater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfWood.java b/Mage.Sets/src/mage/sets/revisededition/WallOfWood.java
index f23abfe700..1990db4c92 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WallOfWood.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WallOfWood.java
@@ -37,7 +37,7 @@ public class WallOfWood extends mage.sets.tenthedition.WallOfWood {
 
     public WallOfWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Wanderlust.java b/Mage.Sets/src/mage/sets/revisededition/Wanderlust.java
index 02c187be07..a7bc6366aa 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Wanderlust.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Wanderlust.java
@@ -37,7 +37,7 @@ public class Wanderlust extends mage.sets.unlimitededition.Wanderlust {
 
     public Wanderlust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WarMammoth.java b/Mage.Sets/src/mage/sets/revisededition/WarMammoth.java
index cd5f79ed7d..ff765acb44 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WarMammoth.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WarMammoth.java
@@ -37,7 +37,7 @@ public class WarMammoth extends mage.sets.fifthedition.WarMammoth {
 
     public WarMammoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WarpArtifact.java b/Mage.Sets/src/mage/sets/revisededition/WarpArtifact.java
index 91b62bfed2..21d84fbea2 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WarpArtifact.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WarpArtifact.java
@@ -37,7 +37,7 @@ public class WarpArtifact extends mage.sets.fifthedition.WarpArtifact {
 
     public WarpArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WaterElemental.java b/Mage.Sets/src/mage/sets/revisededition/WaterElemental.java
index 00b98cc6b2..a3d23d6132 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WaterElemental.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WaterElemental.java
@@ -37,7 +37,7 @@ public class WaterElemental extends mage.sets.fourthedition.WaterElemental {
 
     public WaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Weakness.java b/Mage.Sets/src/mage/sets/revisededition/Weakness.java
index 37179a948c..a04974a0e8 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Weakness.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/Web.java b/Mage.Sets/src/mage/sets/revisededition/Web.java
index 322eb7c771..abe0ac3a0f 100644
--- a/Mage.Sets/src/mage/sets/revisededition/Web.java
+++ b/Mage.Sets/src/mage/sets/revisededition/Web.java
@@ -38,7 +38,7 @@ public class Web extends mage.sets.limitedalpha.Web {
 
     public Web(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WheelOfFortune.java b/Mage.Sets/src/mage/sets/revisededition/WheelOfFortune.java
index 1b082d7b7c..b665838dd1 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WheelOfFortune.java
@@ -36,7 +36,7 @@ public class WheelOfFortune extends mage.sets.limitedalpha.WheelOfFortune {
 
     public WheelOfFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WhiteKnight.java b/Mage.Sets/src/mage/sets/revisededition/WhiteKnight.java
index 329a80b8f7..7fbd2c27a3 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WhiteWard.java b/Mage.Sets/src/mage/sets/revisededition/WhiteWard.java
index 00586a2358..3ce58fa6e6 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WhiteWard.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WhiteWard.java
@@ -37,7 +37,7 @@ public class WhiteWard extends mage.sets.limitedbeta.WhiteWard {
 
     public WhiteWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WildGrowth.java b/Mage.Sets/src/mage/sets/revisededition/WildGrowth.java
index b8eb2f8b94..891270ef8b 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WillOTheWisp.java b/Mage.Sets/src/mage/sets/revisededition/WillOTheWisp.java
index 57fa78b2a9..ed9eca7514 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WillOTheWisp.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WillOTheWisp.java
@@ -37,7 +37,7 @@ public class WillOTheWisp extends mage.sets.limitedalpha.WillOTheWisp {
 
     public WillOTheWisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WinterOrb.java b/Mage.Sets/src/mage/sets/revisededition/WinterOrb.java
index 2d099b57ad..4c09fa880e 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WinterOrb.java
@@ -37,7 +37,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WoodenSphere.java b/Mage.Sets/src/mage/sets/revisededition/WoodenSphere.java
index 6e3f3335c8..460eaea2b4 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/WrathOfGod.java b/Mage.Sets/src/mage/sets/revisededition/WrathOfGod.java
index 36366fefc6..bb18591526 100644
--- a/Mage.Sets/src/mage/sets/revisededition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/revisededition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/revisededition/ZombieMaster.java b/Mage.Sets/src/mage/sets/revisededition/ZombieMaster.java
index 4837bdf584..0effddd0bc 100644
--- a/Mage.Sets/src/mage/sets/revisededition/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/revisededition/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "3ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Demystify.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Demystify.java
index 646d2be0e9..3404ef4e16 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Demystify.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Demystify.java
@@ -38,7 +38,7 @@ public class Demystify extends mage.sets.tenthedition.Demystify {
 
     public Demystify (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "ROE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java
index a3ce223383..799a157f40 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java
@@ -38,7 +38,7 @@ public class Naturalize extends mage.sets.tenthedition.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "ROE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Regress.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Regress.java
index cf8ac67f1f..492f50d823 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Regress.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Regress.java
@@ -38,7 +38,7 @@ public class Regress extends mage.sets.mirrodin.Regress {
 
     public Regress (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "ROE";
     }
 
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Twincast.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Twincast.java
index 6d3fa00144..a718a9d3cc 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Twincast.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Twincast.java
@@ -37,7 +37,7 @@ public class Twincast extends mage.sets.magic2010.Twincast {
 
     public Twincast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "SOK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Arrest.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Arrest.java
index 8ecc84ddc9..6f0356849e 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Arrest.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Arrest.java
@@ -38,7 +38,7 @@ public class Arrest extends mage.sets.mirrodin.Arrest {
 
     public Arrest (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperMyr.java
index 46cfde912a..05ff9c337a 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperMyr.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperMyr.java
@@ -38,7 +38,7 @@ public class CopperMyr extends mage.sets.mirrodin.CopperMyr {
 
     public CopperMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldMyr.java
index 2b724cdb6e..74f431a3da 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldMyr.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldMyr.java
@@ -38,7 +38,7 @@ public class GoldMyr extends mage.sets.mirrodin.GoldMyr {
 
     public GoldMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IronMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IronMyr.java
index fd5a05682e..91624a9afb 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IronMyr.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IronMyr.java
@@ -38,7 +38,7 @@ public class IronMyr extends mage.sets.mirrodin.IronMyr {
 
     public IronMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeadenMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeadenMyr.java
index 182cef2edd..30dc4c0768 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeadenMyr.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeadenMyr.java
@@ -38,7 +38,7 @@ public class LeadenMyr extends mage.sets.mirrodin.LeadenMyr {
 
     public LeadenMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java
index 6bf5cf06e7..324c00af20 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java
@@ -38,7 +38,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SilverMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SilverMyr.java
index 6da98784ea..33f4c85228 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SilverMyr.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SilverMyr.java
@@ -38,7 +38,7 @@ public class SilverMyr extends mage.sets.mirrodin.SilverMyr {
 
     public SilverMyr (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "SOM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/AmbushCommander.java b/Mage.Sets/src/mage/sets/scourge/AmbushCommander.java
index 0e0024f1b2..e4a6bd72f1 100644
--- a/Mage.Sets/src/mage/sets/scourge/AmbushCommander.java
+++ b/Mage.Sets/src/mage/sets/scourge/AmbushCommander.java
@@ -37,7 +37,7 @@ public class AmbushCommander extends mage.sets.elvesvsgoblins.AmbushCommander {
 
     public AmbushCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/BladewingTheRisen.java b/Mage.Sets/src/mage/sets/scourge/BladewingTheRisen.java
index 7803a49444..c53942adba 100644
--- a/Mage.Sets/src/mage/sets/scourge/BladewingTheRisen.java
+++ b/Mage.Sets/src/mage/sets/scourge/BladewingTheRisen.java
@@ -37,7 +37,7 @@ public class BladewingTheRisen extends mage.sets.commander.BladewingTheRisen {
 
     public BladewingTheRisen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/CallToTheGrave.java b/Mage.Sets/src/mage/sets/scourge/CallToTheGrave.java
index 3457332ac8..65566c3df1 100644
--- a/Mage.Sets/src/mage/sets/scourge/CallToTheGrave.java
+++ b/Mage.Sets/src/mage/sets/scourge/CallToTheGrave.java
@@ -37,7 +37,7 @@ public class CallToTheGrave extends mage.sets.magic2012.CallToTheGrave {
 
     public CallToTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/ClawsOfWirewood.java b/Mage.Sets/src/mage/sets/scourge/ClawsOfWirewood.java
index 09a46a8215..d69d3a7a70 100644
--- a/Mage.Sets/src/mage/sets/scourge/ClawsOfWirewood.java
+++ b/Mage.Sets/src/mage/sets/scourge/ClawsOfWirewood.java
@@ -38,7 +38,7 @@ public class ClawsOfWirewood extends mage.sets.vintagemasters.ClawsOfWirewood {
 
     public ClawsOfWirewood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "SCG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/scourge/DecreeOfJustice.java b/Mage.Sets/src/mage/sets/scourge/DecreeOfJustice.java
index 2ab5126521..a433151a64 100644
--- a/Mage.Sets/src/mage/sets/scourge/DecreeOfJustice.java
+++ b/Mage.Sets/src/mage/sets/scourge/DecreeOfJustice.java
@@ -37,7 +37,7 @@ public class DecreeOfJustice extends mage.sets.vintagemasters.DecreeOfJustice {
 
     public DecreeOfJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/DecreeOfPain.java b/Mage.Sets/src/mage/sets/scourge/DecreeOfPain.java
index 8ee6f276ea..fbb605d7d9 100644
--- a/Mage.Sets/src/mage/sets/scourge/DecreeOfPain.java
+++ b/Mage.Sets/src/mage/sets/scourge/DecreeOfPain.java
@@ -37,7 +37,7 @@ public class DecreeOfPain extends mage.sets.commander2013.DecreeOfPain {
 
     public DecreeOfPain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/DragonBreath.java b/Mage.Sets/src/mage/sets/scourge/DragonBreath.java
index 949a856ca6..1a6605ea3a 100644
--- a/Mage.Sets/src/mage/sets/scourge/DragonBreath.java
+++ b/Mage.Sets/src/mage/sets/scourge/DragonBreath.java
@@ -37,7 +37,7 @@ public class DragonBreath extends mage.sets.archenemy.DragonBreath {
 
     public DragonBreath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/Dragonstorm.java b/Mage.Sets/src/mage/sets/scourge/Dragonstorm.java
index 48c5e55c28..2d3c3d55b1 100644
--- a/Mage.Sets/src/mage/sets/scourge/Dragonstorm.java
+++ b/Mage.Sets/src/mage/sets/scourge/Dragonstorm.java
@@ -38,7 +38,7 @@ public class Dragonstorm extends mage.sets.timeshifted.Dragonstorm {
 
     public Dragonstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "SCG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/scourge/Enrage.java b/Mage.Sets/src/mage/sets/scourge/Enrage.java
index 6bcab68a40..c7480a7b34 100644
--- a/Mage.Sets/src/mage/sets/scourge/Enrage.java
+++ b/Mage.Sets/src/mage/sets/scourge/Enrage.java
@@ -37,7 +37,7 @@ public class Enrage extends mage.sets.ninthedition.Enrage {
 
     public Enrage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/FierceEmpath.java b/Mage.Sets/src/mage/sets/scourge/FierceEmpath.java
index 1517493a1b..9b994f470c 100644
--- a/Mage.Sets/src/mage/sets/scourge/FierceEmpath.java
+++ b/Mage.Sets/src/mage/sets/scourge/FierceEmpath.java
@@ -37,7 +37,7 @@ public class FierceEmpath extends mage.sets.commander.FierceEmpath {
 
     public FierceEmpath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/FrozenSolid.java b/Mage.Sets/src/mage/sets/scourge/FrozenSolid.java
index 813839c440..643c83e134 100644
--- a/Mage.Sets/src/mage/sets/scourge/FrozenSolid.java
+++ b/Mage.Sets/src/mage/sets/scourge/FrozenSolid.java
@@ -37,7 +37,7 @@ public class FrozenSolid extends mage.sets.coldsnap.FrozenSolid {
 
     public FrozenSolid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/GildedLight.java b/Mage.Sets/src/mage/sets/scourge/GildedLight.java
index 6bbe5349a7..6274218f9f 100644
--- a/Mage.Sets/src/mage/sets/scourge/GildedLight.java
+++ b/Mage.Sets/src/mage/sets/scourge/GildedLight.java
@@ -38,7 +38,7 @@ public class GildedLight extends mage.sets.vintagemasters.GildedLight {
 
     public GildedLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "SCG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/scourge/GoblinBrigand.java b/Mage.Sets/src/mage/sets/scourge/GoblinBrigand.java
index 4c203de0a7..6c82a31e22 100644
--- a/Mage.Sets/src/mage/sets/scourge/GoblinBrigand.java
+++ b/Mage.Sets/src/mage/sets/scourge/GoblinBrigand.java
@@ -37,7 +37,7 @@ public class GoblinBrigand extends mage.sets.ninthedition.GoblinBrigand {
 
     public GoblinBrigand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/MindsDesire.java b/Mage.Sets/src/mage/sets/scourge/MindsDesire.java
index d87ede1850..d2987a8c60 100644
--- a/Mage.Sets/src/mage/sets/scourge/MindsDesire.java
+++ b/Mage.Sets/src/mage/sets/scourge/MindsDesire.java
@@ -37,7 +37,7 @@ public class MindsDesire extends mage.sets.vintagemasters.MindsDesire {
 
     public MindsDesire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/Nefashu.java b/Mage.Sets/src/mage/sets/scourge/Nefashu.java
index 97bf2f9121..b8f443ca94 100644
--- a/Mage.Sets/src/mage/sets/scourge/Nefashu.java
+++ b/Mage.Sets/src/mage/sets/scourge/Nefashu.java
@@ -37,7 +37,7 @@ public class Nefashu extends mage.sets.planechase.Nefashu {
 
     public Nefashu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/RainOfBlades.java b/Mage.Sets/src/mage/sets/scourge/RainOfBlades.java
index 263814dd03..a2ca9721d4 100644
--- a/Mage.Sets/src/mage/sets/scourge/RainOfBlades.java
+++ b/Mage.Sets/src/mage/sets/scourge/RainOfBlades.java
@@ -37,7 +37,7 @@ public class RainOfBlades extends mage.sets.magic2013.RainOfBlades {
 
     public RainOfBlades(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/RiptideSurvivor.java b/Mage.Sets/src/mage/sets/scourge/RiptideSurvivor.java
index 4c47f177e6..52639e051b 100644
--- a/Mage.Sets/src/mage/sets/scourge/RiptideSurvivor.java
+++ b/Mage.Sets/src/mage/sets/scourge/RiptideSurvivor.java
@@ -37,7 +37,7 @@ public class RiptideSurvivor extends mage.sets.commander2014.RiptideSurvivor {
 
     public RiptideSurvivor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/RushOfKnowledge.java b/Mage.Sets/src/mage/sets/scourge/RushOfKnowledge.java
index d8aa496854..1372c4bc22 100644
--- a/Mage.Sets/src/mage/sets/scourge/RushOfKnowledge.java
+++ b/Mage.Sets/src/mage/sets/scourge/RushOfKnowledge.java
@@ -37,7 +37,7 @@ public class RushOfKnowledge extends mage.sets.commander2014.RushOfKnowledge {
 
     public RushOfKnowledge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/scourge/SiegeGangCommander.java
index da63578d7d..5ac7895f03 100644
--- a/Mage.Sets/src/mage/sets/scourge/SiegeGangCommander.java
+++ b/Mage.Sets/src/mage/sets/scourge/SiegeGangCommander.java
@@ -37,7 +37,7 @@ public class SiegeGangCommander extends mage.sets.magic2010.SiegeGangCommander {
 
     public SiegeGangCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/SilverKnight.java b/Mage.Sets/src/mage/sets/scourge/SilverKnight.java
index 491cf8eb6b..732fedfc14 100644
--- a/Mage.Sets/src/mage/sets/scourge/SilverKnight.java
+++ b/Mage.Sets/src/mage/sets/scourge/SilverKnight.java
@@ -37,7 +37,7 @@ public class SilverKnight extends mage.sets.knightsvsdragons.SilverKnight {
 
     public SilverKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/SoulCollector.java b/Mage.Sets/src/mage/sets/scourge/SoulCollector.java
index 50d9ba2a16..e509eb7c77 100644
--- a/Mage.Sets/src/mage/sets/scourge/SoulCollector.java
+++ b/Mage.Sets/src/mage/sets/scourge/SoulCollector.java
@@ -38,7 +38,7 @@ public class SoulCollector extends mage.sets.timeshifted.SoulCollector {
 
     public SoulCollector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "SCG";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/scourge/SparkSpray.java b/Mage.Sets/src/mage/sets/scourge/SparkSpray.java
index 715bd76bb6..59d586821f 100644
--- a/Mage.Sets/src/mage/sets/scourge/SparkSpray.java
+++ b/Mage.Sets/src/mage/sets/scourge/SparkSpray.java
@@ -37,7 +37,7 @@ public class SparkSpray extends mage.sets.vintagemasters.SparkSpray {
 
     public SparkSpray(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/TempleOfTheFalseGod.java b/Mage.Sets/src/mage/sets/scourge/TempleOfTheFalseGod.java
index 82730c1958..198a3f224d 100644
--- a/Mage.Sets/src/mage/sets/scourge/TempleOfTheFalseGod.java
+++ b/Mage.Sets/src/mage/sets/scourge/TempleOfTheFalseGod.java
@@ -37,7 +37,7 @@ public class TempleOfTheFalseGod extends mage.sets.commander2013.TempleOfTheFals
 
     public TempleOfTheFalseGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java b/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java
index c370ac734e..74fbc5d41b 100644
--- a/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java
+++ b/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java
@@ -38,7 +38,7 @@ public class TwistedAbomination extends mage.sets.timeshifted.TwistedAbomination
 
     public TwistedAbomination(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "SCG";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/scourge/UndeadWarchief.java b/Mage.Sets/src/mage/sets/scourge/UndeadWarchief.java
index 9157598e0b..43d3d15505 100644
--- a/Mage.Sets/src/mage/sets/scourge/UndeadWarchief.java
+++ b/Mage.Sets/src/mage/sets/scourge/UndeadWarchief.java
@@ -37,7 +37,7 @@ public class UndeadWarchief extends mage.sets.planechase.UndeadWarchief {
 
     public UndeadWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/Upwelling.java b/Mage.Sets/src/mage/sets/scourge/Upwelling.java
index 72312408b1..8860258839 100644
--- a/Mage.Sets/src/mage/sets/scourge/Upwelling.java
+++ b/Mage.Sets/src/mage/sets/scourge/Upwelling.java
@@ -37,7 +37,7 @@ public class Upwelling extends mage.sets.tenthedition.Upwelling {
 
     public Upwelling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "SCG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/ZealousInquisitor.java b/Mage.Sets/src/mage/sets/scourge/ZealousInquisitor.java
index bc7954686e..b61faa66f3 100644
--- a/Mage.Sets/src/mage/sets/scourge/ZealousInquisitor.java
+++ b/Mage.Sets/src/mage/sets/scourge/ZealousInquisitor.java
@@ -38,7 +38,7 @@ public class ZealousInquisitor extends mage.sets.ninthedition.ZealousInquisitor
 
     public ZealousInquisitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "SCG";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AbyssalHorror.java b/Mage.Sets/src/mage/sets/seventhedition/AbyssalHorror.java
index 3887b1fb0d..2efac74948 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AbyssalHorror.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AbyssalHorror.java
@@ -37,7 +37,7 @@ public class AbyssalHorror extends mage.sets.urzassaga.AbyssalHorror {
 
     public AbyssalHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/seventhedition/AbyssalSpecter.java
index 27caa2f190..092e637e95 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AbyssalSpecter.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AbyssalSpecter.java
@@ -37,7 +37,7 @@ public class AbyssalSpecter extends mage.sets.fifthedition.AbyssalSpecter {
 
     public AbyssalSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AdarkarWastes.java b/Mage.Sets/src/mage/sets/seventhedition/AdarkarWastes.java
index db1dda5c11..3f0dc3117c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AdarkarWastes.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AdarkarWastes.java
@@ -37,7 +37,7 @@ public class AdarkarWastes extends mage.sets.tenthedition.AdarkarWastes {
 
     public AdarkarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AirElemental.java b/Mage.Sets/src/mage/sets/seventhedition/AirElemental.java
index b89bd08374..4aa9975b5f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Anaconda.java b/Mage.Sets/src/mage/sets/seventhedition/Anaconda.java
index 5250719cab..c44210ae58 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Anaconda.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Anaconda.java
@@ -37,7 +37,7 @@ public class Anaconda extends mage.sets.urzassaga.Anaconda {
 
     public Anaconda(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AncientSilverback.java b/Mage.Sets/src/mage/sets/seventhedition/AncientSilverback.java
index 85e5a28a49..1e007e258e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AncientSilverback.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AncientSilverback.java
@@ -37,7 +37,7 @@ public class AncientSilverback extends mage.sets.urzasdestiny.AncientSilverback
 
     public AncientSilverback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AngelicPage.java b/Mage.Sets/src/mage/sets/seventhedition/AngelicPage.java
index ff1308560c..ccddcd0404 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AngelicPage.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AngelicPage.java
@@ -37,7 +37,7 @@ public class AngelicPage extends mage.sets.urzassaga.AngelicPage {
 
     public AngelicPage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ArcaneLaboratory.java b/Mage.Sets/src/mage/sets/seventhedition/ArcaneLaboratory.java
index f4c38c41e5..a81f2ea938 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ArcaneLaboratory.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ArcaneLaboratory.java
@@ -37,7 +37,7 @@ public class ArcaneLaboratory extends mage.sets.urzassaga.ArcaneLaboratory {
 
     public ArcaneLaboratory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Archivist.java b/Mage.Sets/src/mage/sets/seventhedition/Archivist.java
index 825e59db04..84a52c58c1 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Archivist.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Archivist.java
@@ -37,7 +37,7 @@ public class Archivist extends mage.sets.urzaslegacy.Archivist {
 
     public Archivist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ArdentMilitia.java b/Mage.Sets/src/mage/sets/seventhedition/ArdentMilitia.java
index 289f8e09dd..1bb334ab7f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ArdentMilitia.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ArdentMilitia.java
@@ -37,7 +37,7 @@ public class ArdentMilitia extends mage.sets.eighthedition.ArdentMilitia {
 
     public ArdentMilitia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/seventhedition/BalduvianBarbarians.java
index f11efb6ff7..1b9aa73004 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BalduvianBarbarians.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BalduvianBarbarians.java
@@ -37,7 +37,7 @@ public class BalduvianBarbarians extends mage.sets.ninthedition.BalduvianBarbari
 
     public BalduvianBarbarians(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BalefulStare.java b/Mage.Sets/src/mage/sets/seventhedition/BalefulStare.java
index 7cf298f37f..87d4400258 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BalefulStare.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BalefulStare.java
@@ -38,7 +38,7 @@ public class BalefulStare extends mage.sets.ninthedition.BalefulStare {
 
     public BalefulStare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BeastOfBurden.java b/Mage.Sets/src/mage/sets/seventhedition/BeastOfBurden.java
index 84ab8d83dc..dec3500575 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BeastOfBurden.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BeastOfBurden.java
@@ -37,7 +37,7 @@ public class BeastOfBurden extends mage.sets.ninthedition.BeastOfBurden {
 
     public BeastOfBurden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Bedlam.java b/Mage.Sets/src/mage/sets/seventhedition/Bedlam.java
index 29e9ec7bd1..43aeb87910 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Bedlam.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Bedlam.java
@@ -37,7 +37,7 @@ public class Bedlam extends mage.sets.urzassaga.Bedlam {
 
     public Bedlam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Befoul.java b/Mage.Sets/src/mage/sets/seventhedition/Befoul.java
index a63aa7d6df..ff039453d7 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Befoul.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Befoul.java
@@ -38,7 +38,7 @@ public class Befoul extends mage.sets.championsofkamigawa.Befoul {
 
     public Befoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BellowingFiend.java b/Mage.Sets/src/mage/sets/seventhedition/BellowingFiend.java
index 020d43c439..630e674c62 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BellowingFiend.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BellowingFiend.java
@@ -38,7 +38,7 @@ public class BellowingFiend extends mage.sets.tempest.BellowingFiend {
 
     public BellowingFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BenthicBehemoth.java b/Mage.Sets/src/mage/sets/seventhedition/BenthicBehemoth.java
index ff1953c579..61aafc92c2 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BenthicBehemoth.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BenthicBehemoth.java
@@ -37,7 +37,7 @@ public class BenthicBehemoth extends mage.sets.tempest.BenthicBehemoth {
 
     public BenthicBehemoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Bereavement.java b/Mage.Sets/src/mage/sets/seventhedition/Bereavement.java
index bc6690d42d..f798bae650 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Bereavement.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Bereavement.java
@@ -37,7 +37,7 @@ public class Bereavement extends mage.sets.urzassaga.Bereavement {
 
     public Bereavement(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/seventhedition/BirdsOfParadise.java
index 433755a482..e5d2bc0ac9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/seventhedition/BlanchwoodArmor.java
index eecbf05644..ef6f2fdf6b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BlanchwoodArmor.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BlanchwoodArmor.java
@@ -37,7 +37,7 @@ public class BlanchwoodArmor extends mage.sets.tenthedition.BlanchwoodArmor {
 
     public BlanchwoodArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Blaze.java b/Mage.Sets/src/mage/sets/seventhedition/Blaze.java
index ec4b28c499..82f189b2be 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Blaze.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BlessedReversal.java b/Mage.Sets/src/mage/sets/seventhedition/BlessedReversal.java
index 94523e0e55..6a7c8618e0 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BlessedReversal.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BlessedReversal.java
@@ -37,7 +37,7 @@ public class BlessedReversal extends mage.sets.urzaslegacy.BlessedReversal {
 
     public BlessedReversal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BloodPet.java b/Mage.Sets/src/mage/sets/seventhedition/BloodPet.java
index 967972f286..fb50a86752 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BloodPet.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BloodPet.java
@@ -37,7 +37,7 @@ public class BloodPet extends mage.sets.tempest.BloodPet {
 
     public BloodPet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BloodshotCyclops.java b/Mage.Sets/src/mage/sets/seventhedition/BloodshotCyclops.java
index 9de0541266..73545aac07 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BloodshotCyclops.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BloodshotCyclops.java
@@ -37,7 +37,7 @@ public class BloodshotCyclops extends mage.sets.urzasdestiny.BloodshotCyclops {
 
     public BloodshotCyclops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BogImp.java b/Mage.Sets/src/mage/sets/seventhedition/BogImp.java
index 709dd8e1e4..ed8e5139cb 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BogImp.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BogWraith.java b/Mage.Sets/src/mage/sets/seventhedition/BogWraith.java
index 781fc0dc08..cfce835f3f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Boil.java b/Mage.Sets/src/mage/sets/seventhedition/Boil.java
index 89edc89c84..4e2e8eac00 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Boil.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Boil.java
@@ -37,7 +37,7 @@ public class Boil extends mage.sets.tempest.Boil {
 
     public Boil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Boomerang.java b/Mage.Sets/src/mage/sets/seventhedition/Boomerang.java
index 01da6943ad..84c0842e5b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Boomerang.java
@@ -37,7 +37,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BreathOfLife.java b/Mage.Sets/src/mage/sets/seventhedition/BreathOfLife.java
index e23d6ed453..60d3b71921 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BreathOfLife.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BreathOfLife.java
@@ -37,7 +37,7 @@ public class BreathOfLife extends mage.sets.starter2000.BreathOfLife {
 
     public BreathOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Brushland.java b/Mage.Sets/src/mage/sets/seventhedition/Brushland.java
index d29fe00e37..63a237c8c9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Brushland.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Brushland.java
@@ -37,7 +37,7 @@ public class Brushland extends mage.sets.tenthedition.Brushland {
 
     public Brushland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 326;
+        this.cardNumber = "326";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/BullHippo.java b/Mage.Sets/src/mage/sets/seventhedition/BullHippo.java
index 40e06a5e05..cc7aba48fe 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/BullHippo.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/BullHippo.java
@@ -37,7 +37,7 @@ public class BullHippo extends mage.sets.urzassaga.BullHippo {
 
     public BullHippo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Caltrops.java b/Mage.Sets/src/mage/sets/seventhedition/Caltrops.java
index 43d25e9bc1..860c375bc2 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Caltrops.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Caltrops.java
@@ -38,7 +38,7 @@ public class Caltrops extends mage.sets.urzasdestiny.Caltrops {
 
     public Caltrops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CanopySpider.java b/Mage.Sets/src/mage/sets/seventhedition/CanopySpider.java
index 63f23f1837..76e192fa6f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CanopySpider.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CanopySpider.java
@@ -37,7 +37,7 @@ public class CanopySpider extends mage.sets.tempest.CanopySpider {
 
     public CanopySpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Castle.java b/Mage.Sets/src/mage/sets/seventhedition/Castle.java
index cd705adc58..d07e2856af 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Castle.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlack.java
index 28e4d0d55e..39f49965a9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlue.java
index eb003a00d9..2e510d60fc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionGreen.java
index d5d5b99a22..594bfd616f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionRed.java
index 3a8ed576bb..b6f36cad25 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionWhite.java
index e5781accf4..4350cee479 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CloudchaserEagle.java b/Mage.Sets/src/mage/sets/seventhedition/CloudchaserEagle.java
index fb91907b0d..458303087e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CloudchaserEagle.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CloudchaserEagle.java
@@ -37,7 +37,7 @@ public class CloudchaserEagle extends mage.sets.tempest.CloudchaserEagle {
 
     public CloudchaserEagle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CoatOfArms.java b/Mage.Sets/src/mage/sets/seventhedition/CoatOfArms.java
index e1660022af..589b198dc6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Confiscate.java b/Mage.Sets/src/mage/sets/seventhedition/Confiscate.java
index 19615f5a6d..cd21f294ab 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Confiscate.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Confiscate.java
@@ -37,7 +37,7 @@ public class Confiscate extends mage.sets.urzassaga.Confiscate {
 
     public Confiscate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CoralMerfolk.java b/Mage.Sets/src/mage/sets/seventhedition/CoralMerfolk.java
index 29f6689144..8e29bcfbc3 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CoralMerfolk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CoralMerfolk.java
@@ -37,7 +37,7 @@ public class CoralMerfolk extends mage.sets.magic2010.CoralMerfolk {
 
     public CoralMerfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java b/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java
index 9508eefee3..6f83eff051 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java
@@ -38,7 +38,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Counterspell.java b/Mage.Sets/src/mage/sets/seventhedition/Counterspell.java
index 369fdc4d37..64c4f9fccc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CreepingMold.java b/Mage.Sets/src/mage/sets/seventhedition/CreepingMold.java
index 61a4bfffbc..a37de87bc8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CreepingMold.java
@@ -37,7 +37,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CrossbowInfantry.java b/Mage.Sets/src/mage/sets/seventhedition/CrossbowInfantry.java
index a39e0cea5c..60ad171879 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CrossbowInfantry.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CrossbowInfantry.java
@@ -37,7 +37,7 @@ public class CrossbowInfantry extends mage.sets.ninthedition.CrossbowInfantry {
 
     public CrossbowInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CryptRats.java b/Mage.Sets/src/mage/sets/seventhedition/CryptRats.java
index 65cc2b7008..35a51cfbb1 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CryptRats.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CryptRats.java
@@ -38,7 +38,7 @@ public class CryptRats extends mage.sets.visions.CryptRats {
 
     public CryptRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/CrystalRod.java b/Mage.Sets/src/mage/sets/seventhedition/CrystalRod.java
index b738a57be2..75d316862b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DakmorLancer.java b/Mage.Sets/src/mage/sets/seventhedition/DakmorLancer.java
index baf438a3dc..fc6914a1ab 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DakmorLancer.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DakmorLancer.java
@@ -39,7 +39,7 @@ public class DakmorLancer extends mage.sets.starter1999.DakmorLancer {
 
     public DakmorLancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DaringApprentice.java b/Mage.Sets/src/mage/sets/seventhedition/DaringApprentice.java
index 97298c93d1..f1d5dbde61 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DaringApprentice.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DaringApprentice.java
@@ -37,7 +37,7 @@ public class DaringApprentice extends mage.sets.ninthedition.DaringApprentice {
 
     public DaringApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DarkBanishing.java b/Mage.Sets/src/mage/sets/seventhedition/DarkBanishing.java
index 7a02ff4a40..f80bb74513 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Deflection.java b/Mage.Sets/src/mage/sets/seventhedition/Deflection.java
index ac08c335f0..c8db52d602 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Deflection.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Deflection.java
@@ -37,7 +37,7 @@ public class Deflection extends mage.sets.iceage.Deflection {
 
     public Deflection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DelusionsOfMediocrity.java b/Mage.Sets/src/mage/sets/seventhedition/DelusionsOfMediocrity.java
index 22b21a5946..185d310de6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DelusionsOfMediocrity.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DelusionsOfMediocrity.java
@@ -37,7 +37,7 @@ public class DelusionsOfMediocrity extends mage.sets.urzaslegacy.DelusionsOfMedi
 
     public DelusionsOfMediocrity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DingusEgg.java b/Mage.Sets/src/mage/sets/seventhedition/DingusEgg.java
index d2f7233ee9..4568fdde47 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Disenchant.java b/Mage.Sets/src/mage/sets/seventhedition/Disenchant.java
index f8a9562b61..3df063dbba 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DregsOfSorrow.java b/Mage.Sets/src/mage/sets/seventhedition/DregsOfSorrow.java
index 2197f0a837..969201df6b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DregsOfSorrow.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DregsOfSorrow.java
@@ -37,7 +37,7 @@ public class DregsOfSorrow extends mage.sets.commander2014.DregsOfSorrow {
 
     public DregsOfSorrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/seventhedition/DrudgeSkeletons.java
index 71af3721d1..c0789e2e74 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Duress.java b/Mage.Sets/src/mage/sets/seventhedition/Duress.java
index 75330d0058..3202642d0d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Duress.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/EarlyHarvest.java b/Mage.Sets/src/mage/sets/seventhedition/EarlyHarvest.java
index e359c4c720..d2583e52fa 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/EarlyHarvest.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/EarlyHarvest.java
@@ -37,7 +37,7 @@ public class EarlyHarvest extends mage.sets.ninthedition.EarlyHarvest {
 
     public EarlyHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Earthquake.java b/Mage.Sets/src/mage/sets/seventhedition/Earthquake.java
index 40e4776de5..08d30ea009 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/EasternPaladin.java b/Mage.Sets/src/mage/sets/seventhedition/EasternPaladin.java
index 34f60fa2ff..a76d2d662f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/EasternPaladin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/EasternPaladin.java
@@ -37,7 +37,7 @@ public class EasternPaladin extends mage.sets.urzassaga.EasternPaladin {
 
     public EasternPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ElderDruid.java b/Mage.Sets/src/mage/sets/seventhedition/ElderDruid.java
index d3b6270d0f..675dc92d34 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ElderDruid.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ElderDruid.java
@@ -37,7 +37,7 @@ public class ElderDruid extends mage.sets.iceage.ElderDruid {
 
     public ElderDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/EliteArchers.java b/Mage.Sets/src/mage/sets/seventhedition/EliteArchers.java
index 54a06a4ea8..4b25c260c7 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/EliteArchers.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/EliteArchers.java
@@ -37,7 +37,7 @@ public class EliteArchers extends mage.sets.urzassaga.EliteArchers {
 
     public EliteArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ElvishArchers.java b/Mage.Sets/src/mage/sets/seventhedition/ElvishArchers.java
index 22c3824bfa..8eb566838f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ElvishChampion.java b/Mage.Sets/src/mage/sets/seventhedition/ElvishChampion.java
index bee841b068..92fa04da07 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ElvishChampion.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ElvishChampion.java
@@ -37,7 +37,7 @@ public class ElvishChampion extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java b/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java
index 9e7ce714c2..37b9eccc4c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java
@@ -38,7 +38,7 @@ public class ElvishLyrist extends mage.sets.urzassaga.ElvishLyrist {
 
     public ElvishLyrist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ElvishPiper.java b/Mage.Sets/src/mage/sets/seventhedition/ElvishPiper.java
index 0828d388ca..1dad33a2d2 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ElvishPiper.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ElvishPiper.java
@@ -37,7 +37,7 @@ public class ElvishPiper extends mage.sets.magic2010.ElvishPiper {
 
     public ElvishPiper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/EngineeredPlague.java b/Mage.Sets/src/mage/sets/seventhedition/EngineeredPlague.java
index 8e9e11df3a..1400027247 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/EngineeredPlague.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/EngineeredPlague.java
@@ -37,7 +37,7 @@ public class EngineeredPlague extends mage.sets.urzaslegacy.EngineeredPlague {
 
     public EngineeredPlague(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/EnsnaringBridge.java b/Mage.Sets/src/mage/sets/seventhedition/EnsnaringBridge.java
index df2a247eb4..f723423cbe 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/EnsnaringBridge.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/EnsnaringBridge.java
@@ -37,7 +37,7 @@ public class EnsnaringBridge extends mage.sets.stronghold.EnsnaringBridge {
 
     public EnsnaringBridge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Equilibrium.java b/Mage.Sets/src/mage/sets/seventhedition/Equilibrium.java
index d92c9a24f7..bcbf408e74 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Equilibrium.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Equilibrium.java
@@ -37,7 +37,7 @@ public class Equilibrium extends mage.sets.exodus.Equilibrium {
 
     public Equilibrium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Evacuation.java b/Mage.Sets/src/mage/sets/seventhedition/Evacuation.java
index 86eee2baee..beeecfca21 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Evacuation.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Evacuation.java
@@ -37,7 +37,7 @@ public class Evacuation extends mage.sets.stronghold.Evacuation {
 
     public Evacuation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Fear.java b/Mage.Sets/src/mage/sets/seventhedition/Fear.java
index fc9a18f537..dcf7de8e03 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Fear.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FemerefArchers.java b/Mage.Sets/src/mage/sets/seventhedition/FemerefArchers.java
index 95f26335a2..a803a4a271 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FemerefArchers.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FemerefArchers.java
@@ -37,7 +37,7 @@ public class FemerefArchers extends mage.sets.tenthedition.FemerefArchers {
 
     public FemerefArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FerozsBan.java b/Mage.Sets/src/mage/sets/seventhedition/FerozsBan.java
index d32512989e..7b7c76649e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FerozsBan.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FerozsBan.java
@@ -38,7 +38,7 @@ public class FerozsBan extends mage.sets.fifthedition.FerozsBan {
 
     public FerozsBan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Fervor.java b/Mage.Sets/src/mage/sets/seventhedition/Fervor.java
index 552fa08c4a..25cdb02544 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Fervor.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Fervor.java
@@ -37,7 +37,7 @@ public class Fervor extends mage.sets.magic2013.Fervor {
 
     public Fervor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FightingDrake.java b/Mage.Sets/src/mage/sets/seventhedition/FightingDrake.java
index aea8cc7d78..4b2cffb84c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FightingDrake.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FightingDrake.java
@@ -37,7 +37,7 @@ public class FightingDrake extends mage.sets.tempest.FightingDrake {
 
     public FightingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java b/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java
index e40063c4ad..23ae0232e3 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FleetingImage.java b/Mage.Sets/src/mage/sets/seventhedition/FleetingImage.java
index 663d4ec0a6..e91efebe89 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FleetingImage.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FleetingImage.java
@@ -37,7 +37,7 @@ public class FleetingImage extends mage.sets.ninthedition.FleetingImage {
 
     public FleetingImage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Flight.java b/Mage.Sets/src/mage/sets/seventhedition/Flight.java
index 321c122cb8..48c897854e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Flight.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Fog.java b/Mage.Sets/src/mage/sets/seventhedition/Fog.java
index 8c193fcc15..d1986f7b6d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Fog.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FoulImp.java b/Mage.Sets/src/mage/sets/seventhedition/FoulImp.java
index dd2e6bca83..cc95ddd10c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FoulImp.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FoulImp.java
@@ -38,7 +38,7 @@ public class FoulImp extends mage.sets.stronghold.FoulImp {
 
     public FoulImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FyndhornElder.java b/Mage.Sets/src/mage/sets/seventhedition/FyndhornElder.java
index 7d1b0ca257..6e415197e7 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FyndhornElder.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FyndhornElder.java
@@ -37,7 +37,7 @@ public class FyndhornElder extends mage.sets.iceage.FyndhornElder {
 
     public FyndhornElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GangOfElk.java b/Mage.Sets/src/mage/sets/seventhedition/GangOfElk.java
index d963206e0c..78d495b9e6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GangOfElk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GangOfElk.java
@@ -37,7 +37,7 @@ public class GangOfElk extends mage.sets.urzaslegacy.GangOfElk {
 
     public GangOfElk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GerrardsWisdom.java b/Mage.Sets/src/mage/sets/seventhedition/GerrardsWisdom.java
index 371611bba1..8717fd75bf 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GerrardsWisdom.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GerrardsWisdom.java
@@ -39,7 +39,7 @@ public class GerrardsWisdom extends mage.sets.starter1999.GerrardsWisdom {
 
     public GerrardsWisdom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GiantCockroach.java b/Mage.Sets/src/mage/sets/seventhedition/GiantCockroach.java
index 59eb7267a5..cc96eb8e4b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GiantCockroach.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GiantCockroach.java
@@ -37,7 +37,7 @@ public class GiantCockroach extends mage.sets.ninthedition.GiantCockroach {
 
     public GiantCockroach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/GiantGrowth.java
index 6293adaa64..42d1fd8907 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GiantSpider.java b/Mage.Sets/src/mage/sets/seventhedition/GiantSpider.java
index 9452735a8c..2a9a7de83c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GlacialWall.java b/Mage.Sets/src/mage/sets/seventhedition/GlacialWall.java
index f91a17c4ea..3cc6ffc29e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GlacialWall.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GlacialWall.java
@@ -37,7 +37,7 @@ public class GlacialWall extends mage.sets.fifthedition.GlacialWall {
 
     public GlacialWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GloriousAnthem.java b/Mage.Sets/src/mage/sets/seventhedition/GloriousAnthem.java
index d913fed0d6..337203210d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GloriousAnthem.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GloriousAnthem.java
@@ -37,7 +37,7 @@ public class GloriousAnthem extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinChariot.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinChariot.java
index 2d70828d1a..4c813bbfa6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinChariot.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinChariot.java
@@ -37,7 +37,7 @@ public class GoblinChariot extends mage.sets.ninthedition.GoblinChariot {
 
     public GoblinChariot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinDiggingTeam.java
index a4b8537e33..0b199cda53 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinDiggingTeam.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinDiggingTeam.java
@@ -37,7 +37,7 @@ public class GoblinDiggingTeam extends mage.sets.thedark.GoblinDiggingTeam {
 
     public GoblinDiggingTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinEliteInfantry.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinEliteInfantry.java
index d5a6bbf9cb..7d0ac10186 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinEliteInfantry.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinEliteInfantry.java
@@ -37,7 +37,7 @@ public class GoblinEliteInfantry extends mage.sets.tenthedition.GoblinEliteInfan
 
     public GoblinEliteInfantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinGardener.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinGardener.java
index e492b50064..3f2c6d9d69 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinGardener.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinGardener.java
@@ -38,7 +38,7 @@ public class GoblinGardener extends mage.sets.urzasdestiny.GoblinGardener {
 
     public GoblinGardener(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinKing.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinKing.java
index 1bcbdb9ab7..24053dba0a 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java
index 44bd7abbd1..928fcde61d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java
@@ -38,7 +38,7 @@ public class GoblinMatron extends mage.sets.urzassaga.GoblinMatron {
 
     public GoblinMatron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinRaider.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinRaider.java
index 8289f1309f..13375fa635 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinRaider.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinRaider.java
@@ -37,7 +37,7 @@ public class GoblinRaider extends mage.sets.urzassaga.GoblinRaider {
 
     public GoblinRaider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinSpelunkers.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinSpelunkers.java
index 26b6b3a748..98d7dcdc74 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinSpelunkers.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinSpelunkers.java
@@ -37,7 +37,7 @@ public class GoblinSpelunkers extends mage.sets.ravnica.GoblinSpelunkers {
 
     public GoblinSpelunkers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java
index 28dfcc81cb..0fc820f5e8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java
@@ -39,7 +39,7 @@ public class GoblinWarDrums extends mage.sets.fallenempires.GoblinWarDrums1 {
     public GoblinWarDrums(UUID ownerId) {
         super(ownerId);
         this.rarity = Rarity.UNCOMMON;
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GraftedSkullcap.java b/Mage.Sets/src/mage/sets/seventhedition/GraftedSkullcap.java
index e18576d4f7..925f3f9136 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GraftedSkullcap.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GraftedSkullcap.java
@@ -38,7 +38,7 @@ public class GraftedSkullcap extends mage.sets.urzassaga.GraftedSkullcap {
 
     public GraftedSkullcap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GraniteGrip.java b/Mage.Sets/src/mage/sets/seventhedition/GraniteGrip.java
index 4167e42ac1..9bcd3bc2ce 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GraniteGrip.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GraniteGrip.java
@@ -37,7 +37,7 @@ public class GraniteGrip extends mage.sets.urzaslegacy.GraniteGrip {
 
     public GraniteGrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Gravedigger.java b/Mage.Sets/src/mage/sets/seventhedition/Gravedigger.java
index 7d35de25aa..0235d246f6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Greed.java b/Mage.Sets/src/mage/sets/seventhedition/Greed.java
index 01257729da..bef08a2d55 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Greed.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Greed.java
@@ -37,7 +37,7 @@ public class Greed extends mage.sets.commander2013.Greed {
 
     public Greed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/seventhedition/GrizzlyBears.java
index 4618f00eea..9f5cf30b73 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Hibernation.java b/Mage.Sets/src/mage/sets/seventhedition/Hibernation.java
index e93febd0ec..4e21cb55b4 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Hibernation.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Hibernation.java
@@ -37,7 +37,7 @@ public class Hibernation extends mage.sets.urzassaga.Hibernation {
 
     public Hibernation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HillGiant.java b/Mage.Sets/src/mage/sets/seventhedition/HillGiant.java
index 667aa0aef8..70585360b9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HollowDogs.java b/Mage.Sets/src/mage/sets/seventhedition/HollowDogs.java
index b28803168f..8a4dffcaa1 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HollowDogs.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HollowDogs.java
@@ -37,7 +37,7 @@ public class HollowDogs extends mage.sets.urzassaga.HollowDogs {
 
     public HollowDogs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HolyStrength.java b/Mage.Sets/src/mage/sets/seventhedition/HolyStrength.java
index 9b806d6a56..2813283094 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HonorGuard.java b/Mage.Sets/src/mage/sets/seventhedition/HonorGuard.java
index c26fa23de8..871b36b6ea 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HonorGuard.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HonorGuard.java
@@ -37,7 +37,7 @@ public class HonorGuard extends mage.sets.tenthedition.HonorGuard {
 
     public HonorGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HornedTurtle.java b/Mage.Sets/src/mage/sets/seventhedition/HornedTurtle.java
index e5ec4f877f..83d299d02f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/seventhedition/HowlFromBeyond.java
index af84f72fa5..2b933980f2 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/HowlingMine.java b/Mage.Sets/src/mage/sets/seventhedition/HowlingMine.java
index 308ed92e73..cffb22c5c6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Hurricane.java b/Mage.Sets/src/mage/sets/seventhedition/Hurricane.java
index c8ca7aa876..f667dd2443 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Hurricane.java
@@ -38,7 +38,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Inferno.java b/Mage.Sets/src/mage/sets/seventhedition/Inferno.java
index 2ffac6b157..93c1c93dac 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Inferno.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Inferno.java
@@ -37,7 +37,7 @@ public class Inferno extends mage.sets.thedark.Inferno {
 
     public Inferno(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Inspiration.java b/Mage.Sets/src/mage/sets/seventhedition/Inspiration.java
index d01eb751de..42f7418245 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Inspiration.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Inspiration.java
@@ -37,7 +37,7 @@ public class Inspiration extends mage.sets.returntoravnica.Inspiration {
 
     public Inspiration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/IntrepidHero.java b/Mage.Sets/src/mage/sets/seventhedition/IntrepidHero.java
index 507320d572..44cea3dfdf 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/IntrepidHero.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/IntrepidHero.java
@@ -37,7 +37,7 @@ public class IntrepidHero extends mage.sets.urzassaga.IntrepidHero {
 
     public IntrepidHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/IronStar.java b/Mage.Sets/src/mage/sets/seventhedition/IronStar.java
index 3176c2a4db..c52ef02cbe 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/IvoryCup.java b/Mage.Sets/src/mage/sets/seventhedition/IvoryCup.java
index 4c4a14d3e1..cd211fbb52 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 302;
+        this.cardNumber = "302";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/seventhedition/JayemdaeTome.java
index 9e7aad41cf..08470c7f26 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/KarplusanForest.java b/Mage.Sets/src/mage/sets/seventhedition/KarplusanForest.java
index e6b47f3473..9b3b60a8bb 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/KarplusanForest.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/KarplusanForest.java
@@ -37,7 +37,7 @@ public class KarplusanForest extends mage.sets.tenthedition.KarplusanForest {
 
     public KarplusanForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 336;
+        this.cardNumber = "336";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/sets/seventhedition/KjeldoranRoyalGuard.java
index b68c077c2c..9de5816fbc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/KjeldoranRoyalGuard.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/KjeldoranRoyalGuard.java
@@ -37,7 +37,7 @@ public class KjeldoranRoyalGuard extends mage.sets.iceage.KjeldoranRoyalGuard {
 
     public KjeldoranRoyalGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Knighthood.java b/Mage.Sets/src/mage/sets/seventhedition/Knighthood.java
index c84827eb2d..856afef76f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Knighthood.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Knighthood.java
@@ -37,7 +37,7 @@ public class Knighthood extends mage.sets.urzaslegacy.Knighthood {
 
     public Knighthood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LavaAxe.java b/Mage.Sets/src/mage/sets/seventhedition/LavaAxe.java
index 0f6d636948..c50c3b93db 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LeshracsRite.java b/Mage.Sets/src/mage/sets/seventhedition/LeshracsRite.java
index 2f681fccff..4efcdbc916 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LeshracsRite.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LeshracsRite.java
@@ -37,7 +37,7 @@ public class LeshracsRite extends mage.sets.iceage.LeshracsRite {
 
     public LeshracsRite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Levitation.java b/Mage.Sets/src/mage/sets/seventhedition/Levitation.java
index 4cc9fa5080..058ba97d80 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Levitation.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Levitation.java
@@ -37,7 +37,7 @@ public class Levitation extends mage.sets.magic2012.Levitation {
 
     public Levitation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LightningBlast.java b/Mage.Sets/src/mage/sets/seventhedition/LightningBlast.java
index ca99b1a950..27e2c63b09 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LightningBlast.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LightningBlast.java
@@ -37,7 +37,7 @@ public class LightningBlast extends mage.sets.tempest.LightningBlast {
 
     public LightningBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LightningElemental.java b/Mage.Sets/src/mage/sets/seventhedition/LightningElemental.java
index eb3c261b83..d6210aa9f4 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LightningElemental.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LightningElemental.java
@@ -37,7 +37,7 @@ public class LightningElemental extends mage.sets.tenthedition.LightningElementa
 
     public LightningElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/seventhedition/LlanowarElves.java
index ac76419f7d..0ea92a214e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java b/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java
index dd014d746a..9ea960b0a3 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java
@@ -38,7 +38,7 @@ public class LoneWolf extends mage.sets.urzaslegacy.LoneWolf {
 
     public LoneWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LoomingShade.java b/Mage.Sets/src/mage/sets/seventhedition/LoomingShade.java
index ac4510e667..f0de354797 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LoomingShade.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LoomingShade.java
@@ -37,7 +37,7 @@ public class LoomingShade extends mage.sets.magic2010.LoomingShade {
 
     public LoomingShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/seventhedition/LordOfAtlantis.java
index b1fe6ff253..e4c2a85841 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Lure.java b/Mage.Sets/src/mage/sets/seventhedition/Lure.java
index dd6d51a01f..89df2530a2 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Lure.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/seventhedition/MahamotiDjinn.java
index a017f2b5d6..7e84a846d1 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ManaBreach.java b/Mage.Sets/src/mage/sets/seventhedition/ManaBreach.java
index 90a86fe9bf..546a6b869e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ManaBreach.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ManaBreach.java
@@ -38,7 +38,7 @@ public class ManaBreach extends mage.sets.exodus.ManaBreach {
 
     public ManaBreach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ManaClash.java b/Mage.Sets/src/mage/sets/seventhedition/ManaClash.java
index 35892f1756..2af2329295 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ManaClash.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ManaClash.java
@@ -37,7 +37,7 @@ public class ManaClash extends mage.sets.fourthedition.ManaClash {
 
     public ManaClash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ManaShort.java b/Mage.Sets/src/mage/sets/seventhedition/ManaShort.java
index 57dd7cd3f9..c46c40b433 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ManaShort.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ManaShort.java
@@ -37,7 +37,7 @@ public class ManaShort extends mage.sets.limitedalpha.ManaShort {
 
     public ManaShort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Maro.java b/Mage.Sets/src/mage/sets/seventhedition/Maro.java
index 95060229e1..0941726556 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Maro.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Maro.java
@@ -37,7 +37,7 @@ public class Maro extends mage.sets.ninthedition.Maro {
 
     public Maro(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/MasterHealer.java b/Mage.Sets/src/mage/sets/seventhedition/MasterHealer.java
index bdb8fb846a..156fcbd0a0 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/MasterHealer.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/MasterHealer.java
@@ -37,7 +37,7 @@ public class MasterHealer extends mage.sets.ninthedition.MasterHealer {
 
     public MasterHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Mawcor.java b/Mage.Sets/src/mage/sets/seventhedition/Mawcor.java
index fc96a2b80b..2c12002579 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Mawcor.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Mawcor.java
@@ -37,7 +37,7 @@ public class Mawcor extends mage.sets.tempest.Mawcor {
 
     public Mawcor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Meekstone.java b/Mage.Sets/src/mage/sets/seventhedition/Meekstone.java
index 787bf62f77..5ad9a2b5fe 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Megrim.java b/Mage.Sets/src/mage/sets/seventhedition/Megrim.java
index 6bd44a051e..00564cd910 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Megrim.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Megrim.java
@@ -37,7 +37,7 @@ public class Megrim extends mage.sets.tenthedition.Megrim {
 
     public Megrim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java b/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java
index 5bd7c6a8a3..7abd7cb666 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java
@@ -38,7 +38,7 @@ public class MerfolkLooter extends mage.sets.magic2012.MerfolkLooter {
 
     public MerfolkLooter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/seventhedition/MerfolkOfThePearlTrident.java
index 6188130381..3b7c9c4921 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/MightOfOaks.java b/Mage.Sets/src/mage/sets/seventhedition/MightOfOaks.java
index 8b3a9301b7..5135ec7b23 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/MightOfOaks.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/MightOfOaks.java
@@ -37,7 +37,7 @@ public class MightOfOaks extends mage.sets.magic2010.MightOfOaks {
 
     public MightOfOaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Millstone.java b/Mage.Sets/src/mage/sets/seventhedition/Millstone.java
index 22fed7b661..4dbaf0e95c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/MindRot.java b/Mage.Sets/src/mage/sets/seventhedition/MindRot.java
index b216957d86..e0900389a4 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/MindRot.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Necrologia.java b/Mage.Sets/src/mage/sets/seventhedition/Necrologia.java
index fe728f8e0c..7faa91fa0d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Necrologia.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Necrologia.java
@@ -38,7 +38,7 @@ public class Necrologia extends mage.sets.tempestremastered.Necrologia {
 
     public Necrologia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Nightmare.java b/Mage.Sets/src/mage/sets/seventhedition/Nightmare.java
index 12926b26d7..5e0bf2078e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/NocturnalRaid.java b/Mage.Sets/src/mage/sets/seventhedition/NocturnalRaid.java
index 371ab39710..6d33936a82 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/NocturnalRaid.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/NocturnalRaid.java
@@ -38,7 +38,7 @@ public class NocturnalRaid extends mage.sets.mirage.NocturnalRaid {
 
     public NocturnalRaid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/NorthernPaladin.java b/Mage.Sets/src/mage/sets/seventhedition/NorthernPaladin.java
index a45ac27861..cf90a3ac89 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/NorthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/NorthernPaladin.java
@@ -37,7 +37,7 @@ public class NorthernPaladin extends mage.sets.limitedalpha.NorthernPaladin {
 
     public NorthernPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/seventhedition/OgreTaskmaster.java
index bb3f7443b2..cf1ba726d2 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/OgreTaskmaster.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/OgreTaskmaster.java
@@ -37,7 +37,7 @@ public class OgreTaskmaster extends mage.sets.ninthedition.OgreTaskmaster {
 
     public OgreTaskmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Okk.java b/Mage.Sets/src/mage/sets/seventhedition/Okk.java
index a49dce69dc..aac04b8bf8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Okk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Okk.java
@@ -37,7 +37,7 @@ public class Okk extends mage.sets.urzassaga.Okk {
 
     public Okk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Opportunity.java b/Mage.Sets/src/mage/sets/seventhedition/Opportunity.java
index 07bdf2e5d5..022d83d76e 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Opportunity.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Opportunity.java
@@ -37,7 +37,7 @@ public class Opportunity extends mage.sets.urzaslegacy.Opportunity {
 
     public Opportunity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Oppression.java b/Mage.Sets/src/mage/sets/seventhedition/Oppression.java
index 224c9583e7..e0a5f7c6a5 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Oppression.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Oppression.java
@@ -37,7 +37,7 @@ public class Oppression extends mage.sets.urzassaga.Oppression {
 
     public Oppression(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/seventhedition/OrcishOriflamme.java
index 704f1fa815..31fb96d896 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Ostracize.java b/Mage.Sets/src/mage/sets/seventhedition/Ostracize.java
index 83c344edf8..c7b4aa6ff8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Ostracize.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Ostracize.java
@@ -37,7 +37,7 @@ public class Ostracize extends mage.sets.urzaslegacy.Ostracize {
 
     public Ostracize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pacifism.java b/Mage.Sets/src/mage/sets/seventhedition/Pacifism.java
index eb5117e018..d47d5b3eeb 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pariah.java b/Mage.Sets/src/mage/sets/seventhedition/Pariah.java
index 87c52a3757..7fbe5de611 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Pariah.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Pariah.java
@@ -37,7 +37,7 @@ public class Pariah extends mage.sets.urzassaga.Pariah {
 
     public Pariah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Persecute.java b/Mage.Sets/src/mage/sets/seventhedition/Persecute.java
index 6d53172bec..5b8166db57 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Persecute.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Persecute.java
@@ -37,7 +37,7 @@ public class Persecute extends mage.sets.urzassaga.Persecute {
 
     public Persecute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PhantomWarrior.java b/Mage.Sets/src/mage/sets/seventhedition/PhantomWarrior.java
index b29a697db2..b83fb766fa 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PhyrexianColossus.java b/Mage.Sets/src/mage/sets/seventhedition/PhyrexianColossus.java
index 94600aa1c7..d948d9d630 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PhyrexianColossus.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PhyrexianColossus.java
@@ -37,7 +37,7 @@ public class PhyrexianColossus extends mage.sets.eighthedition.PhyrexianColossus
 
     public PhyrexianColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java
index 7df407ccff..71b6b6ef9b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PitTrap.java b/Mage.Sets/src/mage/sets/seventhedition/PitTrap.java
index 6af0148519..7197bab6fc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PitTrap.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PitTrap.java
@@ -37,7 +37,7 @@ public class PitTrap extends mage.sets.urzassaga.PitTrap {
 
     public PitTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PlagueBeetle.java b/Mage.Sets/src/mage/sets/seventhedition/PlagueBeetle.java
index d6f91ce979..d23cc73b2b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PlagueBeetle.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PlagueBeetle.java
@@ -37,7 +37,7 @@ public class PlagueBeetle extends mage.sets.tenthedition.PlagueBeetle {
 
     public PlagueBeetle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java
index 7d23111a39..6ae2777abe 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java
@@ -37,7 +37,7 @@ public class PrideOfLions extends mage.sets.starter1999.PrideOfLions {
 
     public PrideOfLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java
index 8cae1cd1c5..d770cb2e85 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Purify.java b/Mage.Sets/src/mage/sets/seventhedition/Purify.java
index 3d5f408f98..e553029c02 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Purify.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Purify.java
@@ -37,7 +37,7 @@ public class Purify extends mage.sets.urzaslegacy.Purify {
 
     public Purify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/PygmyPyrosaur.java b/Mage.Sets/src/mage/sets/seventhedition/PygmyPyrosaur.java
index 2a9d48a444..5bc7aadb81 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/PygmyPyrosaur.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/PygmyPyrosaur.java
@@ -37,7 +37,7 @@ public class PygmyPyrosaur extends mage.sets.urzaslegacy.PygmyPyrosaur {
 
     public PygmyPyrosaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pyroclasm.java b/Mage.Sets/src/mage/sets/seventhedition/Pyroclasm.java
index cc411878d0..f3c7ea5d95 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Pyroclasm.java
@@ -37,7 +37,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RagMan.java b/Mage.Sets/src/mage/sets/seventhedition/RagMan.java
index 57c1e413fc..b733af2394 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RagMan.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RagMan.java
@@ -37,7 +37,7 @@ public class RagMan extends mage.sets.thedark.RagMan {
 
     public RagMan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RagingGoblin.java b/Mage.Sets/src/mage/sets/seventhedition/RagingGoblin.java
index 7616b97e89..529f83722b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RampantGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/RampantGrowth.java
index c2e7f6c4a2..f7e522f78d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/seventhedition/RazorfootGriffin.java
index 2b47a520b5..d3d8a17c4f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RazorfootGriffin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RazorfootGriffin.java
@@ -37,7 +37,7 @@ public class RazorfootGriffin extends mage.sets.magic2010.RazorfootGriffin {
 
     public RazorfootGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RazortoothRats.java b/Mage.Sets/src/mage/sets/seventhedition/RazortoothRats.java
index 0f520b3048..6d0ce57007 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RazortoothRats.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RazortoothRats.java
@@ -37,7 +37,7 @@ public class RazortoothRats extends mage.sets.ninthedition.RazortoothRats {
 
     public RazortoothRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Reclaim.java b/Mage.Sets/src/mage/sets/seventhedition/Reclaim.java
index 959e2ab6bd..090f466c72 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Reclaim.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Reclaim.java
@@ -37,7 +37,7 @@ public class Reclaim extends mage.sets.magic2012.Reclaim {
 
     public Reclaim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RedwoodTreefolk.java b/Mage.Sets/src/mage/sets/seventhedition/RedwoodTreefolk.java
index de4d122f89..7a9f9ce16b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RedwoodTreefolk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RedwoodTreefolk.java
@@ -37,7 +37,7 @@ public class RedwoodTreefolk extends mage.sets.weatherlight.RedwoodTreefolk {
 
     public RedwoodTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Reflexes.java b/Mage.Sets/src/mage/sets/seventhedition/Reflexes.java
index 239e279f18..1b5b73463c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Reflexes.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Reflexes.java
@@ -37,7 +37,7 @@ public class Reflexes extends mage.sets.urzassaga.Reflexes {
 
     public Reflexes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Regeneration.java b/Mage.Sets/src/mage/sets/seventhedition/Regeneration.java
index 0c0ec825a8..76e7f52a97 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/seventhedition/RemoveSoul.java
index 195d10c1af..bf7aedc132 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Revenant.java b/Mage.Sets/src/mage/sets/seventhedition/Revenant.java
index 8fa4998502..d01264ddb5 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Revenant.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Revenant.java
@@ -38,7 +38,7 @@ public class Revenant extends mage.sets.tempestremastered.Revenant {
 
     public Revenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ReverseDamage.java b/Mage.Sets/src/mage/sets/seventhedition/ReverseDamage.java
index 1f3d15c884..2b40ba88af 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/seventhedition/RodOfRuin.java
index 01b3f20c64..d2a8b3b814 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RollingStones.java b/Mage.Sets/src/mage/sets/seventhedition/RollingStones.java
index 9b22617a08..f7136408ab 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RollingStones.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RollingStones.java
@@ -37,7 +37,7 @@ public class RollingStones extends mage.sets.stronghold.RollingStones {
 
     public RollingStones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SabretoothTiger.java b/Mage.Sets/src/mage/sets/seventhedition/SabretoothTiger.java
index 0097cb8aa8..b7da9e408d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SabretoothTiger.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SabretoothTiger.java
@@ -37,7 +37,7 @@ public class SabretoothTiger extends mage.sets.fifthedition.SabretoothTiger {
 
     public SabretoothTiger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SacredGround.java b/Mage.Sets/src/mage/sets/seventhedition/SacredGround.java
index e145548800..aff2151849 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SacredGround.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SacredGround.java
@@ -37,7 +37,7 @@ public class SacredGround extends mage.sets.stronghold.SacredGround {
 
     public SacredGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SacredNectar.java b/Mage.Sets/src/mage/sets/seventhedition/SacredNectar.java
index 0284c35c32..3b465b4d48 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SacredNectar.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SacredNectar.java
@@ -37,7 +37,7 @@ public class SacredNectar extends mage.sets.ninthedition.SacredNectar {
 
     public SacredNectar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SageOwl.java b/Mage.Sets/src/mage/sets/seventhedition/SageOwl.java
index 8ab00613f5..3d2c1f5cc3 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SageOwl.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SageOwl.java
@@ -37,7 +37,7 @@ public class SageOwl extends mage.sets.magic2010.SageOwl {
 
     public SageOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/seventhedition/SamiteHealer.java
index 7ea469cfa7..680a1cc2bb 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/seventhedition/ScatheZombies.java
index 658f6e375f..28f8131443 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ScavengerFolk.java b/Mage.Sets/src/mage/sets/seventhedition/ScavengerFolk.java
index 9d7f52cb66..2a9efd6cd6 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ScavengerFolk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ScavengerFolk.java
@@ -39,7 +39,7 @@ public class ScavengerFolk extends mage.sets.fifthedition.ScavengerFolk {
 
     public ScavengerFolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SeaMonster.java b/Mage.Sets/src/mage/sets/seventhedition/SeaMonster.java
index fb60fa8531..8589f69c74 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SeaMonster.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SeaMonster.java
@@ -37,7 +37,7 @@ public class SeaMonster extends mage.sets.tempest.SeaMonster {
 
     public SeaMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/seventhedition/SeasonedMarshal.java
index 46c34b9d7f..72b8b00ea3 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SeasonedMarshal.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SeasonedMarshal.java
@@ -37,7 +37,7 @@ public class SeasonedMarshal extends mage.sets.elspethvstezzeret.SeasonedMarshal
 
     public SeasonedMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SeekerOfSkybreak.java b/Mage.Sets/src/mage/sets/seventhedition/SeekerOfSkybreak.java
index 908d1ef74e..47e57665c8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SeekerOfSkybreak.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SeekerOfSkybreak.java
@@ -37,7 +37,7 @@ public class SeekerOfSkybreak extends mage.sets.tempest.SeekerOfSkybreak {
 
     public SeekerOfSkybreak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SerpentWarrior.java b/Mage.Sets/src/mage/sets/seventhedition/SerpentWarrior.java
index 14387ed29d..d8e65800ae 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SerpentWarrior.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SerpentWarrior.java
@@ -37,7 +37,7 @@ public class SerpentWarrior extends mage.sets.stronghold.SerpentWarrior {
 
     public SerpentWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SerraAdvocate.java b/Mage.Sets/src/mage/sets/seventhedition/SerraAdvocate.java
index 54cfe367a5..a853c426e8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SerraAdvocate.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SerraAdvocate.java
@@ -37,7 +37,7 @@ public class SerraAdvocate extends mage.sets.urzasdestiny.SerraAdvocate {
 
     public SerraAdvocate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SerraAngel.java b/Mage.Sets/src/mage/sets/seventhedition/SerraAngel.java
index b1bc3f1341..8fcc7c4c6f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SerraAngel.java
@@ -37,7 +37,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/seventhedition/SerrasEmbrace.java
index 8da428fa10..55cdd9dcfd 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SerrasEmbrace.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SerrasEmbrace.java
@@ -37,7 +37,7 @@ public class SerrasEmbrace extends mage.sets.tenthedition.SerrasEmbrace {
 
     public SerrasEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/seventhedition/ShanodinDryads.java
index 639febff43..06f2aeb312 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Shatter.java b/Mage.Sets/src/mage/sets/seventhedition/Shatter.java
index a18a38254e..14059229d8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ShieldWall.java b/Mage.Sets/src/mage/sets/seventhedition/ShieldWall.java
index 2ae8069085..7ef530a7cc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ShieldWall.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ShieldWall.java
@@ -39,7 +39,7 @@ public class ShieldWall extends mage.sets.legends.ShieldWall {
 
     public ShieldWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ShivanDragon.java b/Mage.Sets/src/mage/sets/seventhedition/ShivanDragon.java
index 5feb70e016..6e56b17249 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Shock.java b/Mage.Sets/src/mage/sets/seventhedition/Shock.java
index 266533a2dc..adc2f79350 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Shock.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SkyshroudFalcon.java b/Mage.Sets/src/mage/sets/seventhedition/SkyshroudFalcon.java
index 7e00cc66f4..1d6edae396 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SkyshroudFalcon.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SkyshroudFalcon.java
@@ -37,7 +37,7 @@ public class SkyshroudFalcon extends mage.sets.stronghold.SkyshroudFalcon {
 
     public SkyshroudFalcon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java b/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java
index 1d561db53a..0bcc8c0ecf 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java
@@ -37,7 +37,7 @@ public class SleightOfHand extends mage.sets.ninthedition.SleightOfHand {
 
     public SleightOfHand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SoulFeast.java b/Mage.Sets/src/mage/sets/seventhedition/SoulFeast.java
index c37813abfd..1620d8114a 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SoulFeast.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SoulFeast.java
@@ -37,7 +37,7 @@ public class SoulFeast extends mage.sets.tenthedition.SoulFeast {
 
     public SoulFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SoulNet.java b/Mage.Sets/src/mage/sets/seventhedition/SoulNet.java
index c8fb6bb98e..3f09c6f603 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Spellbook.java b/Mage.Sets/src/mage/sets/seventhedition/Spellbook.java
index ce8e75656a..9907986455 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Spellbook.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Spellbook.java
@@ -37,7 +37,7 @@ public class Spellbook extends mage.sets.magic2010.Spellbook {
 
     public Spellbook(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 318;
+        this.cardNumber = "318";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpinedWurm.java b/Mage.Sets/src/mage/sets/seventhedition/SpinedWurm.java
index d96127f5c2..e8e665c13c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpinelessThug.java b/Mage.Sets/src/mage/sets/seventhedition/SpinelessThug.java
index 94e5ee6b7c..8f5b908014 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SpinelessThug.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SpinelessThug.java
@@ -37,7 +37,7 @@ public class SpinelessThug extends mage.sets.tenthedition.SpinelessThug {
 
     public SpinelessThug(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpittingEarth.java b/Mage.Sets/src/mage/sets/seventhedition/SpittingEarth.java
index 4aee128f90..547c2a9503 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SpittingEarth.java
@@ -37,7 +37,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Squall.java b/Mage.Sets/src/mage/sets/seventhedition/Squall.java
index 4614887434..e3a65b0584 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Squall.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Squall.java
@@ -38,7 +38,7 @@ public class Squall extends mage.sets.starter1999.Squall {
 
     public Squall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StandingTroops.java b/Mage.Sets/src/mage/sets/seventhedition/StandingTroops.java
index c612c64d16..b2ac87d905 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StandingTroops.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StandingTroops.java
@@ -37,7 +37,7 @@ public class StandingTroops extends mage.sets.eighthedition.StandingTroops {
 
     public StandingTroops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StaticOrb.java b/Mage.Sets/src/mage/sets/seventhedition/StaticOrb.java
index 940be55a91..4a2fe4d1a0 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StaticOrb.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StaticOrb.java
@@ -37,7 +37,7 @@ public class StaticOrb extends mage.sets.tempest.StaticOrb {
 
     public StaticOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StaunchDefenders.java b/Mage.Sets/src/mage/sets/seventhedition/StaunchDefenders.java
index 2f140d65e1..1e91aaeb93 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StaunchDefenders.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StaunchDefenders.java
@@ -37,7 +37,7 @@ public class StaunchDefenders extends mage.sets.tempest.StaunchDefenders {
 
     public StaunchDefenders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StoneRain.java b/Mage.Sets/src/mage/sets/seventhedition/StoneRain.java
index a049fc2316..18cf6d02ee 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StormCrow.java b/Mage.Sets/src/mage/sets/seventhedition/StormCrow.java
index 17dbad3afd..067d22d06a 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StormCrow.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StormCrow.java
@@ -37,7 +37,7 @@ public class StormCrow extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StormShaman.java b/Mage.Sets/src/mage/sets/seventhedition/StormShaman.java
index f56e1c44ab..a441d60567 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StormShaman.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StormShaman.java
@@ -39,7 +39,7 @@ public class StormShaman extends mage.sets.alliances.StormShaman1 {
 
     public StormShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/StrongholdAssassin.java b/Mage.Sets/src/mage/sets/seventhedition/StrongholdAssassin.java
index 3f611f0250..55e3aecda9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/StrongholdAssassin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/StrongholdAssassin.java
@@ -37,7 +37,7 @@ public class StrongholdAssassin extends mage.sets.stronghold.StrongholdAssassin
 
     public StrongholdAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SulfurousSprings.java b/Mage.Sets/src/mage/sets/seventhedition/SulfurousSprings.java
index 57ac38d295..651663afd8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SulfurousSprings.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SulfurousSprings.java
@@ -37,7 +37,7 @@ public class SulfurousSprings extends mage.sets.tenthedition.SulfurousSprings {
 
     public SulfurousSprings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 345;
+        this.cardNumber = "345";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SustainerOfTheRealm.java b/Mage.Sets/src/mage/sets/seventhedition/SustainerOfTheRealm.java
index ce53d3f865..4f12a86901 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SustainerOfTheRealm.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SustainerOfTheRealm.java
@@ -37,7 +37,7 @@ public class SustainerOfTheRealm extends mage.sets.urzaslegacy.SustainerOfTheRea
 
     public SustainerOfTheRealm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java b/Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java
index b510b7f964..ffb0f582f1 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java
@@ -38,7 +38,7 @@ public class TaintedAEther extends mage.sets.urzassaga.TaintedAEther {
 
     public TaintedAEther(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TeferisPuzzleBox.java b/Mage.Sets/src/mage/sets/seventhedition/TeferisPuzzleBox.java
index 59d5f2527e..6f0bf09bc7 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TeferisPuzzleBox.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TeferisPuzzleBox.java
@@ -37,7 +37,7 @@ public class TeferisPuzzleBox extends mage.sets.ninthedition.TeferisPuzzleBox {
 
     public TeferisPuzzleBox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TelepathicSpies.java b/Mage.Sets/src/mage/sets/seventhedition/TelepathicSpies.java
index 273f7079db..5ccdf6f664 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TelepathicSpies.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TelepathicSpies.java
@@ -38,7 +38,7 @@ public class TelepathicSpies extends mage.sets.urzasdestiny.TelepathicSpies {
 
     public TelepathicSpies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Telepathy.java b/Mage.Sets/src/mage/sets/seventhedition/Telepathy.java
index 6819eadf0f..a61ca62aec 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Telepathy.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Telepathy.java
@@ -37,7 +37,7 @@ public class Telepathy extends mage.sets.urzassaga.Telepathy {
 
     public Telepathy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TemporalAdept.java b/Mage.Sets/src/mage/sets/seventhedition/TemporalAdept.java
index cf745001a1..670b5eeefc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TemporalAdept.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TemporalAdept.java
@@ -37,7 +37,7 @@ public class TemporalAdept extends mage.sets.ninthedition.TemporalAdept {
 
     public TemporalAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ThievingMagpie.java b/Mage.Sets/src/mage/sets/seventhedition/ThievingMagpie.java
index bdc3fb6aaa..eb0be58a24 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ThievingMagpie.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ThievingMagpie.java
@@ -37,7 +37,7 @@ public class ThievingMagpie extends mage.sets.ninthedition.ThievingMagpie {
 
     public ThievingMagpie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ThornElemental.java b/Mage.Sets/src/mage/sets/seventhedition/ThornElemental.java
index 9614eee44d..6063df7af9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ThornElemental.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ThornElemental.java
@@ -37,7 +37,7 @@ public class ThornElemental extends mage.sets.urzasdestiny.ThornElemental {
 
     public ThornElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/seventhedition/ThroneOfBone.java
index 2281c44919..751c352730 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TolarianWinds.java b/Mage.Sets/src/mage/sets/seventhedition/TolarianWinds.java
index ce828b6b07..2ee087d72c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TolarianWinds.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TolarianWinds.java
@@ -37,7 +37,7 @@ public class TolarianWinds extends mage.sets.urzassaga.TolarianWinds {
 
     public TolarianWinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TrainedArmodon.java b/Mage.Sets/src/mage/sets/seventhedition/TrainedArmodon.java
index 2b3ea72275..13bfcbad9d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TrainedArmodon.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TrainedArmodon.java
@@ -37,7 +37,7 @@ public class TrainedArmodon extends mage.sets.tempest.TrainedArmodon {
 
     public TrainedArmodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Tranquility.java b/Mage.Sets/src/mage/sets/seventhedition/Tranquility.java
index 785c748282..74fc8b6f9b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TreasureTrove.java b/Mage.Sets/src/mage/sets/seventhedition/TreasureTrove.java
index 40060b8ab4..70ded92137 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TreasureTrove.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TreasureTrove.java
@@ -37,7 +37,7 @@ public class TreasureTrove extends mage.sets.ninthedition.TreasureTrove {
 
     public TreasureTrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/TreefolkSeedlings.java b/Mage.Sets/src/mage/sets/seventhedition/TreefolkSeedlings.java
index 8277537738..13499abc04 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/TreefolkSeedlings.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/TreefolkSeedlings.java
@@ -37,7 +37,7 @@ public class TreefolkSeedlings extends mage.sets.urzassaga.TreefolkSeedlings {
 
     public TreefolkSeedlings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Twiddle.java b/Mage.Sets/src/mage/sets/seventhedition/Twiddle.java
index bb294bff81..ba5c0a6f19 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Twiddle.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Twiddle.java
@@ -37,7 +37,7 @@ public class Twiddle extends mage.sets.unlimitededition.Twiddle {
 
     public Twiddle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/UndergroundRiver.java b/Mage.Sets/src/mage/sets/seventhedition/UndergroundRiver.java
index 31774ea457..c9f0ad40e8 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/UndergroundRiver.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/UndergroundRiver.java
@@ -37,7 +37,7 @@ public class UndergroundRiver extends mage.sets.tenthedition.UndergroundRiver {
 
     public UndergroundRiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 350;
+        this.cardNumber = "350";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/UnholyStrength.java b/Mage.Sets/src/mage/sets/seventhedition/UnholyStrength.java
index a19f5b3ea6..f1fb8b8fc5 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Unsummon.java b/Mage.Sets/src/mage/sets/seventhedition/Unsummon.java
index a33751b284..21ba310056 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/VenerableMonk.java b/Mage.Sets/src/mage/sets/seventhedition/VenerableMonk.java
index 7ecdbf3456..748eab464d 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/VernalBloom.java b/Mage.Sets/src/mage/sets/seventhedition/VernalBloom.java
index c93b160781..62beedb6e7 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/VernalBloom.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/VernalBloom.java
@@ -37,7 +37,7 @@ public class VernalBloom extends mage.sets.urzassaga.VernalBloom {
 
     public VernalBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/VigilantDrake.java b/Mage.Sets/src/mage/sets/seventhedition/VigilantDrake.java
index fe2bc743b8..2f4a230ecd 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/VigilantDrake.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/VigilantDrake.java
@@ -37,7 +37,7 @@ public class VigilantDrake extends mage.sets.urzaslegacy.VigilantDrake {
 
     public VigilantDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/VolcanicHammer.java b/Mage.Sets/src/mage/sets/seventhedition/VolcanicHammer.java
index e4b6d0e2ec..c98bd60031 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/VolcanicHammer.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/VolcanicHammer.java
@@ -37,7 +37,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {
 
     public VolcanicHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WallOfAir.java b/Mage.Sets/src/mage/sets/seventhedition/WallOfAir.java
index 0f150f0f66..1acd2a7d7b 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WallOfBone.java b/Mage.Sets/src/mage/sets/seventhedition/WallOfBone.java
index 388fd4967b..6bf8613368 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WallOfFire.java b/Mage.Sets/src/mage/sets/seventhedition/WallOfFire.java
index 04309724b7..156e098ad9 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java b/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java
index 923ed22bbd..210b5270c4 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java
@@ -38,7 +38,7 @@ public class WallOfSpears extends mage.sets.fifthedition.WallOfSpears {
 
     public WallOfSpears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "7ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/seventhedition/WallOfSwords.java
index 9c9492c41a..34fb92b7fc 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WesternPaladin.java b/Mage.Sets/src/mage/sets/seventhedition/WesternPaladin.java
index 4125e88663..4f512268bd 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WesternPaladin.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WesternPaladin.java
@@ -37,7 +37,7 @@ public class WesternPaladin extends mage.sets.urzassaga.WesternPaladin {
 
     public WesternPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WildGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/WildGrowth.java
index eace9b40a2..f2f0739bac 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Wildfire.java b/Mage.Sets/src/mage/sets/seventhedition/Wildfire.java
index 121dafa8c2..67804b0478 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Wildfire.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Wildfire.java
@@ -37,7 +37,7 @@ public class Wildfire extends mage.sets.urzassaga.Wildfire {
 
     public Wildfire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WindDancer.java b/Mage.Sets/src/mage/sets/seventhedition/WindDancer.java
index ac7e1f2399..6227cad907 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WindDancer.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WindDancer.java
@@ -37,7 +37,7 @@ public class WindDancer extends mage.sets.tempest.WindDancer {
 
     public WindDancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WindDrake.java b/Mage.Sets/src/mage/sets/seventhedition/WindDrake.java
index 64c92e2b52..b66e02a815 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WingSnare.java b/Mage.Sets/src/mage/sets/seventhedition/WingSnare.java
index 507272bbd3..ceed9e5c18 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WingSnare.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WingSnare.java
@@ -37,7 +37,7 @@ public class WingSnare extends mage.sets.urzaslegacy.WingSnare {
 
     public WingSnare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WoodElves.java b/Mage.Sets/src/mage/sets/seventhedition/WoodElves.java
index 47c3ba248b..5dd4729237 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WoodElves.java
@@ -37,7 +37,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WoodenSphere.java b/Mage.Sets/src/mage/sets/seventhedition/WoodenSphere.java
index 2b55eb1f65..d163d8d990 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Worship.java b/Mage.Sets/src/mage/sets/seventhedition/Worship.java
index 50a9bc6606..27562c638c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Worship.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Worship.java
@@ -37,7 +37,7 @@ public class Worship extends mage.sets.urzassaga.Worship {
 
     public Worship(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/seventhedition/WrathOfGod.java
index 10460d8849..c9f6aeef4c 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/seventhedition/YavimayaEnchantress.java
index 9606095d23..be58de72c5 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/YavimayaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/YavimayaEnchantress.java
@@ -37,7 +37,7 @@ public class YavimayaEnchantress extends mage.sets.tenthedition.YavimayaEnchantr
 
     public YavimayaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/YawgmothsEdict.java b/Mage.Sets/src/mage/sets/seventhedition/YawgmothsEdict.java
index 017117c195..ad185ae5ca 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/YawgmothsEdict.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/YawgmothsEdict.java
@@ -38,7 +38,7 @@ public class YawgmothsEdict extends mage.sets.urzassaga.YawgmothsEdict {
 
     public YawgmothsEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "7ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ArmoredAscension.java b/Mage.Sets/src/mage/sets/shadowmoor/ArmoredAscension.java
index 43c732c21c..e9823aadb6 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/ArmoredAscension.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/ArmoredAscension.java
@@ -37,7 +37,7 @@ public class ArmoredAscension extends mage.sets.magic2010.ArmoredAscension {
 
     public ArmoredAscension(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Corrupt.java b/Mage.Sets/src/mage/sets/shadowmoor/Corrupt.java
index 33a34299f3..6861295253 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/Corrupt.java
@@ -37,7 +37,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DeusOfCalamity.java b/Mage.Sets/src/mage/sets/shadowmoor/DeusOfCalamity.java
index 8b3fe96984..d7cc83c6b4 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/DeusOfCalamity.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/DeusOfCalamity.java
@@ -37,7 +37,7 @@ public class DeusOfCalamity extends mage.sets.heroesvsmonsters.DeusOfCalamity {
 
     public DeusOfCalamity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Gloomwidow.java b/Mage.Sets/src/mage/sets/shadowmoor/Gloomwidow.java
index 733244e18d..60c30be216 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/Gloomwidow.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/Gloomwidow.java
@@ -37,7 +37,7 @@ public class Gloomwidow extends mage.sets.avacynrestored.Gloomwidow {
 
     public Gloomwidow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GoldenglowMoth.java b/Mage.Sets/src/mage/sets/shadowmoor/GoldenglowMoth.java
index 7dc122062f..5457a1b292 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/GoldenglowMoth.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/GoldenglowMoth.java
@@ -37,7 +37,7 @@ public class GoldenglowMoth extends mage.sets.magic2011.GoldenglowMoth {
 
     public GoldenglowMoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HowlOfTheNightPack.java b/Mage.Sets/src/mage/sets/shadowmoor/HowlOfTheNightPack.java
index eac3deecbd..77140153b6 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/HowlOfTheNightPack.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/HowlOfTheNightPack.java
@@ -37,7 +37,7 @@ public class HowlOfTheNightPack extends mage.sets.magic2010.HowlOfTheNightPack {
 
     public HowlOfTheNightPack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/InkfathomWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/InkfathomWitch.java
index 9f6d28b1d6..49f8b27d6d 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/InkfathomWitch.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/InkfathomWitch.java
@@ -37,7 +37,7 @@ public class InkfathomWitch extends mage.sets.planechase2012.InkfathomWitch {
 
     public InkfathomWitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PowerOfFire.java b/Mage.Sets/src/mage/sets/shadowmoor/PowerOfFire.java
index 517b3fb21e..98dc4b7b3c 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/PowerOfFire.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/PowerOfFire.java
@@ -37,7 +37,7 @@ public class PowerOfFire extends mage.sets.conspiracy.PowerOfFire {
 
     public PowerOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PresenceOfGond.java b/Mage.Sets/src/mage/sets/shadowmoor/PresenceOfGond.java
index d551101fa6..27ba1c3087 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/PresenceOfGond.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/PresenceOfGond.java
@@ -37,7 +37,7 @@ public class PresenceOfGond extends mage.sets.commander2013.PresenceOfGond {
 
     public PresenceOfGond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ReflectingPool.java b/Mage.Sets/src/mage/sets/shadowmoor/ReflectingPool.java
index 44670af004..88182f43f7 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/ReflectingPool.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/ReflectingPool.java
@@ -37,7 +37,7 @@ public class ReflectingPool extends mage.sets.tempest.ReflectingPool {
 
     public ReflectingPool(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Spawnwrithe.java b/Mage.Sets/src/mage/sets/shadowmoor/Spawnwrithe.java
index 464515f57b..412f503081 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/Spawnwrithe.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/Spawnwrithe.java
@@ -37,7 +37,7 @@ public class Spawnwrithe extends mage.sets.commander.Spawnwrithe {
 
     public Spawnwrithe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TorrentOfSouls.java b/Mage.Sets/src/mage/sets/shadowmoor/TorrentOfSouls.java
index 497d47c8d9..cdc8e4b0c6 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/TorrentOfSouls.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/TorrentOfSouls.java
@@ -37,7 +37,7 @@ public class TorrentOfSouls extends mage.sets.sorinvstibalt.TorrentOfSouls {
 
     public TorrentOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Torture.java b/Mage.Sets/src/mage/sets/shadowmoor/Torture.java
index c699101f96..bdde8dfa09 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/Torture.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/Torture.java
@@ -38,7 +38,7 @@ public class Torture extends mage.sets.homelands.Torture1 {
 
     public Torture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TripNoose.java b/Mage.Sets/src/mage/sets/shadowmoor/TripNoose.java
index 67871531c2..20a20b3158 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/TripNoose.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/TripNoose.java
@@ -37,7 +37,7 @@ public class TripNoose extends mage.sets.elspethvstezzeret.TripNoose {
 
     public TripNoose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "SHM";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Catalog.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Catalog.java
index ca7d4489a8..85bf5b8382 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Catalog.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Catalog.java
@@ -37,7 +37,7 @@ public class Catalog extends mage.sets.urzassaga.Catalog {
 
     public Catalog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DeadWeight.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DeadWeight.java
index 6c9f48c4eb..ff3e3555d9 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DeadWeight.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DeadWeight.java
@@ -37,7 +37,7 @@ public class DeadWeight extends mage.sets.innistrad.DeadWeight {
 
     public DeadWeight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/EerieInterlude.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/EerieInterlude.java
index 62a6b545dc..932b239fe3 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/EerieInterlude.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/EerieInterlude.java
@@ -37,7 +37,7 @@ public class EerieInterlude extends mage.sets.blessedvscursed.EerieInterlude {
 
     public EerieInterlude(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FieryTemper.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FieryTemper.java
index 9d9fcbe3ea..c0886f96cb 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FieryTemper.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FieryTemper.java
@@ -38,7 +38,7 @@ public class FieryTemper extends mage.sets.timeshifted.FieryTemper {
 
     public FieryTemper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "SOI";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Gloomwidow.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Gloomwidow.java
index 974549fc88..fb53578c9e 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Gloomwidow.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Gloomwidow.java
@@ -37,7 +37,7 @@ public class Gloomwidow extends mage.sets.avacynrestored.Gloomwidow {
 
     public Gloomwidow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Groundskeeper.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Groundskeeper.java
index 29efca5361..90d7b49409 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Groundskeeper.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Groundskeeper.java
@@ -37,7 +37,7 @@ public class Groundskeeper extends mage.sets.ninthedition.Groundskeeper {
 
     public Groundskeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LightningAxe.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LightningAxe.java
index d47666670d..c3b286d6f9 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LightningAxe.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LightningAxe.java
@@ -38,7 +38,7 @@ public class LightningAxe extends mage.sets.timespiral.LightningAxe {
 
     public LightningAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "SOI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MacabreWaltz.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MacabreWaltz.java
index bee45a225d..a09645c88c 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MacabreWaltz.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MacabreWaltz.java
@@ -37,7 +37,7 @@ public class MacabreWaltz extends mage.sets.magicorigins.MacabreWaltz {
 
     public MacabreWaltz(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MadProphet.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MadProphet.java
index 3aaed8292e..9306db891c 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MadProphet.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MadProphet.java
@@ -38,7 +38,7 @@ public class MadProphet extends mage.sets.avacynrestored.MadProphet {
 
     public MadProphet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "SOI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MagmaticChasm.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MagmaticChasm.java
index b6fdd19513..d2cfd66816 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MagmaticChasm.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MagmaticChasm.java
@@ -37,7 +37,7 @@ public class MagmaticChasm extends mage.sets.dragonsoftarkir.MagmaticChasm {
 
     public MagmaticChasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MindwrackDemon.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MindwrackDemon.java
index 222c6d12b4..bd2f4ece30 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MindwrackDemon.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MindwrackDemon.java
@@ -37,7 +37,7 @@ public class MindwrackDemon extends mage.sets.blessedvscursed.MindwrackDemon {
 
     public MindwrackDemon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PuncturingLight.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PuncturingLight.java
index b5c0dec45d..5a4004e6ee 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PuncturingLight.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PuncturingLight.java
@@ -37,7 +37,7 @@ public class PuncturingLight extends mage.sets.riseoftheeldrazi.PuncturingLight
 
     public PuncturingLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RecklessScholar.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RecklessScholar.java
index 780b289695..9474893885 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RecklessScholar.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RecklessScholar.java
@@ -38,7 +38,7 @@ public class RecklessScholar extends mage.sets.zendikar.RecklessScholar {
 
     public RecklessScholar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "SOI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Throttle.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Throttle.java
index 6853fc2e22..7e80ae134d 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Throttle.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Throttle.java
@@ -37,7 +37,7 @@ public class Throttle extends mage.sets.khansoftarkir.Throttle {
 
     public Throttle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ToothCollector.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ToothCollector.java
index 92e1b119fd..cebfe20c43 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ToothCollector.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ToothCollector.java
@@ -37,7 +37,7 @@ public class ToothCollector extends mage.sets.blessedvscursed.ToothCollector {
 
     public ToothCollector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TormentingVoice.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TormentingVoice.java
index e2a702eaed..e77d85063c 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TormentingVoice.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TormentingVoice.java
@@ -37,7 +37,7 @@ public class TormentingVoice extends mage.sets.khansoftarkir.TormentingVoice {
 
     public TormentingVoice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/UnrulyMob.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/UnrulyMob.java
index 9f5b0f91d7..feb0caa92f 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/UnrulyMob.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/UnrulyMob.java
@@ -37,7 +37,7 @@ public class UnrulyMob extends mage.sets.innistrad.UnrulyMob {
 
     public UnrulyMob(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "SOI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java b/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java
index edc4ce4c80..b68f6efb56 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java
@@ -38,7 +38,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "ALA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java b/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java
index 566e755671..e14d19fb10 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java
@@ -38,7 +38,7 @@ public class Naturalize extends mage.sets.magic2010.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "ALA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/AbsorbVis.java b/Mage.Sets/src/mage/sets/sorinvstibalt/AbsorbVis.java
index 43d40ab323..aa22490cc0 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/AbsorbVis.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/AbsorbVis.java
@@ -37,7 +37,7 @@ public class AbsorbVis extends mage.sets.conflux.AbsorbVis {
 
     public AbsorbVis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/AkoumRefuge.java b/Mage.Sets/src/mage/sets/sorinvstibalt/AkoumRefuge.java
index ba5f78746e..13908be3bf 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/AkoumRefuge.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/AkoumRefuge.java
@@ -37,7 +37,7 @@ public class AkoumRefuge extends mage.sets.zendikar.AkoumRefuge {
 
     public AkoumRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java b/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java
index be12502f97..fb55e202b6 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java
@@ -37,7 +37,7 @@ public class AncientCraving extends mage.sets.starter1999.AncientCraving {
 
     public AncientCraving(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/AshmouthHound.java b/Mage.Sets/src/mage/sets/sorinvstibalt/AshmouthHound.java
index 062e2e5fb5..476bc5e932 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/AshmouthHound.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/AshmouthHound.java
@@ -37,7 +37,7 @@ public class AshmouthHound extends mage.sets.innistrad.AshmouthHound {
 
     public AshmouthHound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/BlazingSalvo.java b/Mage.Sets/src/mage/sets/sorinvstibalt/BlazingSalvo.java
index 521e7343e1..911d182d55 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/BlazingSalvo.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/BlazingSalvo.java
@@ -37,7 +37,7 @@ public class BlazingSalvo extends mage.sets.odyssey.BlazingSalvo {
 
     public BlazingSalvo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Blightning.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Blightning.java
index c4b844f3ce..371258b11a 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Blightning.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Blightning.java
@@ -37,7 +37,7 @@ public class Blightning extends mage.sets.shardsofalara.Blightning {
 
     public Blightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/BloodrageVampire.java b/Mage.Sets/src/mage/sets/sorinvstibalt/BloodrageVampire.java
index 673d589f37..3363e7c9e1 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/BloodrageVampire.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/BloodrageVampire.java
@@ -37,7 +37,7 @@ public class BloodrageVampire extends mage.sets.magic2012.BloodrageVampire {
 
     public BloodrageVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java b/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java
index 8a375ed1fb..481ee26bfe 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java
@@ -37,7 +37,7 @@ public class BreakingPoint extends mage.sets.judgment.BreakingPoint {
 
     public BreakingPoint(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Browbeat.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Browbeat.java
index dcf3a83177..bc45ab1e75 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Browbeat.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Browbeat.java
@@ -37,7 +37,7 @@ public class Browbeat extends mage.sets.judgment.Browbeat {
 
     public Browbeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/BumpInTheNight.java b/Mage.Sets/src/mage/sets/sorinvstibalt/BumpInTheNight.java
index 7abd20a002..5c8741ce1e 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/BumpInTheNight.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/BumpInTheNight.java
@@ -37,7 +37,7 @@ public class BumpInTheNight extends mage.sets.innistrad.BumpInTheNight {
 
     public BumpInTheNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ButcherOfMalakir.java
index 3bf5d2e997..10104f72b0 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ButcherOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ButcherOfMalakir.java
@@ -37,7 +37,7 @@ public class ButcherOfMalakir extends mage.sets.worldwake.ButcherOfMalakir {
 
     public ButcherOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ChildOfNight.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ChildOfNight.java
index ce0ae9eeae..a3ff74bc07 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ChildOfNight.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ChildOfNight.java
@@ -37,7 +37,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight {
 
     public ChildOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/CorpseConnoisseur.java b/Mage.Sets/src/mage/sets/sorinvstibalt/CorpseConnoisseur.java
index df4b96c7cb..6d619f443e 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/CorpseConnoisseur.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/CorpseConnoisseur.java
@@ -37,7 +37,7 @@ public class CorpseConnoisseur extends mage.sets.shardsofalara.CorpseConnoisseur
 
     public CorpseConnoisseur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/DeathGrasp.java b/Mage.Sets/src/mage/sets/sorinvstibalt/DeathGrasp.java
index 3b4dd539d3..40fb554abf 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/DeathGrasp.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/DeathGrasp.java
@@ -37,7 +37,7 @@ public class DeathGrasp extends mage.sets.apocalypse.DeathGrasp {
 
     public DeathGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java
index b7c56dd58c..e9028c0fae 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java
@@ -37,7 +37,7 @@ public class Decompose extends mage.sets.odyssey.Decompose {
 
     public Decompose(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/DevilsPlay.java b/Mage.Sets/src/mage/sets/sorinvstibalt/DevilsPlay.java
index 89b1ad5fa3..fdb51ebefd 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/DevilsPlay.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/DevilsPlay.java
@@ -37,7 +37,7 @@ public class DevilsPlay extends mage.sets.innistrad.DevilsPlay {
 
     public DevilsPlay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/DoomedTraveler.java b/Mage.Sets/src/mage/sets/sorinvstibalt/DoomedTraveler.java
index 7d2835b0b6..49d1f722e7 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/DoomedTraveler.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/DoomedTraveler.java
@@ -37,7 +37,7 @@ public class DoomedTraveler extends mage.sets.innistrad.DoomedTraveler {
 
     public DoomedTraveler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/DuskhunterBat.java b/Mage.Sets/src/mage/sets/sorinvstibalt/DuskhunterBat.java
index ca92a79b16..4dee6e0b85 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/DuskhunterBat.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/DuskhunterBat.java
@@ -37,7 +37,7 @@ public class DuskhunterBat extends mage.sets.magic2012.DuskhunterBat {
 
     public DuskhunterBat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/EvolvingWilds.java b/Mage.Sets/src/mage/sets/sorinvstibalt/EvolvingWilds.java
index aed20ccb85..7e5a30cff5 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/FaithlessLooting.java b/Mage.Sets/src/mage/sets/sorinvstibalt/FaithlessLooting.java
index f8ff79a969..1743948400 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/FaithlessLooting.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/FaithlessLooting.java
@@ -37,7 +37,7 @@ public class FaithlessLooting extends mage.sets.darkascension.FaithlessLooting {
 
     public FaithlessLooting(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/FieldOfSouls.java b/Mage.Sets/src/mage/sets/sorinvstibalt/FieldOfSouls.java
index fd0d52ce71..db6c1ed2b2 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/FieldOfSouls.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/FieldOfSouls.java
@@ -37,7 +37,7 @@ public class FieldOfSouls extends mage.sets.tempestremastered.FieldOfSouls {
 
     public FieldOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/FiendHunter.java b/Mage.Sets/src/mage/sets/sorinvstibalt/FiendHunter.java
index 49347407c2..9990ba13cf 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/FiendHunter.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/FiendHunter.java
@@ -37,7 +37,7 @@ public class FiendHunter extends mage.sets.innistrad.FiendHunter {
 
     public FiendHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/FlameJavelin.java b/Mage.Sets/src/mage/sets/sorinvstibalt/FlameJavelin.java
index 1cf5486247..aae7682960 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/FlameJavelin.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/FlameJavelin.java
@@ -37,7 +37,7 @@ public class FlameJavelin extends mage.sets.shadowmoor.FlameJavelin {
 
     public FlameJavelin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/FlameSlash.java b/Mage.Sets/src/mage/sets/sorinvstibalt/FlameSlash.java
index 380367a5db..49024e6b39 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/FlameSlash.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/FlameSlash.java
@@ -37,7 +37,7 @@ public class FlameSlash extends mage.sets.riseoftheeldrazi.FlameSlash {
 
     public FlameSlash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/GangOfDevils.java b/Mage.Sets/src/mage/sets/sorinvstibalt/GangOfDevils.java
index f007b4eb0f..803fda7518 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/GangOfDevils.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/GangOfDevils.java
@@ -37,7 +37,7 @@ public class GangOfDevils extends mage.sets.avacynrestored.GangOfDevils {
 
     public GangOfDevils(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/sets/sorinvstibalt/GatekeeperOfMalakir.java
index 0c8a41f977..5bd7911848 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/GatekeeperOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/GatekeeperOfMalakir.java
@@ -37,7 +37,7 @@ public class GatekeeperOfMalakir extends mage.sets.zendikar.GatekeeperOfMalakir
 
     public GatekeeperOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Geistflame.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Geistflame.java
index 2df61815cc..9645baa828 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Geistflame.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Geistflame.java
@@ -37,7 +37,7 @@ public class Geistflame extends mage.sets.innistrad.Geistflame {
 
     public Geistflame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/GoblinArsonist.java b/Mage.Sets/src/mage/sets/sorinvstibalt/GoblinArsonist.java
index 650b4757fb..ed479bb725 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/GoblinArsonist.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/GoblinArsonist.java
@@ -37,7 +37,7 @@ public class GoblinArsonist extends mage.sets.riseoftheeldrazi.GoblinArsonist {
 
     public GoblinArsonist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Hellrider.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Hellrider.java
index 2029938c22..343c5300b9 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Hellrider.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Hellrider.java
@@ -37,7 +37,7 @@ public class Hellrider extends mage.sets.darkascension.Hellrider {
 
     public Hellrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/HellsparkElemental.java b/Mage.Sets/src/mage/sets/sorinvstibalt/HellsparkElemental.java
index fc89d5f4ea..965c8ded4a 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/HellsparkElemental.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/HellsparkElemental.java
@@ -37,7 +37,7 @@ public class HellsparkElemental extends mage.sets.conflux.HellsparkElemental {
 
     public HellsparkElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/LingeringSouls.java b/Mage.Sets/src/mage/sets/sorinvstibalt/LingeringSouls.java
index 9bd1701081..fd65adb989 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/LingeringSouls.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/LingeringSouls.java
@@ -37,7 +37,7 @@ public class LingeringSouls extends mage.sets.darkascension.LingeringSouls {
 
     public LingeringSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/MadProphet.java b/Mage.Sets/src/mage/sets/sorinvstibalt/MadProphet.java
index 5a4c5060bf..2c84692ffb 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/MadProphet.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/MadProphet.java
@@ -37,7 +37,7 @@ public class MadProphet extends mage.sets.avacynrestored.MadProphet {
 
     public MadProphet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/MarkOfTheVampire.java b/Mage.Sets/src/mage/sets/sorinvstibalt/MarkOfTheVampire.java
index dcf0ac30a4..06a32f4e6b 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/MarkOfTheVampire.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/MarkOfTheVampire.java
@@ -37,7 +37,7 @@ public class MarkOfTheVampire extends mage.sets.magic2013.MarkOfTheVampire {
 
     public MarkOfTheVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/MausoleumGuard.java b/Mage.Sets/src/mage/sets/sorinvstibalt/MausoleumGuard.java
index 76df1f7fa6..8d477451ff 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/MausoleumGuard.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/MausoleumGuard.java
@@ -37,7 +37,7 @@ public class MausoleumGuard extends mage.sets.innistrad.MausoleumGuard {
 
     public MausoleumGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/MesmericFiend.java b/Mage.Sets/src/mage/sets/sorinvstibalt/MesmericFiend.java
index 418cbb77b8..f0c9a17c96 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/MesmericFiend.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/MesmericFiend.java
@@ -37,7 +37,7 @@ public class MesmericFiend extends mage.sets.torment.MesmericFiend {
 
     public MesmericFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Mortify.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Mortify.java
index 7134206df0..a2d5556cd2 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Mortify.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Mortify.java
@@ -37,7 +37,7 @@ public class Mortify extends mage.sets.guildpact.Mortify {
 
     public Mortify(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/PhantomGeneral.java b/Mage.Sets/src/mage/sets/sorinvstibalt/PhantomGeneral.java
index 79d024390c..0849d5174c 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/PhantomGeneral.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/PhantomGeneral.java
@@ -37,7 +37,7 @@ public class PhantomGeneral extends mage.sets.returntoravnica.PhantomGeneral {
 
     public PhantomGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Pyroclasm.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Pyroclasm.java
index b8fe1fef74..cc315d1ac9 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Pyroclasm.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Pyroclasm.java
@@ -37,7 +37,7 @@ public class Pyroclasm extends mage.sets.tenthedition.Pyroclasm {
 
     public Pyroclasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/sorinvstibalt/RakdosCarnarium.java
index cbabb930f6..e5b71b5337 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/RakdosCarnarium.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/RakdosCarnarium.java
@@ -37,7 +37,7 @@ public class RakdosCarnarium extends mage.sets.dissension.RakdosCarnarium {
 
     public RakdosCarnarium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ReassemblingSkeleton.java
index 1f68cb8d72..876688d14c 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ReassemblingSkeleton.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ReassemblingSkeleton.java
@@ -37,7 +37,7 @@ public class ReassemblingSkeleton extends mage.sets.magic2011.ReassemblingSkelet
 
     public ReassemblingSkeleton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Recoup.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Recoup.java
index cba7536157..f4f984b57b 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Recoup.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Recoup.java
@@ -37,7 +37,7 @@ public class Recoup extends mage.sets.odyssey.Recoup {
 
     public Recoup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ScorchedRusalka.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ScorchedRusalka.java
index 6b0401cafc..7845ad6003 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ScorchedRusalka.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ScorchedRusalka.java
@@ -37,7 +37,7 @@ public class ScorchedRusalka extends mage.sets.guildpact.ScorchedRusalka {
 
     public ScorchedRusalka(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ScourgeDevil.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ScourgeDevil.java
index 64fed27e92..0fac840244 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ScourgeDevil.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ScourgeDevil.java
@@ -37,7 +37,7 @@ public class ScourgeDevil extends mage.sets.shardsofalara.ScourgeDevil {
 
     public ScourgeDevil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/SengirVampire.java b/Mage.Sets/src/mage/sets/sorinvstibalt/SengirVampire.java
index 70e36641cf..14db60e7f6 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ShamblingRemains.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ShamblingRemains.java
index 59b93f3c73..40a5b8f09e 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ShamblingRemains.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ShamblingRemains.java
@@ -37,7 +37,7 @@ public class ShamblingRemains extends mage.sets.conflux.ShamblingRemains {
 
     public ShamblingRemains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/SkirsdagCultist.java b/Mage.Sets/src/mage/sets/sorinvstibalt/SkirsdagCultist.java
index 8a710af45d..8f0a8a5edc 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/SkirsdagCultist.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/SkirsdagCultist.java
@@ -37,7 +37,7 @@ public class SkirsdagCultist extends mage.sets.innistrad.SkirsdagCultist {
 
     public SkirsdagCultist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/SorinLordOfInnistrad.java b/Mage.Sets/src/mage/sets/sorinvstibalt/SorinLordOfInnistrad.java
index 31cb98159a..880acb18f8 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/SorinLordOfInnistrad.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/SorinLordOfInnistrad.java
@@ -37,7 +37,7 @@ public class SorinLordOfInnistrad extends mage.sets.darkascension.SorinLordOfInn
 
     public SorinLordOfInnistrad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/SorinsThirst.java b/Mage.Sets/src/mage/sets/sorinvstibalt/SorinsThirst.java
index 2785c420a6..a89b5ba745 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/SorinsThirst.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/SorinsThirst.java
@@ -37,7 +37,7 @@ public class SorinsThirst extends mage.sets.magic2012.SorinsThirst {
 
     public SorinsThirst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/SpectralProcession.java b/Mage.Sets/src/mage/sets/sorinvstibalt/SpectralProcession.java
index 76ae681a95..1e57482a37 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/SpectralProcession.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/SpectralProcession.java
@@ -37,7 +37,7 @@ public class SpectralProcession extends mage.sets.shadowmoor.SpectralProcession
 
     public SpectralProcession(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/SulfuricVortex.java b/Mage.Sets/src/mage/sets/sorinvstibalt/SulfuricVortex.java
index 8846120fc2..99065eae2a 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/SulfuricVortex.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/SulfuricVortex.java
@@ -37,7 +37,7 @@ public class SulfuricVortex extends mage.sets.scourge.SulfuricVortex {
 
     public SulfuricVortex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/TaintedField.java b/Mage.Sets/src/mage/sets/sorinvstibalt/TaintedField.java
index 5ab36e9df4..92ac305fa6 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/TaintedField.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/TaintedField.java
@@ -37,7 +37,7 @@ public class TaintedField extends mage.sets.torment.TaintedField {
 
     public TaintedField(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Terminate.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Terminate.java
index be8dce9f7e..4a67d58ecc 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Terminate.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Terminate.java
@@ -37,7 +37,7 @@ public class Terminate extends mage.sets.alarareborn.Terminate {
 
     public Terminate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/TibaltTheFiendBlooded.java b/Mage.Sets/src/mage/sets/sorinvstibalt/TibaltTheFiendBlooded.java
index a7e0f80ef7..7eada14bf4 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/TibaltTheFiendBlooded.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/TibaltTheFiendBlooded.java
@@ -37,7 +37,7 @@ public class TibaltTheFiendBlooded extends mage.sets.avacynrestored.TibaltTheFie
 
     public TibaltTheFiendBlooded(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/TwilightDrover.java b/Mage.Sets/src/mage/sets/sorinvstibalt/TwilightDrover.java
index 7c8139d163..f563a7dd34 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/TwilightDrover.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/TwilightDrover.java
@@ -37,7 +37,7 @@ public class TwilightDrover extends mage.sets.ravnica.TwilightDrover {
 
     public TwilightDrover(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Unmake.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Unmake.java
index 54403f9183..d5cde004af 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/Unmake.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Unmake.java
@@ -37,7 +37,7 @@ public class Unmake extends mage.sets.eventide.Unmake {
 
     public Unmake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/UrgeToFeed.java b/Mage.Sets/src/mage/sets/sorinvstibalt/UrgeToFeed.java
index 3e6e10b9d2..084d66e8c2 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/UrgeToFeed.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/UrgeToFeed.java
@@ -37,7 +37,7 @@ public class UrgeToFeed extends mage.sets.worldwake.UrgeToFeed {
 
     public UrgeToFeed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/VampireLacerator.java b/Mage.Sets/src/mage/sets/sorinvstibalt/VampireLacerator.java
index b020196b69..52a6c96249 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/VampireLacerator.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/VampireLacerator.java
@@ -37,7 +37,7 @@ public class VampireLacerator extends mage.sets.zendikar.VampireLacerator {
 
     public VampireLacerator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/VampireNighthawk.java b/Mage.Sets/src/mage/sets/sorinvstibalt/VampireNighthawk.java
index eda51c7ed0..e6ad2c99df 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/VampireNighthawk.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/VampireNighthawk.java
@@ -37,7 +37,7 @@ public class VampireNighthawk extends mage.sets.zendikar.VampireNighthawk {
 
     public VampireNighthawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/VampireOutcasts.java b/Mage.Sets/src/mage/sets/sorinvstibalt/VampireOutcasts.java
index 915ec7ff60..a439a3740c 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/VampireOutcasts.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/VampireOutcasts.java
@@ -37,7 +37,7 @@ public class VampireOutcasts extends mage.sets.magic2012.VampireOutcasts {
 
     public VampireOutcasts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/VampiresBite.java b/Mage.Sets/src/mage/sets/sorinvstibalt/VampiresBite.java
index 5c201fb1d4..3387a1f13e 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/VampiresBite.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/VampiresBite.java
@@ -37,7 +37,7 @@ public class VampiresBite extends mage.sets.zendikar.VampiresBite {
 
     public VampiresBite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/VithianStinger.java b/Mage.Sets/src/mage/sets/sorinvstibalt/VithianStinger.java
index 04a9f29fc7..8af6280aa8 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/VithianStinger.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/VithianStinger.java
@@ -37,7 +37,7 @@ public class VithianStinger extends mage.sets.shardsofalara.VithianStinger {
 
     public VithianStinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/WallOfOmens.java b/Mage.Sets/src/mage/sets/sorinvstibalt/WallOfOmens.java
index d54021c725..b147e5bf19 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/WallOfOmens.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/WallOfOmens.java
@@ -37,7 +37,7 @@ public class WallOfOmens extends mage.sets.riseoftheeldrazi.WallOfOmens {
 
     public WallOfOmens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/ZealousPersecution.java b/Mage.Sets/src/mage/sets/sorinvstibalt/ZealousPersecution.java
index 6e291abddc..c95948bf1d 100644
--- a/Mage.Sets/src/mage/sets/sorinvstibalt/ZealousPersecution.java
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/ZealousPersecution.java
@@ -37,7 +37,7 @@ public class ZealousPersecution extends mage.sets.alarareborn.ZealousPersecution
 
     public ZealousPersecution(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ActOfTreason.java b/Mage.Sets/src/mage/sets/speedvscunning/ActOfTreason.java
index c331a7eb94..26c3a05f16 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ActOfTreason.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ActOfTreason.java
@@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
 
     public ActOfTreason(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDN";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ArcTrail.java b/Mage.Sets/src/mage/sets/speedvscunning/ArcTrail.java
index 4099afbe35..04fde9abd2 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ArcTrail.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ArcTrail.java
@@ -37,7 +37,7 @@ public class ArcTrail extends mage.sets.scarsofmirrodin.ArcTrail {
 
     public ArcTrail(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/sets/speedvscunning/ArcanisTheOmnipotent.java
index 9976af3ed8..69dd89f6f6 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ArcanisTheOmnipotent.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ArcanisTheOmnipotent.java
@@ -38,7 +38,7 @@ public class ArcanisTheOmnipotent extends mage.sets.tenthedition.ArcanisTheOmnip
 
     public ArcanisTheOmnipotent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDN";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ArrowVolleyTrap.java b/Mage.Sets/src/mage/sets/speedvscunning/ArrowVolleyTrap.java
index 294177b716..b14e3f3b86 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ArrowVolleyTrap.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ArrowVolleyTrap.java
@@ -37,7 +37,7 @@ public class ArrowVolleyTrap extends mage.sets.zendikar.ArrowVolleyTrap {
 
     public ArrowVolleyTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/Banefire.java b/Mage.Sets/src/mage/sets/speedvscunning/Banefire.java
index f6a0e3ccdd..70b67cd19e 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/Banefire.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/Banefire.java
@@ -37,7 +37,7 @@ public class Banefire extends mage.sets.conflux.Banefire {
 
     public Banefire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/BeetlebackChief.java b/Mage.Sets/src/mage/sets/speedvscunning/BeetlebackChief.java
index b73bcc5ac3..edaf06d8f9 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/BeetlebackChief.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/BeetlebackChief.java
@@ -37,7 +37,7 @@ public class BeetlebackChief extends mage.sets.planechase2012.BeetlebackChief {
 
     public BeetlebackChief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/BoneSplinters.java b/Mage.Sets/src/mage/sets/speedvscunning/BoneSplinters.java
index 40f0b09e5d..142cc17c2b 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/BoneSplinters.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/BoneSplinters.java
@@ -37,7 +37,7 @@ public class BoneSplinters extends mage.sets.shardsofalara.BoneSplinters {
 
     public BoneSplinters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/DauntlessOnslaught.java b/Mage.Sets/src/mage/sets/speedvscunning/DauntlessOnslaught.java
index e891adc957..13c77bcf93 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/DauntlessOnslaught.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/DauntlessOnslaught.java
@@ -37,7 +37,7 @@ public class DauntlessOnslaught extends mage.sets.theros.DauntlessOnslaught {
 
     public DauntlessOnslaught(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/DregscapeZombie.java b/Mage.Sets/src/mage/sets/speedvscunning/DregscapeZombie.java
index c677bdaf54..812acf731a 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/DregscapeZombie.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/DregscapeZombie.java
@@ -37,7 +37,7 @@ public class DregscapeZombie extends mage.sets.shardsofalara.DregscapeZombie {
 
     public DregscapeZombie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/EvolvingWilds.java b/Mage.Sets/src/mage/sets/speedvscunning/EvolvingWilds.java
index bf64b02b93..93434936d4 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FaerieImpostor.java b/Mage.Sets/src/mage/sets/speedvscunning/FaerieImpostor.java
index e839417077..09e24da9a6 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FaerieImpostor.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FaerieImpostor.java
@@ -37,7 +37,7 @@ public class FaerieImpostor extends mage.sets.returntoravnica.FaerieImpostor {
 
     public FaerieImpostor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FaerieInvaders.java b/Mage.Sets/src/mage/sets/speedvscunning/FaerieInvaders.java
index fb0814ec5a..01a11d48c0 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FaerieInvaders.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FaerieInvaders.java
@@ -37,7 +37,7 @@ public class FaerieInvaders extends mage.sets.magic2013.FaerieInvaders {
 
     public FaerieInvaders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FathomSeer.java b/Mage.Sets/src/mage/sets/speedvscunning/FathomSeer.java
index 5373eca38e..ecea717b15 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FathomSeer.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FathomSeer.java
@@ -37,7 +37,7 @@ public class FathomSeer extends mage.sets.jacevschandra.FathomSeer {
 
     public FathomSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FieryFall.java b/Mage.Sets/src/mage/sets/speedvscunning/FieryFall.java
index aeeb4ca03c..bd80724522 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FieryFall.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FieryFall.java
@@ -37,7 +37,7 @@ public class FieryFall extends mage.sets.conflux.FieryFall {
 
     public FieryFall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FlameKinZealot.java b/Mage.Sets/src/mage/sets/speedvscunning/FlameKinZealot.java
index 8f7ce84b42..7fb4f61213 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FlameKinZealot.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FlameKinZealot.java
@@ -37,7 +37,7 @@ public class FlameKinZealot extends mage.sets.ravnica.FlameKinZealot {
 
     public FlameKinZealot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FleetingDistraction.java b/Mage.Sets/src/mage/sets/speedvscunning/FleetingDistraction.java
index a829cbd34b..28c12da23e 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FleetingDistraction.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FleetingDistraction.java
@@ -37,7 +37,7 @@ public class FleetingDistraction extends mage.sets.riseoftheeldrazi.FleetingDist
 
     public FleetingDistraction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/speedvscunning/FleshbagMarauder.java
index 471d52f3b9..1129a9aaed 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FleshbagMarauder.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FleshbagMarauder.java
@@ -37,7 +37,7 @@ public class FleshbagMarauder extends mage.sets.shardsofalara.FleshbagMarauder {
 
     public FleshbagMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FrenziedGoblin.java b/Mage.Sets/src/mage/sets/speedvscunning/FrenziedGoblin.java
index d35d92124a..8bcebd9707 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FrenziedGoblin.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FrenziedGoblin.java
@@ -37,7 +37,7 @@ public class FrenziedGoblin extends mage.sets.ravnica.FrenziedGoblin {
 
     public FrenziedGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/FuryOfTheHorde.java b/Mage.Sets/src/mage/sets/speedvscunning/FuryOfTheHorde.java
index bf76a574ab..fa69aee63e 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/FuryOfTheHorde.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/FuryOfTheHorde.java
@@ -37,7 +37,7 @@ public class FuryOfTheHorde extends mage.sets.coldsnap.FuryOfTheHorde {
 
     public FuryOfTheHorde(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/GhituEncampment.java b/Mage.Sets/src/mage/sets/speedvscunning/GhituEncampment.java
index d983df8359..0bedc6cbb4 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/GhituEncampment.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/GhituEncampment.java
@@ -37,7 +37,7 @@ public class GhituEncampment extends mage.sets.tenthedition.GhituEncampment {
 
     public GhituEncampment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/GoblinBombardment.java b/Mage.Sets/src/mage/sets/speedvscunning/GoblinBombardment.java
index 325e77a910..f8cb255bd9 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/GoblinBombardment.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/GoblinBombardment.java
@@ -37,7 +37,7 @@ public class GoblinBombardment extends mage.sets.tempest.GoblinBombardment {
 
     public GoblinBombardment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/GoblinDeathraiders.java b/Mage.Sets/src/mage/sets/speedvscunning/GoblinDeathraiders.java
index 1606d5e40a..9504025814 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/GoblinDeathraiders.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/GoblinDeathraiders.java
@@ -37,7 +37,7 @@ public class GoblinDeathraiders extends mage.sets.shardsofalara.GoblinDeathraide
 
     public GoblinDeathraiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/GoblinWarchief.java b/Mage.Sets/src/mage/sets/speedvscunning/GoblinWarchief.java
index 83bcc75ff4..c37dd0bec8 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/GoblinWarchief.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/GoblinWarchief.java
@@ -37,7 +37,7 @@ public class GoblinWarchief extends mage.sets.scourge.GoblinWarchief {
 
     public GoblinWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/HellraiserGoblin.java b/Mage.Sets/src/mage/sets/speedvscunning/HellraiserGoblin.java
index 5e3377a9af..b0879deb58 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/HellraiserGoblin.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/HellraiserGoblin.java
@@ -37,7 +37,7 @@ public class HellraiserGoblin extends mage.sets.gatecrash.HellraiserGoblin {
 
     public HellraiserGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/HellsThunder.java b/Mage.Sets/src/mage/sets/speedvscunning/HellsThunder.java
index e09e8e8891..72a8d44464 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/HellsThunder.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/HellsThunder.java
@@ -37,7 +37,7 @@ public class HellsThunder extends mage.sets.shardsofalara.HellsThunder {
 
     public HellsThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/HoldTheLine.java b/Mage.Sets/src/mage/sets/speedvscunning/HoldTheLine.java
index 7111ec17c9..776394ff85 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/HoldTheLine.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/HoldTheLine.java
@@ -37,7 +37,7 @@ public class HoldTheLine extends mage.sets.championsofkamigawa.HoldTheLine {
 
     public HoldTheLine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/HussarPatrol.java b/Mage.Sets/src/mage/sets/speedvscunning/HussarPatrol.java
index b9efb3f767..1e54041fad 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/HussarPatrol.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/HussarPatrol.java
@@ -37,7 +37,7 @@ public class HussarPatrol extends mage.sets.returntoravnica.HussarPatrol {
 
     public HussarPatrol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/Impulse.java b/Mage.Sets/src/mage/sets/speedvscunning/Impulse.java
index 1fb6b6f177..e3d98c51e3 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/Impulse.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/Impulse.java
@@ -37,7 +37,7 @@ public class Impulse extends mage.sets.visions.Impulse {
 
     public Impulse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/InfantryVeteran.java b/Mage.Sets/src/mage/sets/speedvscunning/InfantryVeteran.java
index 7f4198ecbc..6926fe5cb9 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/InfantryVeteran.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/InfantryVeteran.java
@@ -37,7 +37,7 @@ public class InfantryVeteran extends mage.sets.magic2011.InfantryVeteran {
 
     public InfantryVeteran(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/InfernoTrap.java b/Mage.Sets/src/mage/sets/speedvscunning/InfernoTrap.java
index 22bee4fad5..6f542f822b 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/InfernoTrap.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/InfernoTrap.java
@@ -37,7 +37,7 @@ public class InfernoTrap extends mage.sets.zendikar.InfernoTrap {
 
     public InfernoTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/JeskaiElder.java b/Mage.Sets/src/mage/sets/speedvscunning/JeskaiElder.java
index 3bce2ab0df..1820a50bc1 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/JeskaiElder.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/JeskaiElder.java
@@ -37,7 +37,7 @@ public class JeskaiElder extends mage.sets.khansoftarkir.JeskaiElder {
 
     public JeskaiElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/KathariBomber.java b/Mage.Sets/src/mage/sets/speedvscunning/KathariBomber.java
index a9b67cb61c..eb3794dcdf 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/KathariBomber.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/KathariBomber.java
@@ -37,7 +37,7 @@ public class KathariBomber extends mage.sets.alarareborn.KathariBomber {
 
     public KathariBomber(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/KorHookmaster.java b/Mage.Sets/src/mage/sets/speedvscunning/KorHookmaster.java
index ec577c15af..c1fb9c7d86 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/KorHookmaster.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/KorHookmaster.java
@@ -37,7 +37,7 @@ public class KorHookmaster extends mage.sets.zendikar.KorHookmaster {
 
     public KorHookmaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/KrenkoMobBoss.java b/Mage.Sets/src/mage/sets/speedvscunning/KrenkoMobBoss.java
index 2aed4bca2b..4fc9d74fa2 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/KrenkoMobBoss.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/KrenkoMobBoss.java
@@ -37,7 +37,7 @@ public class KrenkoMobBoss extends mage.sets.magic2013.KrenkoMobBoss {
 
     public KrenkoMobBoss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/KrenkosCommand.java b/Mage.Sets/src/mage/sets/speedvscunning/KrenkosCommand.java
index 1aee842729..f2044a89d9 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/KrenkosCommand.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/KrenkosCommand.java
@@ -37,7 +37,7 @@ public class KrenkosCommand extends mage.sets.magic2013.KrenkosCommand {
 
     public KrenkosCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/LeoninSnarecaster.java b/Mage.Sets/src/mage/sets/speedvscunning/LeoninSnarecaster.java
index 978bd68e29..b19142d5f4 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/LeoninSnarecaster.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/LeoninSnarecaster.java
@@ -37,7 +37,7 @@ public class LeoninSnarecaster extends mage.sets.theros.LeoninSnarecaster {
 
     public LeoninSnarecaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/LightningAngel.java b/Mage.Sets/src/mage/sets/speedvscunning/LightningAngel.java
index bb040913ca..c27980ab89 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/LightningAngel.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/LightningAngel.java
@@ -37,7 +37,7 @@ public class LightningAngel extends mage.sets.apocalypse.LightningAngel {
 
     public LightningAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/LightningHelix.java b/Mage.Sets/src/mage/sets/speedvscunning/LightningHelix.java
index ec15b7054e..4df1c753c7 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/LightningHelix.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/LightningHelix.java
@@ -37,7 +37,7 @@ public class LightningHelix extends mage.sets.ravnica.LightningHelix {
 
     public LightningHelix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/LoneMissionary.java b/Mage.Sets/src/mage/sets/speedvscunning/LoneMissionary.java
index 69b4d16164..05ea7fdf23 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/LoneMissionary.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/LoneMissionary.java
@@ -37,7 +37,7 @@ public class LoneMissionary extends mage.sets.riseoftheeldrazi.LoneMissionary {
 
     public LoneMissionary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ManaLeak.java b/Mage.Sets/src/mage/sets/speedvscunning/ManaLeak.java
index 43467e4aa3..3e9a6131bf 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/MarduHeartPiercer.java b/Mage.Sets/src/mage/sets/speedvscunning/MarduHeartPiercer.java
index 69e0fec6d9..76f91f6eed 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/MarduHeartPiercer.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/MarduHeartPiercer.java
@@ -37,7 +37,7 @@ public class MarduHeartPiercer extends mage.sets.khansoftarkir.MarduHeartPiercer
 
     public MarduHeartPiercer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/MasterDecoy.java b/Mage.Sets/src/mage/sets/speedvscunning/MasterDecoy.java
index 00a6a80e9d..0a2a1c470c 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/MasterDecoy.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/MasterDecoy.java
@@ -37,7 +37,7 @@ public class MasterDecoy extends mage.sets.tempest.MasterDecoy {
 
     public MasterDecoy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/MysticMonastery.java b/Mage.Sets/src/mage/sets/speedvscunning/MysticMonastery.java
index 766a6debe4..23801b03de 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/MysticMonastery.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/MysticMonastery.java
@@ -37,7 +37,7 @@ public class MysticMonastery extends mage.sets.khansoftarkir.MysticMonastery {
 
     public MysticMonastery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/NomadOutpost.java b/Mage.Sets/src/mage/sets/speedvscunning/NomadOutpost.java
index 1af70a576c..bb753124cf 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/NomadOutpost.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/NomadOutpost.java
@@ -37,7 +37,7 @@ public class NomadOutpost extends mage.sets.khansoftarkir.NomadOutpost {
 
     public NomadOutpost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/OgreBattledriver.java b/Mage.Sets/src/mage/sets/speedvscunning/OgreBattledriver.java
index 91e0015d48..0ac925f6d7 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/OgreBattledriver.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/OgreBattledriver.java
@@ -37,7 +37,7 @@ public class OgreBattledriver extends mage.sets.magic2014.OgreBattledriver {
 
     public OgreBattledriver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/OniOfWildPlaces.java b/Mage.Sets/src/mage/sets/speedvscunning/OniOfWildPlaces.java
index a5d578041e..77f0c94f38 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/OniOfWildPlaces.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/OniOfWildPlaces.java
@@ -37,7 +37,7 @@ public class OniOfWildPlaces extends mage.sets.saviorsofkamigawa.OniOfWildPlaces
 
     public OniOfWildPlaces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/Repeal.java b/Mage.Sets/src/mage/sets/speedvscunning/Repeal.java
index 2bc83babeb..666e8492f9 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/Repeal.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/Repeal.java
@@ -37,7 +37,7 @@ public class Repeal extends mage.sets.guildpact.Repeal {
 
     public Repeal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ScourgeDevil.java b/Mage.Sets/src/mage/sets/speedvscunning/ScourgeDevil.java
index c7cb49988e..cc3d82bca1 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ScourgeDevil.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ScourgeDevil.java
@@ -37,7 +37,7 @@ public class ScourgeDevil extends mage.sets.shardsofalara.ScourgeDevil {
 
     public ScourgeDevil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ShamblingRemains.java b/Mage.Sets/src/mage/sets/speedvscunning/ShamblingRemains.java
index 4854d8d9a1..55765b432e 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ShamblingRemains.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ShamblingRemains.java
@@ -37,7 +37,7 @@ public class ShamblingRemains extends mage.sets.conflux.ShamblingRemains {
 
     public ShamblingRemains(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/Shock.java b/Mage.Sets/src/mage/sets/speedvscunning/Shock.java
index 704947f3b0..fa32828948 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/Shock.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/SparkmageApprentice.java b/Mage.Sets/src/mage/sets/speedvscunning/SparkmageApprentice.java
index 511699985d..4b24b54905 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/SparkmageApprentice.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/SparkmageApprentice.java
@@ -37,7 +37,7 @@ public class SparkmageApprentice extends mage.sets.magic2010.SparkmageApprentice
 
     public SparkmageApprentice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/SphinxOfUthuun.java b/Mage.Sets/src/mage/sets/speedvscunning/SphinxOfUthuun.java
index c924e0547f..d1f87e5fea 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/SphinxOfUthuun.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/SphinxOfUthuun.java
@@ -37,7 +37,7 @@ public class SphinxOfUthuun extends mage.sets.magic2012.SphinxOfUthuun {
 
     public SphinxOfUthuun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/StaveOff.java b/Mage.Sets/src/mage/sets/speedvscunning/StaveOff.java
index b165822e1e..9dd4564c5d 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/StaveOff.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/StaveOff.java
@@ -37,7 +37,7 @@ public class StaveOff extends mage.sets.magic2012.StaveOff {
 
     public StaveOff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/SteamAugury.java b/Mage.Sets/src/mage/sets/speedvscunning/SteamAugury.java
index 0bbc2cfabe..5e65bebdc2 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/SteamAugury.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/SteamAugury.java
@@ -37,7 +37,7 @@ public class SteamAugury extends mage.sets.theros.SteamAugury {
 
     public SteamAugury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/Stonecloaker.java b/Mage.Sets/src/mage/sets/speedvscunning/Stonecloaker.java
index b966a62248..6f89545c70 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/Stonecloaker.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/Stonecloaker.java
@@ -37,7 +37,7 @@ public class Stonecloaker extends mage.sets.commander2013.Stonecloaker {
 
     public Stonecloaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/SwiftJustice.java b/Mage.Sets/src/mage/sets/speedvscunning/SwiftJustice.java
index 07806c5f21..ee8b3fffda 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/SwiftJustice.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/SwiftJustice.java
@@ -37,7 +37,7 @@ public class SwiftJustice extends mage.sets.returntoravnica.SwiftJustice {
 
     public SwiftJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/speedvscunning/TerramorphicExpanse.java
index e2ecc1d72d..2ec3efe0aa 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ThousandWinds.java b/Mage.Sets/src/mage/sets/speedvscunning/ThousandWinds.java
index 0f5fe0640f..f769f65637 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ThousandWinds.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ThousandWinds.java
@@ -37,7 +37,7 @@ public class ThousandWinds extends mage.sets.khansoftarkir.ThousandWinds {
 
     public ThousandWinds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/TraumaticVisions.java b/Mage.Sets/src/mage/sets/speedvscunning/TraumaticVisions.java
index 6a5ce2a022..2ac04cf13c 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/TraumaticVisions.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/TraumaticVisions.java
@@ -37,7 +37,7 @@ public class TraumaticVisions extends mage.sets.conflux.TraumaticVisions {
 
     public TraumaticVisions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/WhiplashTrap.java b/Mage.Sets/src/mage/sets/speedvscunning/WhiplashTrap.java
index 4d496c42f4..6b41914838 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/WhiplashTrap.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/WhiplashTrap.java
@@ -37,7 +37,7 @@ public class WhiplashTrap extends mage.sets.zendikar.WhiplashTrap {
 
     public WhiplashTrap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/Willbender.java b/Mage.Sets/src/mage/sets/speedvscunning/Willbender.java
index ed7d95d606..fbafbf4527 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/Willbender.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/Willbender.java
@@ -37,7 +37,7 @@ public class Willbender extends mage.sets.commander2014.Willbender {
 
     public Willbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/speedvscunning/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/sets/speedvscunning/ZurgoHelmsmasher.java
index 0d1d3948f2..812407e304 100644
--- a/Mage.Sets/src/mage/sets/speedvscunning/ZurgoHelmsmasher.java
+++ b/Mage.Sets/src/mage/sets/speedvscunning/ZurgoHelmsmasher.java
@@ -37,7 +37,7 @@ public class ZurgoHelmsmasher extends mage.sets.khansoftarkir.ZurgoHelmsmasher {
 
     public ZurgoHelmsmasher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/AbyssalHorror.java b/Mage.Sets/src/mage/sets/starter1999/AbyssalHorror.java
index b5d58bb2aa..ebb8547c89 100644
--- a/Mage.Sets/src/mage/sets/starter1999/AbyssalHorror.java
+++ b/Mage.Sets/src/mage/sets/starter1999/AbyssalHorror.java
@@ -37,7 +37,7 @@ public class AbyssalHorror extends mage.sets.urzassaga.AbyssalHorror {
 
     public AbyssalHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/AirElemental.java b/Mage.Sets/src/mage/sets/starter1999/AirElemental.java
index 1245722ab7..80f60cd465 100644
--- a/Mage.Sets/src/mage/sets/starter1999/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/starter1999/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java b/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java
index 8bb298116c..7d9c51fdc8 100644
--- a/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java
+++ b/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java
@@ -37,7 +37,7 @@ public class AlluringScent extends mage.sets.portal.AlluringScent {
 
     public AlluringScent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/AngelOfMercy.java b/Mage.Sets/src/mage/sets/starter1999/AngelOfMercy.java
index df11960550..a1bc6a7847 100644
--- a/Mage.Sets/src/mage/sets/starter1999/AngelOfMercy.java
+++ b/Mage.Sets/src/mage/sets/starter1999/AngelOfMercy.java
@@ -37,7 +37,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy {
 
     public AngelOfMercy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/AngelicBlessing.java b/Mage.Sets/src/mage/sets/starter1999/AngelicBlessing.java
index 1a7d963fbd..9ce5175696 100644
--- a/Mage.Sets/src/mage/sets/starter1999/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/starter1999/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Archangel.java b/Mage.Sets/src/mage/sets/starter1999/Archangel.java
index d23665007e..18305e8f92 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Archangel.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Archangel.java
@@ -38,7 +38,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel {
 
     public Archangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/ArdentMilitia.java b/Mage.Sets/src/mage/sets/starter1999/ArdentMilitia.java
index 7fb95cb11d..9d378213f6 100644
--- a/Mage.Sets/src/mage/sets/starter1999/ArdentMilitia.java
+++ b/Mage.Sets/src/mage/sets/starter1999/ArdentMilitia.java
@@ -37,7 +37,7 @@ public class ArdentMilitia extends mage.sets.eighthedition.ArdentMilitia {
 
     public ArdentMilitia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Armageddon.java b/Mage.Sets/src/mage/sets/starter1999/Armageddon.java
index 0fe7f47d84..0a88571e31 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BarbtoothWurm.java b/Mage.Sets/src/mage/sets/starter1999/BarbtoothWurm.java
index ea539a4d3e..076269b881 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BarbtoothWurm.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BarbtoothWurm.java
@@ -37,7 +37,7 @@ public class BarbtoothWurm extends mage.sets.portalsecondage.BarbtoothWurm {
 
     public BarbtoothWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BlindingLight.java b/Mage.Sets/src/mage/sets/starter1999/BlindingLight.java
index 922f908494..5eef2cb179 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BlindingLight.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BlindingLight.java
@@ -39,7 +39,7 @@ public class BlindingLight extends mage.sets.mirage.BlindingLight {
 
     public BlindingLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/BogImp.java b/Mage.Sets/src/mage/sets/starter1999/BogImp.java
index 9f03367aa9..65b26c852f 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BogImp.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BogRaiders.java b/Mage.Sets/src/mage/sets/starter1999/BogRaiders.java
index 875000b044..bc38eec0ec 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BogRaiders.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BogRaiders.java
@@ -37,7 +37,7 @@ public class BogRaiders extends mage.sets.magic2011.BogRaiders {
 
     public BogRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BogWraith.java b/Mage.Sets/src/mage/sets/starter1999/BogWraith.java
index 9d7f296a35..ebb2375dd3 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BorderGuard.java b/Mage.Sets/src/mage/sets/starter1999/BorderGuard.java
index a23804b978..865243f3a5 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BorderGuard.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BorderGuard.java
@@ -37,7 +37,7 @@ public class BorderGuard extends mage.sets.portal.BorderGuard {
 
     public BorderGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BreathOfLife.java b/Mage.Sets/src/mage/sets/starter1999/BreathOfLife.java
index e07c153516..3bb51572ca 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BreathOfLife.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BreathOfLife.java
@@ -37,7 +37,7 @@ public class BreathOfLife extends mage.sets.starter2000.BreathOfLife {
 
     public BreathOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/BullHippo.java b/Mage.Sets/src/mage/sets/starter1999/BullHippo.java
index 87afd1978d..ff38c8082e 100644
--- a/Mage.Sets/src/mage/sets/starter1999/BullHippo.java
+++ b/Mage.Sets/src/mage/sets/starter1999/BullHippo.java
@@ -37,7 +37,7 @@ public class BullHippo extends mage.sets.urzassaga.BullHippo {
 
     public BullHippo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/ChargingPaladin.java b/Mage.Sets/src/mage/sets/starter1999/ChargingPaladin.java
index 3890318519..1886eec949 100644
--- a/Mage.Sets/src/mage/sets/starter1999/ChargingPaladin.java
+++ b/Mage.Sets/src/mage/sets/starter1999/ChargingPaladin.java
@@ -38,7 +38,7 @@ public class ChargingPaladin extends mage.sets.divinevsdemonic.ChargingPaladin {
 
     public ChargingPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/ChorusOfWoe.java b/Mage.Sets/src/mage/sets/starter1999/ChorusOfWoe.java
index 8c5c14fbb3..b7449a20ec 100644
--- a/Mage.Sets/src/mage/sets/starter1999/ChorusOfWoe.java
+++ b/Mage.Sets/src/mage/sets/starter1999/ChorusOfWoe.java
@@ -37,7 +37,7 @@ public class ChorusOfWoe extends mage.sets.portalsecondage.ChorusOfWoe {
 
     public ChorusOfWoe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Coercion.java b/Mage.Sets/src/mage/sets/starter1999/Coercion.java
index 2562805d25..6503595aeb 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Coercion.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Coercion.java
@@ -38,7 +38,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/CoralEel.java b/Mage.Sets/src/mage/sets/starter1999/CoralEel.java
index 711f6b72f0..f29c4d6ac7 100644
--- a/Mage.Sets/src/mage/sets/starter1999/CoralEel.java
+++ b/Mage.Sets/src/mage/sets/starter1999/CoralEel.java
@@ -37,7 +37,7 @@ public class CoralEel extends mage.sets.eighthedition.CoralEel {
 
     public CoralEel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Counterspell.java b/Mage.Sets/src/mage/sets/starter1999/Counterspell.java
index 509046b166..22ac381715 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/DakmorScorpion.java b/Mage.Sets/src/mage/sets/starter1999/DakmorScorpion.java
index 1a0c3f3354..23640077dd 100644
--- a/Mage.Sets/src/mage/sets/starter1999/DakmorScorpion.java
+++ b/Mage.Sets/src/mage/sets/starter1999/DakmorScorpion.java
@@ -37,7 +37,7 @@ public class DakmorScorpion extends mage.sets.portalsecondage.DakmorScorpion {
 
     public DakmorScorpion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/DarkOffering.java b/Mage.Sets/src/mage/sets/starter1999/DarkOffering.java
index e772e5455b..8cd6ae084d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/DarkOffering.java
+++ b/Mage.Sets/src/mage/sets/starter1999/DarkOffering.java
@@ -37,7 +37,7 @@ public class DarkOffering extends mage.sets.portalsecondage.DarkOffering {
 
     public DarkOffering(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/DenizenOfTheDeep.java b/Mage.Sets/src/mage/sets/starter1999/DenizenOfTheDeep.java
index 438a06e7bc..541ae470d9 100644
--- a/Mage.Sets/src/mage/sets/starter1999/DenizenOfTheDeep.java
+++ b/Mage.Sets/src/mage/sets/starter1999/DenizenOfTheDeep.java
@@ -37,7 +37,7 @@ public class DenizenOfTheDeep extends mage.sets.tenthedition.DenizenOfTheDeep {
 
     public DenizenOfTheDeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Devastation.java b/Mage.Sets/src/mage/sets/starter1999/Devastation.java
index 6520b87a5b..0a23a8052b 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Devastation.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Devastation.java
@@ -37,7 +37,7 @@ public class Devastation extends mage.sets.portal.Devastation {
 
     public Devastation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/DevotedHero.java b/Mage.Sets/src/mage/sets/starter1999/DevotedHero.java
index 72211d8453..50bba5df32 100644
--- a/Mage.Sets/src/mage/sets/starter1999/DevotedHero.java
+++ b/Mage.Sets/src/mage/sets/starter1999/DevotedHero.java
@@ -37,7 +37,7 @@ public class DevotedHero extends mage.sets.portal.DevotedHero {
 
     public DevotedHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/DurkwoodBoars.java b/Mage.Sets/src/mage/sets/starter1999/DurkwoodBoars.java
index 7b7577c76a..64ca78c5b9 100644
--- a/Mage.Sets/src/mage/sets/starter1999/DurkwoodBoars.java
+++ b/Mage.Sets/src/mage/sets/starter1999/DurkwoodBoars.java
@@ -37,7 +37,7 @@ public class DurkwoodBoars extends mage.sets.fifthedition.DurkwoodBoars {
 
     public DurkwoodBoars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/EagerCadet.java b/Mage.Sets/src/mage/sets/starter1999/EagerCadet.java
index 8298b657a9..ccf36c3816 100644
--- a/Mage.Sets/src/mage/sets/starter1999/EagerCadet.java
+++ b/Mage.Sets/src/mage/sets/starter1999/EagerCadet.java
@@ -37,7 +37,7 @@ public class EagerCadet extends mage.sets.seventhedition.EagerCadet {
 
     public EagerCadet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/EarthElemental.java b/Mage.Sets/src/mage/sets/starter1999/EarthElemental.java
index 20cf3900c2..f21a449799 100644
--- a/Mage.Sets/src/mage/sets/starter1999/EarthElemental.java
+++ b/Mage.Sets/src/mage/sets/starter1999/EarthElemental.java
@@ -37,7 +37,7 @@ public class EarthElemental extends mage.sets.tenthedition.EarthElemental {
 
     public EarthElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Exhaustion.java b/Mage.Sets/src/mage/sets/starter1999/Exhaustion.java
index 82b1580ae6..5cd086f5c3 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Exhaustion.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Exhaustion.java
@@ -38,7 +38,7 @@ public class Exhaustion extends mage.sets.portalthreekingdoms.Exhaustion {
 
     public Exhaustion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/Extinguish.java b/Mage.Sets/src/mage/sets/starter1999/Extinguish.java
index b602dc8b6d..128f23aecf 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Extinguish.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Extinguish.java
@@ -37,7 +37,7 @@ public class Extinguish extends mage.sets.portalsecondage.Extinguish {
 
     public Extinguish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/FeralShadow.java b/Mage.Sets/src/mage/sets/starter1999/FeralShadow.java
index dcefe60712..9e152ee491 100644
--- a/Mage.Sets/src/mage/sets/starter1999/FeralShadow.java
+++ b/Mage.Sets/src/mage/sets/starter1999/FeralShadow.java
@@ -37,7 +37,7 @@ public class FeralShadow extends mage.sets.mirage.FeralShadow {
 
     public FeralShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/FireElemental.java b/Mage.Sets/src/mage/sets/starter1999/FireElemental.java
index 0dca1e8ee0..33625988e2 100644
--- a/Mage.Sets/src/mage/sets/starter1999/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/starter1999/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/FireTempest.java b/Mage.Sets/src/mage/sets/starter1999/FireTempest.java
index a68ba48a31..7a5ad0edee 100644
--- a/Mage.Sets/src/mage/sets/starter1999/FireTempest.java
+++ b/Mage.Sets/src/mage/sets/starter1999/FireTempest.java
@@ -37,7 +37,7 @@ public class FireTempest extends mage.sets.portal.FireTempest {
 
     public FireTempest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/FootSoldiers.java b/Mage.Sets/src/mage/sets/starter1999/FootSoldiers.java
index e548021b41..a658dc9b20 100644
--- a/Mage.Sets/src/mage/sets/starter1999/FootSoldiers.java
+++ b/Mage.Sets/src/mage/sets/starter1999/FootSoldiers.java
@@ -37,7 +37,7 @@ public class FootSoldiers extends mage.sets.ninthedition.FootSoldiers {
 
     public FootSoldiers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GiantOctopus.java b/Mage.Sets/src/mage/sets/starter1999/GiantOctopus.java
index 5ae6dca448..8e75a9bc46 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GiantOctopus.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GiantOctopus.java
@@ -37,7 +37,7 @@ public class GiantOctopus extends mage.sets.seventhedition.GiantOctopus {
 
     public GiantOctopus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinCavaliers.java b/Mage.Sets/src/mage/sets/starter1999/GoblinCavaliers.java
index 27a2497842..141b553fc2 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinCavaliers.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinCavaliers.java
@@ -37,7 +37,7 @@ public class GoblinCavaliers extends mage.sets.portalsecondage.GoblinCavaliers {
 
     public GoblinCavaliers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinChariot.java b/Mage.Sets/src/mage/sets/starter1999/GoblinChariot.java
index 33b40d356d..21a6588130 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinChariot.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinChariot.java
@@ -37,7 +37,7 @@ public class GoblinChariot extends mage.sets.ninthedition.GoblinChariot {
 
     public GoblinChariot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinCommando.java b/Mage.Sets/src/mage/sets/starter1999/GoblinCommando.java
index f1a5ab24ee..4eb9810b8b 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinCommando.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinCommando.java
@@ -38,7 +38,7 @@ public class GoblinCommando extends mage.sets.vintagemasters.GoblinCommando {
 
     public GoblinCommando(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinGeneral.java b/Mage.Sets/src/mage/sets/starter1999/GoblinGeneral.java
index 9c8e72f90b..fcfc3b08fc 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinGeneral.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinGeneral.java
@@ -38,7 +38,7 @@ public class GoblinGeneral extends mage.sets.vintagemasters.GoblinGeneral {
 
     public GoblinGeneral(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinGlider.java b/Mage.Sets/src/mage/sets/starter1999/GoblinGlider.java
index be93a36077..45b018a937 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinGlider.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinGlider.java
@@ -37,7 +37,7 @@ public class GoblinGlider extends mage.sets.seventhedition.GoblinGlider {
 
     public GoblinGlider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinHero.java b/Mage.Sets/src/mage/sets/starter1999/GoblinHero.java
index 70a0779719..bff2e30302 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinHero.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinHero.java
@@ -38,7 +38,7 @@ public class GoblinHero extends mage.sets.fifthedition.GoblinHero {
 
     public GoblinHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinLore.java b/Mage.Sets/src/mage/sets/starter1999/GoblinLore.java
index c9425aa25d..4db5dd0eb7 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinLore.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinLore.java
@@ -37,7 +37,7 @@ public class GoblinLore extends mage.sets.tenthedition.GoblinLore {
 
     public GoblinLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinMountaineer.java b/Mage.Sets/src/mage/sets/starter1999/GoblinMountaineer.java
index 8acf2315e2..b4351f76f1 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinMountaineer.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinMountaineer.java
@@ -37,7 +37,7 @@ public class GoblinMountaineer extends mage.sets.shardsofalara.GoblinMountaineer
 
     public GoblinMountaineer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GoblinSettler.java b/Mage.Sets/src/mage/sets/starter1999/GoblinSettler.java
index 3105c9e0e9..676767e01d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GoblinSettler.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GoblinSettler.java
@@ -37,7 +37,7 @@ public class GoblinSettler extends mage.sets.vintagemasters.GoblinSettler {
 
     public GoblinSettler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/GorillaWarrior.java b/Mage.Sets/src/mage/sets/starter1999/GorillaWarrior.java
index 40d0b8b53d..8294255ed8 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GorillaWarrior.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GorillaWarrior.java
@@ -37,7 +37,7 @@ public class GorillaWarrior extends mage.sets.urzassaga.GorillaWarrior {
 
     public GorillaWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Gravedigger.java b/Mage.Sets/src/mage/sets/starter1999/Gravedigger.java
index 7f9750b782..fe02cd73e7 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/GrizzlyBears.java b/Mage.Sets/src/mage/sets/starter1999/GrizzlyBears.java
index b052531d23..ffe6d07e4c 100644
--- a/Mage.Sets/src/mage/sets/starter1999/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/starter1999/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/HandOfDeath.java b/Mage.Sets/src/mage/sets/starter1999/HandOfDeath.java
index b5e8629d93..a00bd2cc9d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/HandOfDeath.java
+++ b/Mage.Sets/src/mage/sets/starter1999/HandOfDeath.java
@@ -37,7 +37,7 @@ public class HandOfDeath extends mage.sets.starter2000.HandOfDeath {
 
     public HandOfDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/HollowDogs.java b/Mage.Sets/src/mage/sets/starter1999/HollowDogs.java
index 72cdec525c..30a47f17a2 100644
--- a/Mage.Sets/src/mage/sets/starter1999/HollowDogs.java
+++ b/Mage.Sets/src/mage/sets/starter1999/HollowDogs.java
@@ -37,7 +37,7 @@ public class HollowDogs extends mage.sets.urzassaga.HollowDogs {
 
     public HollowDogs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/HulkingGoblin.java b/Mage.Sets/src/mage/sets/starter1999/HulkingGoblin.java
index 8d1b00a20a..f3c3764631 100644
--- a/Mage.Sets/src/mage/sets/starter1999/HulkingGoblin.java
+++ b/Mage.Sets/src/mage/sets/starter1999/HulkingGoblin.java
@@ -37,7 +37,7 @@ public class HulkingGoblin extends mage.sets.vintagemasters.HulkingGoblin {
 
     public HulkingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/IngeniousThief.java b/Mage.Sets/src/mage/sets/starter1999/IngeniousThief.java
index 5adce61ef9..5dbc4fc104 100644
--- a/Mage.Sets/src/mage/sets/starter1999/IngeniousThief.java
+++ b/Mage.Sets/src/mage/sets/starter1999/IngeniousThief.java
@@ -38,7 +38,7 @@ public class IngeniousThief extends mage.sets.portal.IngeniousThief {
 
     public IngeniousThief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/JaggedLightning.java b/Mage.Sets/src/mage/sets/starter1999/JaggedLightning.java
index 12847d5f78..5f43aecd24 100644
--- a/Mage.Sets/src/mage/sets/starter1999/JaggedLightning.java
+++ b/Mage.Sets/src/mage/sets/starter1999/JaggedLightning.java
@@ -37,7 +37,7 @@ public class JaggedLightning extends mage.sets.urzassaga.JaggedLightning {
 
     public JaggedLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/KnightErrant.java b/Mage.Sets/src/mage/sets/starter1999/KnightErrant.java
index ee8bc428e5..3f7eadff0d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/KnightErrant.java
+++ b/Mage.Sets/src/mage/sets/starter1999/KnightErrant.java
@@ -37,7 +37,7 @@ public class KnightErrant extends mage.sets.seventhedition.KnightErrant {
 
     public KnightErrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/LastChance.java b/Mage.Sets/src/mage/sets/starter1999/LastChance.java
index 9929807e68..d471c2477d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/LastChance.java
+++ b/Mage.Sets/src/mage/sets/starter1999/LastChance.java
@@ -37,7 +37,7 @@ public class LastChance extends mage.sets.masterseditioniv.LastChance {
 
     public LastChance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/LavaAxe.java b/Mage.Sets/src/mage/sets/starter1999/LavaAxe.java
index 39331a0d9b..89b3b8d542 100644
--- a/Mage.Sets/src/mage/sets/starter1999/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/starter1999/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/LoneWolf.java b/Mage.Sets/src/mage/sets/starter1999/LoneWolf.java
index a93c44a504..3503771c37 100644
--- a/Mage.Sets/src/mage/sets/starter1999/LoneWolf.java
+++ b/Mage.Sets/src/mage/sets/starter1999/LoneWolf.java
@@ -38,7 +38,7 @@ public class LoneWolf extends mage.sets.urzaslegacy.LoneWolf {
 
     public LoneWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/LoyalSentry.java b/Mage.Sets/src/mage/sets/starter1999/LoyalSentry.java
index 5d339f53e6..c929cc4f5b 100644
--- a/Mage.Sets/src/mage/sets/starter1999/LoyalSentry.java
+++ b/Mage.Sets/src/mage/sets/starter1999/LoyalSentry.java
@@ -37,7 +37,7 @@ public class LoyalSentry extends mage.sets.tenthedition.LoyalSentry {
 
     public LoyalSentry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Lynx.java b/Mage.Sets/src/mage/sets/starter1999/Lynx.java
index f72ba845db..f067f91af9 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Lynx.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Lynx.java
@@ -38,7 +38,7 @@ public class Lynx extends mage.sets.portalsecondage.Lynx {
 
     public Lynx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/ManOWar.java b/Mage.Sets/src/mage/sets/starter1999/ManOWar.java
index 310103336a..8aa9aec5e2 100644
--- a/Mage.Sets/src/mage/sets/starter1999/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/starter1999/ManOWar.java
@@ -38,7 +38,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/starter1999/MerfolkOfThePearlTrident.java
index 1b8f279910..3672ee7cec 100644
--- a/Mage.Sets/src/mage/sets/starter1999/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/starter1999/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/MindRot.java b/Mage.Sets/src/mage/sets/starter1999/MindRot.java
index f13df22ac2..b0d64793b0 100644
--- a/Mage.Sets/src/mage/sets/starter1999/MindRot.java
+++ b/Mage.Sets/src/mage/sets/starter1999/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/starter1999/MonssGoblinRaiders.java
index 9e8d5aceee..85ffb29494 100644
--- a/Mage.Sets/src/mage/sets/starter1999/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/starter1999/MonssGoblinRaiders.java
@@ -38,7 +38,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/starter1999/MonstrousGrowth.java
index 31f2f0a8b5..fa46bb3838 100644
--- a/Mage.Sets/src/mage/sets/starter1999/MonstrousGrowth.java
+++ b/Mage.Sets/src/mage/sets/starter1999/MonstrousGrowth.java
@@ -37,7 +37,7 @@ public class MonstrousGrowth extends mage.sets.seventhedition.MonstrousGrowth {
 
     public MonstrousGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/MoonSprite.java b/Mage.Sets/src/mage/sets/starter1999/MoonSprite.java
index ff237f2616..9487edaf11 100644
--- a/Mage.Sets/src/mage/sets/starter1999/MoonSprite.java
+++ b/Mage.Sets/src/mage/sets/starter1999/MoonSprite.java
@@ -37,7 +37,7 @@ public class MoonSprite extends mage.sets.portal.MoonSprite {
 
     public MoonSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/MuckRats.java b/Mage.Sets/src/mage/sets/starter1999/MuckRats.java
index bc38c8decb..a6da114a9e 100644
--- a/Mage.Sets/src/mage/sets/starter1999/MuckRats.java
+++ b/Mage.Sets/src/mage/sets/starter1999/MuckRats.java
@@ -37,7 +37,7 @@ public class MuckRats extends mage.sets.portalsecondage.MuckRats {
 
     public MuckRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/NaturalSpring.java b/Mage.Sets/src/mage/sets/starter1999/NaturalSpring.java
index 2c1d27b878..a900b64129 100644
--- a/Mage.Sets/src/mage/sets/starter1999/NaturalSpring.java
+++ b/Mage.Sets/src/mage/sets/starter1999/NaturalSpring.java
@@ -38,7 +38,7 @@ public class NaturalSpring extends mage.sets.tempest.NaturalSpring {
 
     public NaturalSpring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/NaturesLore.java b/Mage.Sets/src/mage/sets/starter1999/NaturesLore.java
index 46fe686f6f..14c51f8b7e 100644
--- a/Mage.Sets/src/mage/sets/starter1999/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/starter1999/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/NorwoodArchers.java b/Mage.Sets/src/mage/sets/starter1999/NorwoodArchers.java
index 579ca65a67..7fb76b7129 100644
--- a/Mage.Sets/src/mage/sets/starter1999/NorwoodArchers.java
+++ b/Mage.Sets/src/mage/sets/starter1999/NorwoodArchers.java
@@ -37,7 +37,7 @@ public class NorwoodArchers extends mage.sets.portalsecondage.NorwoodArchers {
 
     public NorwoodArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/NorwoodRanger.java b/Mage.Sets/src/mage/sets/starter1999/NorwoodRanger.java
index b581891992..c7a97b6cff 100644
--- a/Mage.Sets/src/mage/sets/starter1999/NorwoodRanger.java
+++ b/Mage.Sets/src/mage/sets/starter1999/NorwoodRanger.java
@@ -37,7 +37,7 @@ public class NorwoodRanger extends mage.sets.ninthedition.NorwoodRanger {
 
     public NorwoodRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/OgreWarrior.java b/Mage.Sets/src/mage/sets/starter1999/OgreWarrior.java
index 26643f5652..358aebb231 100644
--- a/Mage.Sets/src/mage/sets/starter1999/OgreWarrior.java
+++ b/Mage.Sets/src/mage/sets/starter1999/OgreWarrior.java
@@ -37,7 +37,7 @@ public class OgreWarrior extends mage.sets.portalsecondage.OgreWarrior {
 
     public OgreWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/PhantomWarrior.java b/Mage.Sets/src/mage/sets/starter1999/PhantomWarrior.java
index 8a3952571c..6a9ee14817 100644
--- a/Mage.Sets/src/mage/sets/starter1999/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/starter1999/PhantomWarrior.java
@@ -38,7 +38,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/PsychicTransfer.java b/Mage.Sets/src/mage/sets/starter1999/PsychicTransfer.java
index c8d88e9e15..9195ef2164 100644
--- a/Mage.Sets/src/mage/sets/starter1999/PsychicTransfer.java
+++ b/Mage.Sets/src/mage/sets/starter1999/PsychicTransfer.java
@@ -37,7 +37,7 @@ public class PsychicTransfer extends mage.sets.mirage.PsychicTransfer {
 
     public PsychicTransfer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RagingGoblin.java b/Mage.Sets/src/mage/sets/starter1999/RagingGoblin.java
index 5ba526ac8f..484603e9bc 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RagingGoblin.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RagingGoblin.java
@@ -37,7 +37,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin {
 
     public RagingGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RaiseDead.java b/Mage.Sets/src/mage/sets/starter1999/RaiseDead.java
index df841d5dd3..e3d5c28206 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RavenousRats.java b/Mage.Sets/src/mage/sets/starter1999/RavenousRats.java
index ed47503d66..70770b4359 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RavenousRats.java
@@ -38,7 +38,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/Relearn.java b/Mage.Sets/src/mage/sets/starter1999/Relearn.java
index 71680a82fe..023f6a32ff 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Relearn.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Relearn.java
@@ -37,7 +37,7 @@ public class Relearn extends mage.sets.weatherlight.Relearn {
 
     public Relearn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RelentlessAssault.java b/Mage.Sets/src/mage/sets/starter1999/RelentlessAssault.java
index 86bfebd2b9..8060ddeeb0 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RemoveSoul.java b/Mage.Sets/src/mage/sets/starter1999/RemoveSoul.java
index 57e45d059a..e41b643c60 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RemoveSoul.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RemoveSoul.java
@@ -37,7 +37,7 @@ public class RemoveSoul extends mage.sets.tenthedition.RemoveSoul {
 
     public RemoveSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RighteousCharge.java b/Mage.Sets/src/mage/sets/starter1999/RighteousCharge.java
index 06cef203a0..a8a337c68c 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RighteousCharge.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RighteousCharge.java
@@ -37,7 +37,7 @@ public class RighteousCharge extends mage.sets.gatecrash.RighteousCharge {
 
     public RighteousCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/RoyalFalcon.java b/Mage.Sets/src/mage/sets/starter1999/RoyalFalcon.java
index c00dd843fa..dcef32fb6b 100644
--- a/Mage.Sets/src/mage/sets/starter1999/RoyalFalcon.java
+++ b/Mage.Sets/src/mage/sets/starter1999/RoyalFalcon.java
@@ -37,7 +37,7 @@ public class RoyalFalcon extends mage.sets.starter2000.RoyalFalcon {
 
     public RoyalFalcon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SacredNectar.java b/Mage.Sets/src/mage/sets/starter1999/SacredNectar.java
index c862d53d36..9eb4991e8e 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SacredNectar.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SacredNectar.java
@@ -37,7 +37,7 @@ public class SacredNectar extends mage.sets.ninthedition.SacredNectar {
 
     public SacredNectar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/ScatheZombies.java b/Mage.Sets/src/mage/sets/starter1999/ScatheZombies.java
index 135a72e725..ee4b90cae9 100644
--- a/Mage.Sets/src/mage/sets/starter1999/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/starter1999/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SeaEagle.java b/Mage.Sets/src/mage/sets/starter1999/SeaEagle.java
index a733b5a00a..9ba9699b80 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SeaEagle.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SeaEagle.java
@@ -37,7 +37,7 @@ public class SeaEagle extends mage.sets.eighthedition.SeaEagle {
 
     public SeaEagle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SerpentWarrior.java b/Mage.Sets/src/mage/sets/starter1999/SerpentWarrior.java
index 52470ac565..15b93bcd85 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SerpentWarrior.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SerpentWarrior.java
@@ -37,7 +37,7 @@ public class SerpentWarrior extends mage.sets.stronghold.SerpentWarrior {
 
     public SerpentWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SilverbackApe.java b/Mage.Sets/src/mage/sets/starter1999/SilverbackApe.java
index c2cc8fac29..d62e11f220 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SilverbackApe.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SilverbackApe.java
@@ -37,7 +37,7 @@ public class SilverbackApe extends mage.sets.eighthedition.SilverbackApe {
 
     public SilverbackApe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SleightOfHand.java b/Mage.Sets/src/mage/sets/starter1999/SleightOfHand.java
index e34f7424bc..718ebe2828 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SleightOfHand.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SleightOfHand.java
@@ -37,7 +37,7 @@ public class SleightOfHand extends mage.sets.ninthedition.SleightOfHand {
 
     public SleightOfHand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SnappingDrake.java b/Mage.Sets/src/mage/sets/starter1999/SnappingDrake.java
index 7e51b87e12..1c3461172b 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SnappingDrake.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SnappingDrake.java
@@ -37,7 +37,7 @@ public class SnappingDrake extends mage.sets.ravnica.SnappingDrake {
 
     public SnappingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SoulFeast.java b/Mage.Sets/src/mage/sets/starter1999/SoulFeast.java
index f08021b8a7..18ca3c7657 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SoulFeast.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SoulFeast.java
@@ -37,7 +37,7 @@ public class SoulFeast extends mage.sets.tenthedition.SoulFeast {
 
     public SoulFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SouthernElephant.java b/Mage.Sets/src/mage/sets/starter1999/SouthernElephant.java
index da0d24e03b..a52a3e0272 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SouthernElephant.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SouthernElephant.java
@@ -37,7 +37,7 @@ public class SouthernElephant extends mage.sets.portalthreekingdoms.SouthernElep
 
     public SouthernElephant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SpittingEarth.java b/Mage.Sets/src/mage/sets/starter1999/SpittingEarth.java
index c47a36a965..f063ac3a73 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SpittingEarth.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SpittingEarth.java
@@ -38,7 +38,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth {
 
     public SpittingEarth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/StoneRain.java b/Mage.Sets/src/mage/sets/starter1999/StoneRain.java
index 01d585df45..d3b611e5ea 100644
--- a/Mage.Sets/src/mage/sets/starter1999/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/starter1999/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/StormCrow.java b/Mage.Sets/src/mage/sets/starter1999/StormCrow.java
index 73f19e508e..9885133cfd 100644
--- a/Mage.Sets/src/mage/sets/starter1999/StormCrow.java
+++ b/Mage.Sets/src/mage/sets/starter1999/StormCrow.java
@@ -37,7 +37,7 @@ public class StormCrow extends mage.sets.ninthedition.StormCrow {
 
     public StormCrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/SummerBloom.java b/Mage.Sets/src/mage/sets/starter1999/SummerBloom.java
index e6c46383d7..fd234ae27d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SummerBloom.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SummerBloom.java
@@ -38,7 +38,7 @@ public class SummerBloom extends mage.sets.ninthedition.SummerBloom {
 
     public SummerBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/SylvanBasilisk.java b/Mage.Sets/src/mage/sets/starter1999/SylvanBasilisk.java
index 44c25f6d4b..a939e591fe 100644
--- a/Mage.Sets/src/mage/sets/starter1999/SylvanBasilisk.java
+++ b/Mage.Sets/src/mage/sets/starter1999/SylvanBasilisk.java
@@ -37,7 +37,7 @@ public class SylvanBasilisk extends mage.sets.portalsecondage.SylvanBasilisk {
 
     public SylvanBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/ThornElemental.java b/Mage.Sets/src/mage/sets/starter1999/ThornElemental.java
index 19e7173981..b8972b6e4e 100644
--- a/Mage.Sets/src/mage/sets/starter1999/ThornElemental.java
+++ b/Mage.Sets/src/mage/sets/starter1999/ThornElemental.java
@@ -37,7 +37,7 @@ public class ThornElemental extends mage.sets.urzasdestiny.ThornElemental {
 
     public ThornElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Tidings.java b/Mage.Sets/src/mage/sets/starter1999/Tidings.java
index 9457f460a4..27f4104fae 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Tidings.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Tidings.java
@@ -37,7 +37,7 @@ public class Tidings extends mage.sets.tenthedition.Tidings {
 
     public Tidings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/TimeEbb.java b/Mage.Sets/src/mage/sets/starter1999/TimeEbb.java
index 4ad90bd9f1..50f5f5b453 100644
--- a/Mage.Sets/src/mage/sets/starter1999/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/starter1999/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/TimeWarp.java b/Mage.Sets/src/mage/sets/starter1999/TimeWarp.java
index 8848ba92e3..e46fd87b25 100644
--- a/Mage.Sets/src/mage/sets/starter1999/TimeWarp.java
+++ b/Mage.Sets/src/mage/sets/starter1999/TimeWarp.java
@@ -38,7 +38,7 @@ public class TimeWarp extends mage.sets.magic2010.TimeWarp {
 
     public TimeWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/TouchOfBrilliance.java b/Mage.Sets/src/mage/sets/starter1999/TouchOfBrilliance.java
index 0f93dee73c..83cb8befe0 100644
--- a/Mage.Sets/src/mage/sets/starter1999/TouchOfBrilliance.java
+++ b/Mage.Sets/src/mage/sets/starter1999/TouchOfBrilliance.java
@@ -37,7 +37,7 @@ public class TouchOfBrilliance extends mage.sets.portalsecondage.TouchOfBrillian
 
     public TouchOfBrilliance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/TrainedOrgg.java b/Mage.Sets/src/mage/sets/starter1999/TrainedOrgg.java
index 244c88a4f6..38e387279d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/TrainedOrgg.java
+++ b/Mage.Sets/src/mage/sets/starter1999/TrainedOrgg.java
@@ -37,7 +37,7 @@ public class TrainedOrgg extends mage.sets.seventhedition.TrainedOrgg {
 
     public TrainedOrgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Tremor.java b/Mage.Sets/src/mage/sets/starter1999/Tremor.java
index 5eae8ee406..4456df84f6 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Tremor.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Tremor.java
@@ -37,7 +37,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor {
 
     public Tremor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/UntamedWilds.java b/Mage.Sets/src/mage/sets/starter1999/UntamedWilds.java
index 64cc5fbdd1..82014badea 100644
--- a/Mage.Sets/src/mage/sets/starter1999/UntamedWilds.java
+++ b/Mage.Sets/src/mage/sets/starter1999/UntamedWilds.java
@@ -37,7 +37,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds {
 
     public UntamedWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/VenerableMonk.java b/Mage.Sets/src/mage/sets/starter1999/VenerableMonk.java
index dbe1e9b081..9d36418667 100644
--- a/Mage.Sets/src/mage/sets/starter1999/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/starter1999/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Vengeance.java b/Mage.Sets/src/mage/sets/starter1999/Vengeance.java
index bcd9aeac0b..7fac2c08e0 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Vengeance.java
@@ -37,7 +37,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance {
 
     public Vengeance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/VeteranCavalier.java b/Mage.Sets/src/mage/sets/starter1999/VeteranCavalier.java
index a694fc2035..a46e78eb0d 100644
--- a/Mage.Sets/src/mage/sets/starter1999/VeteranCavalier.java
+++ b/Mage.Sets/src/mage/sets/starter1999/VeteranCavalier.java
@@ -38,7 +38,7 @@ public class VeteranCavalier extends mage.sets.ninthedition.VeteranCavalier {
 
     public VeteranCavalier(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/Vizzerdrix.java b/Mage.Sets/src/mage/sets/starter1999/Vizzerdrix.java
index 19545060b9..88d2f15fc6 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Vizzerdrix.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Vizzerdrix.java
@@ -37,7 +37,7 @@ public class Vizzerdrix extends mage.sets.seventhedition.Vizzerdrix {
 
     public Vizzerdrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/VolcanicDragon.java b/Mage.Sets/src/mage/sets/starter1999/VolcanicDragon.java
index 539a6e7e4c..d947231977 100644
--- a/Mage.Sets/src/mage/sets/starter1999/VolcanicDragon.java
+++ b/Mage.Sets/src/mage/sets/starter1999/VolcanicDragon.java
@@ -38,7 +38,7 @@ public class VolcanicDragon extends mage.sets.magic2012.VolcanicDragon {
 
     public VolcanicDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/starter1999/VolcanicHammer.java b/Mage.Sets/src/mage/sets/starter1999/VolcanicHammer.java
index a6ee34e96e..0825588126 100644
--- a/Mage.Sets/src/mage/sets/starter1999/VolcanicHammer.java
+++ b/Mage.Sets/src/mage/sets/starter1999/VolcanicHammer.java
@@ -37,7 +37,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {
 
     public VolcanicHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WaterElemental.java b/Mage.Sets/src/mage/sets/starter1999/WaterElemental.java
index dcb120c461..86aae124de 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WaterElemental.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WaterElemental.java
@@ -37,7 +37,7 @@ public class WaterElemental extends mage.sets.fourthedition.WaterElemental {
 
     public WaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WhiptailWurm.java b/Mage.Sets/src/mage/sets/starter1999/WhiptailWurm.java
index 25683f7875..05f0adbfb7 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WhiptailWurm.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WhiptailWurm.java
@@ -37,7 +37,7 @@ public class WhiptailWurm extends mage.sets.portal.WhiptailWurm {
 
     public WhiptailWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/Whirlwind.java b/Mage.Sets/src/mage/sets/starter1999/Whirlwind.java
index e93d73b8b9..ed71d4fedc 100644
--- a/Mage.Sets/src/mage/sets/starter1999/Whirlwind.java
+++ b/Mage.Sets/src/mage/sets/starter1999/Whirlwind.java
@@ -37,7 +37,7 @@ public class Whirlwind extends mage.sets.commander2014.Whirlwind {
 
     public Whirlwind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WickedPact.java b/Mage.Sets/src/mage/sets/starter1999/WickedPact.java
index 0812593a4e..73fe937141 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WickedPact.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WickedPact.java
@@ -37,7 +37,7 @@ public class WickedPact extends mage.sets.portal.WickedPact {
 
     public WickedPact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WildGriffin.java b/Mage.Sets/src/mage/sets/starter1999/WildGriffin.java
index 66fd20dae0..21bc0cafb2 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WildGriffin.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WildGriffin.java
@@ -37,7 +37,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin {
 
     public WildGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WildOx.java b/Mage.Sets/src/mage/sets/starter1999/WildOx.java
index c7b847b251..20f38a7e88 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WildOx.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WildOx.java
@@ -37,7 +37,7 @@ public class WildOx extends mage.sets.portalsecondage.WildOx {
 
     public WildOx(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WillowElf.java b/Mage.Sets/src/mage/sets/starter1999/WillowElf.java
index 4c494b3a88..70820fbc63 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WillowElf.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WillowElf.java
@@ -37,7 +37,7 @@ public class WillowElf extends mage.sets.starter2000.WillowElf {
 
     public WillowElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WindDrake.java b/Mage.Sets/src/mage/sets/starter1999/WindDrake.java
index 332655743f..bc2cb5a81c 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "S99";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter1999/WoodElves.java b/Mage.Sets/src/mage/sets/starter1999/WoodElves.java
index d1c43282a0..14c1293735 100644
--- a/Mage.Sets/src/mage/sets/starter1999/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/starter1999/WoodElves.java
@@ -38,7 +38,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "S99";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter2000/AngelicBlessing.java b/Mage.Sets/src/mage/sets/starter2000/AngelicBlessing.java
index 6da5750635..21807d5509 100644
--- a/Mage.Sets/src/mage/sets/starter2000/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/starter2000/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/starter2000/ArmoredPegasus.java
index 6bd1877fe5..4922a335a7 100644
--- a/Mage.Sets/src/mage/sets/starter2000/ArmoredPegasus.java
+++ b/Mage.Sets/src/mage/sets/starter2000/ArmoredPegasus.java
@@ -37,7 +37,7 @@ public class ArmoredPegasus extends mage.sets.tempest.ArmoredPegasus {
 
     public ArmoredPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101; // TODO: FIX the number;
+        this.cardNumber = "101"; // TODO: FIX the number;
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/BogImp.java b/Mage.Sets/src/mage/sets/starter2000/BogImp.java
index 71f1ab94ba..bf93687270 100644
--- a/Mage.Sets/src/mage/sets/starter2000/BogImp.java
+++ b/Mage.Sets/src/mage/sets/starter2000/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Coercion.java b/Mage.Sets/src/mage/sets/starter2000/Coercion.java
index b4dee730da..4131f00b70 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Coercion.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Coercion.java
@@ -37,7 +37,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Counterspell.java b/Mage.Sets/src/mage/sets/starter2000/Counterspell.java
index 52af86f1d8..caef2664d5 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Disenchant.java b/Mage.Sets/src/mage/sets/starter2000/Disenchant.java
index 56f1e5afcb..ec74bc0c55 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102; // TODO: FIX the number;
+        this.cardNumber = "102"; // TODO: FIX the number;
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/DurkwoodBoars.java b/Mage.Sets/src/mage/sets/starter2000/DurkwoodBoars.java
index 94a1e04c61..48ba9a3c51 100644
--- a/Mage.Sets/src/mage/sets/starter2000/DurkwoodBoars.java
+++ b/Mage.Sets/src/mage/sets/starter2000/DurkwoodBoars.java
@@ -37,7 +37,7 @@ public class DurkwoodBoars extends mage.sets.fifthedition.DurkwoodBoars {
 
     public DurkwoodBoars(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/EagerCadet.java b/Mage.Sets/src/mage/sets/starter2000/EagerCadet.java
index 504bdfa15b..28f4761516 100644
--- a/Mage.Sets/src/mage/sets/starter2000/EagerCadet.java
+++ b/Mage.Sets/src/mage/sets/starter2000/EagerCadet.java
@@ -37,7 +37,7 @@ public class EagerCadet extends mage.sets.seventhedition.EagerCadet {
 
     public EagerCadet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/FlameSpirit.java b/Mage.Sets/src/mage/sets/starter2000/FlameSpirit.java
index 5ebe985ebd..876adae7ac 100644
--- a/Mage.Sets/src/mage/sets/starter2000/FlameSpirit.java
+++ b/Mage.Sets/src/mage/sets/starter2000/FlameSpirit.java
@@ -38,7 +38,7 @@ public class FlameSpirit extends mage.sets.iceage.FlameSpirit {
 
     public FlameSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "S00";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter2000/Flight.java b/Mage.Sets/src/mage/sets/starter2000/Flight.java
index bb1bccf286..69155fb227 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Flight.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103; // TODO: FIX the number
+        this.cardNumber = "103"; // TODO: FIX the number
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/GiantGrowth.java b/Mage.Sets/src/mage/sets/starter2000/GiantGrowth.java
index f5641244d9..6625ea4a57 100644
--- a/Mage.Sets/src/mage/sets/starter2000/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/starter2000/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/GiantOctopus.java b/Mage.Sets/src/mage/sets/starter2000/GiantOctopus.java
index 7feda08f53..bc7cee48ad 100644
--- a/Mage.Sets/src/mage/sets/starter2000/GiantOctopus.java
+++ b/Mage.Sets/src/mage/sets/starter2000/GiantOctopus.java
@@ -37,7 +37,7 @@ public class GiantOctopus extends mage.sets.seventhedition.GiantOctopus {
 
     public GiantOctopus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/GoblinHero.java b/Mage.Sets/src/mage/sets/starter2000/GoblinHero.java
index 95d3fdbd5c..7b8b7d2053 100644
--- a/Mage.Sets/src/mage/sets/starter2000/GoblinHero.java
+++ b/Mage.Sets/src/mage/sets/starter2000/GoblinHero.java
@@ -37,7 +37,7 @@ public class GoblinHero extends mage.sets.fifthedition.GoblinHero {
 
     public GoblinHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/HerosResolve.java b/Mage.Sets/src/mage/sets/starter2000/HerosResolve.java
index 7180a22435..2fc721ccc3 100644
--- a/Mage.Sets/src/mage/sets/starter2000/HerosResolve.java
+++ b/Mage.Sets/src/mage/sets/starter2000/HerosResolve.java
@@ -37,7 +37,7 @@ public class HerosResolve extends mage.sets.tempest.HerosResolve {
 
     public HerosResolve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Inspiration.java b/Mage.Sets/src/mage/sets/starter2000/Inspiration.java
index f8665b81e6..a4e247b38f 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Inspiration.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Inspiration.java
@@ -37,7 +37,7 @@ public class Inspiration extends mage.sets.returntoravnica.Inspiration {
 
     public Inspiration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/KnightErrant.java b/Mage.Sets/src/mage/sets/starter2000/KnightErrant.java
index 5a551c8df0..e6f6f8ed2d 100644
--- a/Mage.Sets/src/mage/sets/starter2000/KnightErrant.java
+++ b/Mage.Sets/src/mage/sets/starter2000/KnightErrant.java
@@ -37,7 +37,7 @@ public class KnightErrant extends mage.sets.seventhedition.KnightErrant {
 
     public KnightErrant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/LavaAxe.java b/Mage.Sets/src/mage/sets/starter2000/LavaAxe.java
index 673b1a0a38..12c318e9c0 100644
--- a/Mage.Sets/src/mage/sets/starter2000/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/starter2000/LavaAxe.java
@@ -37,7 +37,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/LlanowarElves.java b/Mage.Sets/src/mage/sets/starter2000/LlanowarElves.java
index 767a893b2f..d03d4b03de 100644
--- a/Mage.Sets/src/mage/sets/starter2000/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/starter2000/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/starter2000/MerfolkOfThePearlTrident.java
index 025f199d65..a6f181e0ae 100644
--- a/Mage.Sets/src/mage/sets/starter2000/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/starter2000/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/starter2000/MonssGoblinRaiders.java
index 0596ecbc10..2a77728f3f 100644
--- a/Mage.Sets/src/mage/sets/starter2000/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/starter2000/MonssGoblinRaiders.java
@@ -37,7 +37,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/starter2000/MonstrousGrowth.java
index 939c9d6d95..ed7ac96062 100644
--- a/Mage.Sets/src/mage/sets/starter2000/MonstrousGrowth.java
+++ b/Mage.Sets/src/mage/sets/starter2000/MonstrousGrowth.java
@@ -37,7 +37,7 @@ public class MonstrousGrowth extends mage.sets.seventhedition.MonstrousGrowth {
 
     public MonstrousGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/MoonSprite.java b/Mage.Sets/src/mage/sets/starter2000/MoonSprite.java
index 7d46ac92a5..11b61dec3e 100644
--- a/Mage.Sets/src/mage/sets/starter2000/MoonSprite.java
+++ b/Mage.Sets/src/mage/sets/starter2000/MoonSprite.java
@@ -37,7 +37,7 @@ public class MoonSprite extends mage.sets.portal.MoonSprite {
 
     public MoonSprite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java b/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java
index 34ce425d2c..5096c022e2 100644
--- a/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java
@@ -37,7 +37,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/OgreWarrior.java b/Mage.Sets/src/mage/sets/starter2000/OgreWarrior.java
index 92e5885389..a70a27aff1 100644
--- a/Mage.Sets/src/mage/sets/starter2000/OgreWarrior.java
+++ b/Mage.Sets/src/mage/sets/starter2000/OgreWarrior.java
@@ -37,7 +37,7 @@ public class OgreWarrior extends mage.sets.portalsecondage.OgreWarrior {
 
     public OgreWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/starter2000/OrcishOriflamme.java
index dada5508a1..04d85b1b92 100644
--- a/Mage.Sets/src/mage/sets/starter2000/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/starter2000/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/starter2000/ProdigalSorcerer.java
index 175db6a8f0..96771fde14 100644
--- a/Mage.Sets/src/mage/sets/starter2000/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/starter2000/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "S00";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/starter2000/Python.java b/Mage.Sets/src/mage/sets/starter2000/Python.java
index 45191f65f2..0c97686be0 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Python.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Python.java
@@ -37,7 +37,7 @@ public class Python extends mage.sets.visions.Python {
 
     public Python(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/RodOfRuin.java b/Mage.Sets/src/mage/sets/starter2000/RodOfRuin.java
index 2c07c49916..7b98426d85 100644
--- a/Mage.Sets/src/mage/sets/starter2000/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/starter2000/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/SamiteHealer.java b/Mage.Sets/src/mage/sets/starter2000/SamiteHealer.java
index 2484fbb546..940ee4a1c7 100644
--- a/Mage.Sets/src/mage/sets/starter2000/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/starter2000/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/ScatheZombies.java b/Mage.Sets/src/mage/sets/starter2000/ScatheZombies.java
index 4c8cf7e86e..e66ffb5660 100644
--- a/Mage.Sets/src/mage/sets/starter2000/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/starter2000/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/SeaEagle.java b/Mage.Sets/src/mage/sets/starter2000/SeaEagle.java
index df9df2d082..0de6b71400 100644
--- a/Mage.Sets/src/mage/sets/starter2000/SeaEagle.java
+++ b/Mage.Sets/src/mage/sets/starter2000/SeaEagle.java
@@ -37,7 +37,7 @@ public class SeaEagle extends mage.sets.eighthedition.SeaEagle {
 
     public SeaEagle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Shock.java b/Mage.Sets/src/mage/sets/starter2000/Shock.java
index cc5310403c..66069d365d 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Shock.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104; // TODO: FIX the number;
+        this.cardNumber = "104"; // TODO: FIX the number;
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/SoulNet.java b/Mage.Sets/src/mage/sets/starter2000/SoulNet.java
index c373e9d21c..0e6788715d 100644
--- a/Mage.Sets/src/mage/sets/starter2000/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/starter2000/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/SpinedWurm.java b/Mage.Sets/src/mage/sets/starter2000/SpinedWurm.java
index 3fa97bc5c7..5366f761b6 100644
--- a/Mage.Sets/src/mage/sets/starter2000/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/starter2000/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/StoneRain.java b/Mage.Sets/src/mage/sets/starter2000/StoneRain.java
index d8ac2613ac..04a8282916 100644
--- a/Mage.Sets/src/mage/sets/starter2000/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/starter2000/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Terror.java b/Mage.Sets/src/mage/sets/starter2000/Terror.java
index 2f8f207255..971231cbff 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Terror.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/TimeEbb.java b/Mage.Sets/src/mage/sets/starter2000/TimeEbb.java
index ff425c312d..bb8204c74e 100644
--- a/Mage.Sets/src/mage/sets/starter2000/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/starter2000/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/TrainedOrgg.java b/Mage.Sets/src/mage/sets/starter2000/TrainedOrgg.java
index 21b9bd0df6..d18b08e83f 100644
--- a/Mage.Sets/src/mage/sets/starter2000/TrainedOrgg.java
+++ b/Mage.Sets/src/mage/sets/starter2000/TrainedOrgg.java
@@ -37,7 +37,7 @@ public class TrainedOrgg extends mage.sets.seventhedition.TrainedOrgg {
 
     public TrainedOrgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/VenerableMonk.java b/Mage.Sets/src/mage/sets/starter2000/VenerableMonk.java
index dccefcd3e2..9623dfe3fa 100644
--- a/Mage.Sets/src/mage/sets/starter2000/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/starter2000/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105; // TODO: FIX the number;
+        this.cardNumber = "105"; // TODO: FIX the number;
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/Vizzerdrix.java b/Mage.Sets/src/mage/sets/starter2000/Vizzerdrix.java
index d7320b9d58..86edb7365e 100644
--- a/Mage.Sets/src/mage/sets/starter2000/Vizzerdrix.java
+++ b/Mage.Sets/src/mage/sets/starter2000/Vizzerdrix.java
@@ -37,7 +37,7 @@ public class Vizzerdrix extends mage.sets.seventhedition.Vizzerdrix {
 
     public Vizzerdrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/WildGriffin.java b/Mage.Sets/src/mage/sets/starter2000/WildGriffin.java
index b6b1658fa9..05d8c20fed 100644
--- a/Mage.Sets/src/mage/sets/starter2000/WildGriffin.java
+++ b/Mage.Sets/src/mage/sets/starter2000/WildGriffin.java
@@ -37,7 +37,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin {
 
     public WildGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/starter2000/WindDrake.java b/Mage.Sets/src/mage/sets/starter2000/WindDrake.java
index 0683fe9159..6b80cb261a 100644
--- a/Mage.Sets/src/mage/sets/starter2000/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/starter2000/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "S00";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Bandage.java b/Mage.Sets/src/mage/sets/stronghold/Bandage.java
index d372f85073..f729f6d7b5 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Bandage.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Bandage.java
@@ -37,7 +37,7 @@ public class Bandage extends mage.sets.tenthedition.Bandage {
 
     public Bandage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Cannibalize.java b/Mage.Sets/src/mage/sets/stronghold/Cannibalize.java
index bb442aba85..9fd348432a 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Cannibalize.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Cannibalize.java
@@ -38,7 +38,7 @@ public class Cannibalize extends mage.sets.tempestremastered.Cannibalize {
 
     public Cannibalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/DreamProwler.java b/Mage.Sets/src/mage/sets/stronghold/DreamProwler.java
index 81ac46ee61..1b10df24b7 100644
--- a/Mage.Sets/src/mage/sets/stronghold/DreamProwler.java
+++ b/Mage.Sets/src/mage/sets/stronghold/DreamProwler.java
@@ -38,7 +38,7 @@ public class DreamProwler extends mage.sets.tempestremastered.DreamProwler {
 
     public DreamProwler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/EndangeredArmodon.java b/Mage.Sets/src/mage/sets/stronghold/EndangeredArmodon.java
index b23f6b0416..8ba3429894 100644
--- a/Mage.Sets/src/mage/sets/stronghold/EndangeredArmodon.java
+++ b/Mage.Sets/src/mage/sets/stronghold/EndangeredArmodon.java
@@ -37,7 +37,7 @@ public class EndangeredArmodon extends mage.sets.tempestremastered.EndangeredArm
 
     public EndangeredArmodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/FlameWave.java b/Mage.Sets/src/mage/sets/stronghold/FlameWave.java
index 9d19ae47d5..89ce56492b 100644
--- a/Mage.Sets/src/mage/sets/stronghold/FlameWave.java
+++ b/Mage.Sets/src/mage/sets/stronghold/FlameWave.java
@@ -37,7 +37,7 @@ public class FlameWave extends mage.sets.ninthedition.FlameWave {
 
     public FlameWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Fling.java b/Mage.Sets/src/mage/sets/stronghold/Fling.java
index 8a099b17d6..e33e9b341b 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Fling.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Fling.java
@@ -37,7 +37,7 @@ public class Fling extends mage.sets.magic2011.Fling {
 
     public Fling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/FlowstoneBlade.java b/Mage.Sets/src/mage/sets/stronghold/FlowstoneBlade.java
index e46608d693..7fa82fde78 100644
--- a/Mage.Sets/src/mage/sets/stronghold/FlowstoneBlade.java
+++ b/Mage.Sets/src/mage/sets/stronghold/FlowstoneBlade.java
@@ -37,7 +37,7 @@ public class FlowstoneBlade extends mage.sets.conspiracy.FlowstoneBlade {
 
     public FlowstoneBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/FlowstoneShambler.java b/Mage.Sets/src/mage/sets/stronghold/FlowstoneShambler.java
index 24baf6b5de..ed28e09896 100644
--- a/Mage.Sets/src/mage/sets/stronghold/FlowstoneShambler.java
+++ b/Mage.Sets/src/mage/sets/stronghold/FlowstoneShambler.java
@@ -37,7 +37,7 @@ public class FlowstoneShambler extends mage.sets.ninthedition.FlowstoneShambler
 
     public FlowstoneShambler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/GravePact.java b/Mage.Sets/src/mage/sets/stronghold/GravePact.java
index 01c7482a1e..5b2f905350 100644
--- a/Mage.Sets/src/mage/sets/stronghold/GravePact.java
+++ b/Mage.Sets/src/mage/sets/stronghold/GravePact.java
@@ -37,7 +37,7 @@ public class GravePact extends mage.sets.ninthedition.GravePact {
 
     public GravePact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/HammerheadShark.java b/Mage.Sets/src/mage/sets/stronghold/HammerheadShark.java
index e65c0d412d..978c7b2532 100644
--- a/Mage.Sets/src/mage/sets/stronghold/HammerheadShark.java
+++ b/Mage.Sets/src/mage/sets/stronghold/HammerheadShark.java
@@ -37,7 +37,7 @@ public class HammerheadShark extends mage.sets.tempestremastered.HammerheadShark
 
     public HammerheadShark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/HonorGuard.java b/Mage.Sets/src/mage/sets/stronghold/HonorGuard.java
index 8e6793c73a..cd3ea0dbc2 100644
--- a/Mage.Sets/src/mage/sets/stronghold/HonorGuard.java
+++ b/Mage.Sets/src/mage/sets/stronghold/HonorGuard.java
@@ -37,7 +37,7 @@ public class HonorGuard extends mage.sets.tenthedition.HonorGuard {
 
     public HonorGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/HornetCannon.java b/Mage.Sets/src/mage/sets/stronghold/HornetCannon.java
index 93bb1c1ab0..b88783d5ae 100644
--- a/Mage.Sets/src/mage/sets/stronghold/HornetCannon.java
+++ b/Mage.Sets/src/mage/sets/stronghold/HornetCannon.java
@@ -37,7 +37,7 @@ public class HornetCannon extends mage.sets.phyrexiavsthecoalition.HornetCannon
 
     public HornetCannon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/LowlandBasilisk.java b/Mage.Sets/src/mage/sets/stronghold/LowlandBasilisk.java
index 9bf8b4dcad..dd0798688c 100644
--- a/Mage.Sets/src/mage/sets/stronghold/LowlandBasilisk.java
+++ b/Mage.Sets/src/mage/sets/stronghold/LowlandBasilisk.java
@@ -38,7 +38,7 @@ public class LowlandBasilisk extends mage.sets.tempestremastered.LowlandBasilisk
 
     public LowlandBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/ManaLeak.java b/Mage.Sets/src/mage/sets/stronghold/ManaLeak.java
index 4f1abc5749..473c5e1f7f 100644
--- a/Mage.Sets/src/mage/sets/stronghold/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/stronghold/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Megrim.java b/Mage.Sets/src/mage/sets/stronghold/Megrim.java
index e8b3165e48..cdefe0700f 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Megrim.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Megrim.java
@@ -37,7 +37,7 @@ public class Megrim extends mage.sets.tenthedition.Megrim {
 
     public Megrim(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/MoggFlunkies.java b/Mage.Sets/src/mage/sets/stronghold/MoggFlunkies.java
index 0adfc823cc..e9c12050bb 100644
--- a/Mage.Sets/src/mage/sets/stronghold/MoggFlunkies.java
+++ b/Mage.Sets/src/mage/sets/stronghold/MoggFlunkies.java
@@ -37,7 +37,7 @@ public class MoggFlunkies extends mage.sets.magic2013.MoggFlunkies {
 
     public MoggFlunkies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/MoggManiac.java b/Mage.Sets/src/mage/sets/stronghold/MoggManiac.java
index 291968e4ca..9d0e03d622 100644
--- a/Mage.Sets/src/mage/sets/stronghold/MoggManiac.java
+++ b/Mage.Sets/src/mage/sets/stronghold/MoggManiac.java
@@ -37,7 +37,7 @@ public class MoggManiac extends mage.sets.tempestremastered.MoggManiac {
 
     public MoggManiac(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Mulch.java b/Mage.Sets/src/mage/sets/stronghold/Mulch.java
index 8e0d1ce666..abdf574210 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Mulch.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Mulch.java
@@ -37,7 +37,7 @@ public class Mulch extends mage.sets.innistrad.Mulch {
 
     public Mulch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/PrimalRage.java b/Mage.Sets/src/mage/sets/stronghold/PrimalRage.java
index 3df3a5ecd2..39dfb40443 100644
--- a/Mage.Sets/src/mage/sets/stronghold/PrimalRage.java
+++ b/Mage.Sets/src/mage/sets/stronghold/PrimalRage.java
@@ -37,7 +37,7 @@ public class PrimalRage extends mage.sets.tenthedition.PrimalRage {
 
     public PrimalRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Revenant.java b/Mage.Sets/src/mage/sets/stronghold/Revenant.java
index 1f4e20d494..c23bbdc436 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Revenant.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Revenant.java
@@ -38,7 +38,7 @@ public class Revenant extends mage.sets.tempestremastered.Revenant {
 
     public Revenant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/SeethingAnger.java b/Mage.Sets/src/mage/sets/stronghold/SeethingAnger.java
index 72cb17bdd5..09f59c2555 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SeethingAnger.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SeethingAnger.java
@@ -37,7 +37,7 @@ public class SeethingAnger extends mage.sets.tempestremastered.SeethingAnger {
 
     public SeethingAnger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/ShardPhoenix.java b/Mage.Sets/src/mage/sets/stronghold/ShardPhoenix.java
index 2b4860f31e..c03bd70b4d 100644
--- a/Mage.Sets/src/mage/sets/stronghold/ShardPhoenix.java
+++ b/Mage.Sets/src/mage/sets/stronghold/ShardPhoenix.java
@@ -38,7 +38,7 @@ public class ShardPhoenix extends mage.sets.tempestremastered.ShardPhoenix {
 
     public ShardPhoenix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/Shock.java b/Mage.Sets/src/mage/sets/stronghold/Shock.java
index 2402fc2956..a71c041ff7 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Shock.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Shock.java
@@ -37,7 +37,7 @@ public class Shock extends mage.sets.tenthedition.Shock {
 
     public Shock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Sift.java b/Mage.Sets/src/mage/sets/stronghold/Sift.java
index 22e36893b4..65ba56fb66 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Sift.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Sift.java
@@ -37,7 +37,7 @@ public class Sift extends mage.sets.tenthedition.Sift {
 
     public Sift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/SilverWyvern.java b/Mage.Sets/src/mage/sets/stronghold/SilverWyvern.java
index 41505a2d50..7841f440d2 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SilverWyvern.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SilverWyvern.java
@@ -37,7 +37,7 @@ public class SilverWyvern extends mage.sets.tempestremastered.SilverWyvern {
 
     public SilverWyvern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/Smite.java b/Mage.Sets/src/mage/sets/stronghold/Smite.java
index d67f54cb18..5a324b0ff0 100644
--- a/Mage.Sets/src/mage/sets/stronghold/Smite.java
+++ b/Mage.Sets/src/mage/sets/stronghold/Smite.java
@@ -37,7 +37,7 @@ public class Smite extends mage.sets.riseoftheeldrazi.Smite {
 
     public Smite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/SpikeBreeder.java b/Mage.Sets/src/mage/sets/stronghold/SpikeBreeder.java
index 4039154002..9c8f0f822d 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SpikeBreeder.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SpikeBreeder.java
@@ -38,7 +38,7 @@ public class SpikeBreeder extends mage.sets.tempestremastered.SpikeBreeder {
 
     public SpikeBreeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java b/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java
index 85e689738d..292b870cdf 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java
@@ -38,7 +38,7 @@ public class SpikeFeeder extends mage.sets.timeshifted.SpikeFeeder {
 
     public SpikeFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/SpinedWurm.java b/Mage.Sets/src/mage/sets/stronghold/SpinedWurm.java
index c416716f77..3b0187c90a 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/SpiritEnKor.java b/Mage.Sets/src/mage/sets/stronghold/SpiritEnKor.java
index cde2cd64b8..68cee5739e 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SpiritEnKor.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SpiritEnKor.java
@@ -37,7 +37,7 @@ public class SpiritEnKor extends mage.sets.tempestremastered.SpiritEnKor {
 
     public SpiritEnKor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/SpittingHydra.java b/Mage.Sets/src/mage/sets/stronghold/SpittingHydra.java
index 39640da008..f0ae25c192 100644
--- a/Mage.Sets/src/mage/sets/stronghold/SpittingHydra.java
+++ b/Mage.Sets/src/mage/sets/stronghold/SpittingHydra.java
@@ -37,7 +37,7 @@ public class SpittingHydra extends mage.sets.tempestremastered.SpittingHydra {
 
     public SpittingHydra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/VenerableMonk.java b/Mage.Sets/src/mage/sets/stronghold/VenerableMonk.java
index 042bc66ca8..d458ba6b4e 100644
--- a/Mage.Sets/src/mage/sets/stronghold/VenerableMonk.java
+++ b/Mage.Sets/src/mage/sets/stronghold/VenerableMonk.java
@@ -37,7 +37,7 @@ public class VenerableMonk extends mage.sets.tenthedition.VenerableMonk {
 
     public VenerableMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/VerdantTouch.java b/Mage.Sets/src/mage/sets/stronghold/VerdantTouch.java
index 9f14e4751f..f972f364c8 100644
--- a/Mage.Sets/src/mage/sets/stronghold/VerdantTouch.java
+++ b/Mage.Sets/src/mage/sets/stronghold/VerdantTouch.java
@@ -38,7 +38,7 @@ public class VerdantTouch extends mage.sets.tempestremastered.VerdantTouch {
 
     public VerdantTouch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "STH";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/VolrathsLaboratory.java b/Mage.Sets/src/mage/sets/stronghold/VolrathsLaboratory.java
index 0600abf074..f8121ddded 100644
--- a/Mage.Sets/src/mage/sets/stronghold/VolrathsLaboratory.java
+++ b/Mage.Sets/src/mage/sets/stronghold/VolrathsLaboratory.java
@@ -37,7 +37,7 @@ public class VolrathsLaboratory extends mage.sets.tempestremastered.VolrathsLabo
 
     public VolrathsLaboratory(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/VolrathsShapeshifter.java b/Mage.Sets/src/mage/sets/stronghold/VolrathsShapeshifter.java
index e82701a5e0..41aaf90e13 100644
--- a/Mage.Sets/src/mage/sets/stronghold/VolrathsShapeshifter.java
+++ b/Mage.Sets/src/mage/sets/stronghold/VolrathsShapeshifter.java
@@ -38,7 +38,7 @@ public class VolrathsShapeshifter extends mage.sets.vintagemasters.VolrathsShape
 
     public VolrathsShapeshifter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/WallOfSouls.java b/Mage.Sets/src/mage/sets/stronghold/WallOfSouls.java
index 7289f19b75..df8d0e78f0 100644
--- a/Mage.Sets/src/mage/sets/stronghold/WallOfSouls.java
+++ b/Mage.Sets/src/mage/sets/stronghold/WallOfSouls.java
@@ -37,7 +37,7 @@ public class WallOfSouls extends mage.sets.tempestremastered.WallOfSouls {
 
     public WallOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/WarriorEnKor.java b/Mage.Sets/src/mage/sets/stronghold/WarriorEnKor.java
index a6eaf993d4..8c8a2c032d 100644
--- a/Mage.Sets/src/mage/sets/stronghold/WarriorEnKor.java
+++ b/Mage.Sets/src/mage/sets/stronghold/WarriorEnKor.java
@@ -37,7 +37,7 @@ public class WarriorEnKor extends mage.sets.tempestremastered.WarriorEnKor {
 
     public WarriorEnKor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/YouthfulKnight.java b/Mage.Sets/src/mage/sets/stronghold/YouthfulKnight.java
index c5eb73a3fc..1eaebc4777 100644
--- a/Mage.Sets/src/mage/sets/stronghold/YouthfulKnight.java
+++ b/Mage.Sets/src/mage/sets/stronghold/YouthfulKnight.java
@@ -37,7 +37,7 @@ public class YouthfulKnight extends mage.sets.tenthedition.YouthfulKnight {
 
     public YouthfulKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "STH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/CityOfBrass.java b/Mage.Sets/src/mage/sets/superseries/CityOfBrass.java
index ced5d77a57..e1811f126b 100644
--- a/Mage.Sets/src/mage/sets/superseries/CityOfBrass.java
+++ b/Mage.Sets/src/mage/sets/superseries/CityOfBrass.java
@@ -38,7 +38,7 @@ public class CityOfBrass extends mage.sets.seventhedition.CityOfBrass {
 
     public CityOfBrass(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/Crusade.java b/Mage.Sets/src/mage/sets/superseries/Crusade.java
index 30e87f600d..6c1308d232 100644
--- a/Mage.Sets/src/mage/sets/superseries/Crusade.java
+++ b/Mage.Sets/src/mage/sets/superseries/Crusade.java
@@ -38,7 +38,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ElvishChampion1.java b/Mage.Sets/src/mage/sets/superseries/ElvishChampion1.java
index 0bcd650b00..71188ab174 100644
--- a/Mage.Sets/src/mage/sets/superseries/ElvishChampion1.java
+++ b/Mage.Sets/src/mage/sets/superseries/ElvishChampion1.java
@@ -38,7 +38,7 @@ public class ElvishChampion1 extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ElvishChampion2.java b/Mage.Sets/src/mage/sets/superseries/ElvishChampion2.java
index b90878c4c2..c53d7d5005 100644
--- a/Mage.Sets/src/mage/sets/superseries/ElvishChampion2.java
+++ b/Mage.Sets/src/mage/sets/superseries/ElvishChampion2.java
@@ -38,7 +38,7 @@ public class ElvishChampion2 extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ElvishChampion3.java b/Mage.Sets/src/mage/sets/superseries/ElvishChampion3.java
index 7fe8f0650c..ec347e8eb0 100644
--- a/Mage.Sets/src/mage/sets/superseries/ElvishChampion3.java
+++ b/Mage.Sets/src/mage/sets/superseries/ElvishChampion3.java
@@ -38,7 +38,7 @@ public class ElvishChampion3 extends mage.sets.tenthedition.ElvishChampion {
 
     public ElvishChampion3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ElvishLyrist.java b/Mage.Sets/src/mage/sets/superseries/ElvishLyrist.java
index 3f9aaffbc0..ed36530ebf 100644
--- a/Mage.Sets/src/mage/sets/superseries/ElvishLyrist.java
+++ b/Mage.Sets/src/mage/sets/superseries/ElvishLyrist.java
@@ -37,7 +37,7 @@ public class ElvishLyrist extends mage.sets.urzassaga.ElvishLyrist {
 
     public ElvishLyrist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/GiantGrowth.java b/Mage.Sets/src/mage/sets/superseries/GiantGrowth.java
index 39bfb7bc15..3659b81dde 100644
--- a/Mage.Sets/src/mage/sets/superseries/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/superseries/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/GloriousAnthem1.java b/Mage.Sets/src/mage/sets/superseries/GloriousAnthem1.java
index 3a7bf0a125..e99bbc95dc 100644
--- a/Mage.Sets/src/mage/sets/superseries/GloriousAnthem1.java
+++ b/Mage.Sets/src/mage/sets/superseries/GloriousAnthem1.java
@@ -38,7 +38,7 @@ public class GloriousAnthem1 extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/GloriousAnthem2.java b/Mage.Sets/src/mage/sets/superseries/GloriousAnthem2.java
index 82242c6055..d37b3004c5 100644
--- a/Mage.Sets/src/mage/sets/superseries/GloriousAnthem2.java
+++ b/Mage.Sets/src/mage/sets/superseries/GloriousAnthem2.java
@@ -38,7 +38,7 @@ public class GloriousAnthem2 extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/GloriousAnthem3.java b/Mage.Sets/src/mage/sets/superseries/GloriousAnthem3.java
index 88fad1fb1c..a934262814 100644
--- a/Mage.Sets/src/mage/sets/superseries/GloriousAnthem3.java
+++ b/Mage.Sets/src/mage/sets/superseries/GloriousAnthem3.java
@@ -38,7 +38,7 @@ public class GloriousAnthem3 extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/superseries/LordOfAtlantis.java
index b860394e15..043970c822 100644
--- a/Mage.Sets/src/mage/sets/superseries/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/superseries/LordOfAtlantis.java
@@ -38,7 +38,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/MadAuntie.java b/Mage.Sets/src/mage/sets/superseries/MadAuntie.java
index 72cd163366..7910d97e6f 100644
--- a/Mage.Sets/src/mage/sets/superseries/MadAuntie.java
+++ b/Mage.Sets/src/mage/sets/superseries/MadAuntie.java
@@ -38,7 +38,7 @@ public class MadAuntie extends mage.sets.lorwyn.MadAuntie {
 
     public MadAuntie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/RoyalAssassin.java b/Mage.Sets/src/mage/sets/superseries/RoyalAssassin.java
index 2a39f4b146..b7992fd441 100644
--- a/Mage.Sets/src/mage/sets/superseries/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/superseries/RoyalAssassin.java
@@ -38,7 +38,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder1.java b/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder1.java
index f8986e1b40..955721d267 100644
--- a/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder1.java
+++ b/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder1.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder1 extends mage.sets.championsofkamigawa.SakuraTribe
 
     public SakuraTribeElder1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder2.java b/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder2.java
index 51ab9b3bd0..e4a1ba64a2 100644
--- a/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder2.java
+++ b/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder2.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder2 extends mage.sets.championsofkamigawa.SakuraTribe
 
     public SakuraTribeElder2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder3.java b/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder3.java
index 0606ed31bb..5bb644d561 100644
--- a/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder3.java
+++ b/Mage.Sets/src/mage/sets/superseries/SakuraTribeElder3.java
@@ -37,7 +37,7 @@ public class SakuraTribeElder3 extends mage.sets.championsofkamigawa.SakuraTribe
 
     public SakuraTribeElder3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/SerraAvatar.java b/Mage.Sets/src/mage/sets/superseries/SerraAvatar.java
index 83c644c68f..45742044c0 100644
--- a/Mage.Sets/src/mage/sets/superseries/SerraAvatar.java
+++ b/Mage.Sets/src/mage/sets/superseries/SerraAvatar.java
@@ -38,7 +38,7 @@ public class SerraAvatar extends mage.sets.urzassaga.SerraAvatar {
 
     public SerraAvatar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ShardPhoenix1.java b/Mage.Sets/src/mage/sets/superseries/ShardPhoenix1.java
index e96cac62bc..4614ec17ba 100644
--- a/Mage.Sets/src/mage/sets/superseries/ShardPhoenix1.java
+++ b/Mage.Sets/src/mage/sets/superseries/ShardPhoenix1.java
@@ -38,7 +38,7 @@ public class ShardPhoenix1 extends mage.sets.tempestremastered.ShardPhoenix {
 
     public ShardPhoenix1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ShardPhoenix2.java b/Mage.Sets/src/mage/sets/superseries/ShardPhoenix2.java
index 3ba9f6b1bc..4bc9db6e2b 100644
--- a/Mage.Sets/src/mage/sets/superseries/ShardPhoenix2.java
+++ b/Mage.Sets/src/mage/sets/superseries/ShardPhoenix2.java
@@ -38,7 +38,7 @@ public class ShardPhoenix2 extends mage.sets.tempestremastered.ShardPhoenix {
 
     public ShardPhoenix2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ShardPhoenix3.java b/Mage.Sets/src/mage/sets/superseries/ShardPhoenix3.java
index 40b3e66901..795b156c39 100644
--- a/Mage.Sets/src/mage/sets/superseries/ShardPhoenix3.java
+++ b/Mage.Sets/src/mage/sets/superseries/ShardPhoenix3.java
@@ -38,7 +38,7 @@ public class ShardPhoenix3 extends mage.sets.tempestremastered.ShardPhoenix {
 
     public ShardPhoenix3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/SlithFirewalker.java b/Mage.Sets/src/mage/sets/superseries/SlithFirewalker.java
index 8d498ebbd0..8b7a68f5bb 100644
--- a/Mage.Sets/src/mage/sets/superseries/SlithFirewalker.java
+++ b/Mage.Sets/src/mage/sets/superseries/SlithFirewalker.java
@@ -38,7 +38,7 @@ public class SlithFirewalker extends mage.sets.mirrodin.SlithFirewalker {
 
     public SlithFirewalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/SoltariPriest1.java b/Mage.Sets/src/mage/sets/superseries/SoltariPriest1.java
index 5242d4dc76..116dcd865f 100644
--- a/Mage.Sets/src/mage/sets/superseries/SoltariPriest1.java
+++ b/Mage.Sets/src/mage/sets/superseries/SoltariPriest1.java
@@ -38,7 +38,7 @@ public class SoltariPriest1 extends mage.sets.tempest.SoltariPriest {
 
     public SoltariPriest1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/SoltariPriest2.java b/Mage.Sets/src/mage/sets/superseries/SoltariPriest2.java
index 0993e89dff..ecebf226ca 100644
--- a/Mage.Sets/src/mage/sets/superseries/SoltariPriest2.java
+++ b/Mage.Sets/src/mage/sets/superseries/SoltariPriest2.java
@@ -38,7 +38,7 @@ public class SoltariPriest2 extends mage.sets.tempest.SoltariPriest {
 
     public SoltariPriest2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/SoltariPriest3.java b/Mage.Sets/src/mage/sets/superseries/SoltariPriest3.java
index 096dc6f497..35a332937a 100644
--- a/Mage.Sets/src/mage/sets/superseries/SoltariPriest3.java
+++ b/Mage.Sets/src/mage/sets/superseries/SoltariPriest3.java
@@ -38,7 +38,7 @@ public class SoltariPriest3 extends mage.sets.tempest.SoltariPriest {
 
     public SoltariPriest3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/ThranQuarry.java b/Mage.Sets/src/mage/sets/superseries/ThranQuarry.java
index 4524a1c377..d2f620950d 100644
--- a/Mage.Sets/src/mage/sets/superseries/ThranQuarry.java
+++ b/Mage.Sets/src/mage/sets/superseries/ThranQuarry.java
@@ -38,7 +38,7 @@ public class ThranQuarry extends mage.sets.urzassaga.ThranQuarry {
 
     public ThranQuarry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/TwoHeadedDragon.java b/Mage.Sets/src/mage/sets/superseries/TwoHeadedDragon.java
index 0f1950f486..418d8c234e 100644
--- a/Mage.Sets/src/mage/sets/superseries/TwoHeadedDragon.java
+++ b/Mage.Sets/src/mage/sets/superseries/TwoHeadedDragon.java
@@ -38,7 +38,7 @@ public class TwoHeadedDragon extends mage.sets.mercadianmasques.TwoHeadedDragon
 
     public TwoHeadedDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "SUS";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/superseries/VolcanicHammer.java b/Mage.Sets/src/mage/sets/superseries/VolcanicHammer.java
index 8cfba73c23..16af4d6d77 100644
--- a/Mage.Sets/src/mage/sets/superseries/VolcanicHammer.java
+++ b/Mage.Sets/src/mage/sets/superseries/VolcanicHammer.java
@@ -37,7 +37,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {
 
     public VolcanicHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/WhirlingDervish1.java b/Mage.Sets/src/mage/sets/superseries/WhirlingDervish1.java
index 648c0c8e96..34dd7381df 100644
--- a/Mage.Sets/src/mage/sets/superseries/WhirlingDervish1.java
+++ b/Mage.Sets/src/mage/sets/superseries/WhirlingDervish1.java
@@ -37,7 +37,7 @@ public class WhirlingDervish1 extends mage.sets.timeshifted.WhirlingDervish {
 
     public WhirlingDervish1(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/WhirlingDervish2.java b/Mage.Sets/src/mage/sets/superseries/WhirlingDervish2.java
index 75d7637e9b..6d66d776f3 100644
--- a/Mage.Sets/src/mage/sets/superseries/WhirlingDervish2.java
+++ b/Mage.Sets/src/mage/sets/superseries/WhirlingDervish2.java
@@ -37,7 +37,7 @@ public class WhirlingDervish2 extends mage.sets.timeshifted.WhirlingDervish {
 
     public WhirlingDervish2(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/superseries/WhirlingDervish3.java b/Mage.Sets/src/mage/sets/superseries/WhirlingDervish3.java
index f2155e47d2..081bd7d323 100644
--- a/Mage.Sets/src/mage/sets/superseries/WhirlingDervish3.java
+++ b/Mage.Sets/src/mage/sets/superseries/WhirlingDervish3.java
@@ -37,7 +37,7 @@ public class WhirlingDervish3 extends mage.sets.timeshifted.WhirlingDervish {
 
     public WhirlingDervish3(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "SUS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/AvengingAngel.java b/Mage.Sets/src/mage/sets/tempest/AvengingAngel.java
index 62022df453..72931a5d0e 100644
--- a/Mage.Sets/src/mage/sets/tempest/AvengingAngel.java
+++ b/Mage.Sets/src/mage/sets/tempest/AvengingAngel.java
@@ -38,7 +38,7 @@ public class AvengingAngel extends mage.sets.tempestremastered.AvengingAngel {
 
     public AvengingAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlack.java
index 6f06ea27c9..992c3cf315 100644
--- a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlue.java
index aad5273d66..5327f779b6 100644
--- a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionGreen.java
index c68dc81558..4194d4007c 100644
--- a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionRed.java
index 2e9f844f50..fe0fc467d8 100644
--- a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionWhite.java
index c81c41b9b0..5b10fc4b21 100644
--- a/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/tempest/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Coercion.java b/Mage.Sets/src/mage/sets/tempest/Coercion.java
index 264c2be90f..4e76223b4f 100644
--- a/Mage.Sets/src/mage/sets/tempest/Coercion.java
+++ b/Mage.Sets/src/mage/sets/tempest/Coercion.java
@@ -37,7 +37,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/CoffinQueen.java b/Mage.Sets/src/mage/sets/tempest/CoffinQueen.java
index b17c5dd278..b0843868b8 100644
--- a/Mage.Sets/src/mage/sets/tempest/CoffinQueen.java
+++ b/Mage.Sets/src/mage/sets/tempest/CoffinQueen.java
@@ -37,7 +37,7 @@ public class CoffinQueen extends mage.sets.tempestremastered.CoffinQueen {
 
     public CoffinQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/DarkRitual.java b/Mage.Sets/src/mage/sets/tempest/DarkRitual.java
index ff3b9abf38..06f8d18c95 100644
--- a/Mage.Sets/src/mage/sets/tempest/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/tempest/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Deadshot.java b/Mage.Sets/src/mage/sets/tempest/Deadshot.java
index dabf0b2679..20fcaed9bd 100644
--- a/Mage.Sets/src/mage/sets/tempest/Deadshot.java
+++ b/Mage.Sets/src/mage/sets/tempest/Deadshot.java
@@ -38,7 +38,7 @@ public class Deadshot extends mage.sets.tempestremastered.Deadshot {
 
     public Deadshot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/DirtcowlWurm.java b/Mage.Sets/src/mage/sets/tempest/DirtcowlWurm.java
index d3dd022185..0cc3d50494 100644
--- a/Mage.Sets/src/mage/sets/tempest/DirtcowlWurm.java
+++ b/Mage.Sets/src/mage/sets/tempest/DirtcowlWurm.java
@@ -38,7 +38,7 @@ public class DirtcowlWurm extends mage.sets.prereleaseevents.DirtcowlWurm {
 
     public DirtcowlWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/DregsOfSorrow.java b/Mage.Sets/src/mage/sets/tempest/DregsOfSorrow.java
index 561cf1d1fb..ab151702ab 100644
--- a/Mage.Sets/src/mage/sets/tempest/DregsOfSorrow.java
+++ b/Mage.Sets/src/mage/sets/tempest/DregsOfSorrow.java
@@ -37,7 +37,7 @@ public class DregsOfSorrow extends mage.sets.commander2014.DregsOfSorrow {
 
     public DregsOfSorrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/FieldOfSouls.java b/Mage.Sets/src/mage/sets/tempest/FieldOfSouls.java
index 2bf3ac43a5..761f5145be 100644
--- a/Mage.Sets/src/mage/sets/tempest/FieldOfSouls.java
+++ b/Mage.Sets/src/mage/sets/tempest/FieldOfSouls.java
@@ -37,7 +37,7 @@ public class FieldOfSouls extends mage.sets.tempestremastered.FieldOfSouls {
 
     public FieldOfSouls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/FlowstoneSculpture.java b/Mage.Sets/src/mage/sets/tempest/FlowstoneSculpture.java
index 1bb12a840b..1ff04ae3e7 100644
--- a/Mage.Sets/src/mage/sets/tempest/FlowstoneSculpture.java
+++ b/Mage.Sets/src/mage/sets/tempest/FlowstoneSculpture.java
@@ -37,7 +37,7 @@ public class FlowstoneSculpture extends mage.sets.vintagemasters.FlowstoneSculpt
 
     public FlowstoneSculpture(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Gravedigger.java b/Mage.Sets/src/mage/sets/tempest/Gravedigger.java
index 225c4cc73c..aed4191f44 100644
--- a/Mage.Sets/src/mage/sets/tempest/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/tempest/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Harrow.java b/Mage.Sets/src/mage/sets/tempest/Harrow.java
index c9317d3bcc..925a9eff1e 100644
--- a/Mage.Sets/src/mage/sets/tempest/Harrow.java
+++ b/Mage.Sets/src/mage/sets/tempest/Harrow.java
@@ -38,7 +38,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodDryad.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodDryad.java
index 5d56921c33..bbab239945 100644
--- a/Mage.Sets/src/mage/sets/tempest/HeartwoodDryad.java
+++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodDryad.java
@@ -37,7 +37,7 @@ public class HeartwoodDryad extends mage.sets.tempestremastered.HeartwoodDryad {
 
     public HeartwoodDryad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/HornedTurtle.java b/Mage.Sets/src/mage/sets/tempest/HornedTurtle.java
index 540554eb94..01f2b945fd 100644
--- a/Mage.Sets/src/mage/sets/tempest/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/tempest/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/JinxedIdol.java b/Mage.Sets/src/mage/sets/tempest/JinxedIdol.java
index 4b32a17b39..ea86e01eda 100644
--- a/Mage.Sets/src/mage/sets/tempest/JinxedIdol.java
+++ b/Mage.Sets/src/mage/sets/tempest/JinxedIdol.java
@@ -37,7 +37,7 @@ public class JinxedIdol extends mage.sets.magic2011.JinxedIdol {
 
     public JinxedIdol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/LightningElemental.java b/Mage.Sets/src/mage/sets/tempest/LightningElemental.java
index c0fe4e9149..3d163a0b1b 100644
--- a/Mage.Sets/src/mage/sets/tempest/LightningElemental.java
+++ b/Mage.Sets/src/mage/sets/tempest/LightningElemental.java
@@ -37,7 +37,7 @@ public class LightningElemental extends mage.sets.tenthedition.LightningElementa
 
     public LightningElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/MountedArchers.java b/Mage.Sets/src/mage/sets/tempest/MountedArchers.java
index 5c1348f4d4..5ab2169a97 100644
--- a/Mage.Sets/src/mage/sets/tempest/MountedArchers.java
+++ b/Mage.Sets/src/mage/sets/tempest/MountedArchers.java
@@ -37,7 +37,7 @@ public class MountedArchers extends mage.sets.tempestremastered.MountedArchers {
 
     public MountedArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/NaturesRevolt.java b/Mage.Sets/src/mage/sets/tempest/NaturesRevolt.java
index ef8ff8c4cd..c527789b26 100644
--- a/Mage.Sets/src/mage/sets/tempest/NaturesRevolt.java
+++ b/Mage.Sets/src/mage/sets/tempest/NaturesRevolt.java
@@ -38,7 +38,7 @@ public class NaturesRevolt extends mage.sets.seventhedition.NaturesRevolt {
 
     public NaturesRevolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Overrun.java b/Mage.Sets/src/mage/sets/tempest/Overrun.java
index dd55849677..6551e15555 100644
--- a/Mage.Sets/src/mage/sets/tempest/Overrun.java
+++ b/Mage.Sets/src/mage/sets/tempest/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Pacifism.java b/Mage.Sets/src/mage/sets/tempest/Pacifism.java
index 2390b79689..fd49b9edb3 100644
--- a/Mage.Sets/src/mage/sets/tempest/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/tempest/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java
index c8903e2c94..7bded4192a 100644
--- a/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/PowerSink.java b/Mage.Sets/src/mage/sets/tempest/PowerSink.java
index 52ff92dbf1..ee5caf5a9d 100644
--- a/Mage.Sets/src/mage/sets/tempest/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/tempest/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/RampantGrowth.java b/Mage.Sets/src/mage/sets/tempest/RampantGrowth.java
index cb545ea61a..e0a81e2976 100644
--- a/Mage.Sets/src/mage/sets/tempest/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/tempest/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/RathiDragon.java b/Mage.Sets/src/mage/sets/tempest/RathiDragon.java
index 3bad6d6d51..67379b0d90 100644
--- a/Mage.Sets/src/mage/sets/tempest/RathiDragon.java
+++ b/Mage.Sets/src/mage/sets/tempest/RathiDragon.java
@@ -37,7 +37,7 @@ public class RathiDragon extends mage.sets.ninthedition.RathiDragon {
 
     public RathiDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Repentance.java b/Mage.Sets/src/mage/sets/tempest/Repentance.java
index 1597a79963..6d1fd23407 100644
--- a/Mage.Sets/src/mage/sets/tempest/Repentance.java
+++ b/Mage.Sets/src/mage/sets/tempest/Repentance.java
@@ -37,7 +37,7 @@ public class Repentance extends mage.sets.tempestremastered.Repentance {
 
     public Repentance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/RollingThunder.java b/Mage.Sets/src/mage/sets/tempest/RollingThunder.java
index f84c6bc1a1..a68b53cd67 100644
--- a/Mage.Sets/src/mage/sets/tempest/RollingThunder.java
+++ b/Mage.Sets/src/mage/sets/tempest/RollingThunder.java
@@ -38,7 +38,7 @@ public class RollingThunder extends mage.sets.tempestremastered.RollingThunder {
 
     public RollingThunder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/Shatter.java b/Mage.Sets/src/mage/sets/tempest/Shatter.java
index 6e9fe5e07d..b287c20aa9 100644
--- a/Mage.Sets/src/mage/sets/tempest/Shatter.java
+++ b/Mage.Sets/src/mage/sets/tempest/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudVampire.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudVampire.java
index aa602e378b..0e59907cfe 100644
--- a/Mage.Sets/src/mage/sets/tempest/SkyshroudVampire.java
+++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudVampire.java
@@ -37,7 +37,7 @@ public class SkyshroudVampire extends mage.sets.tempestremastered.SkyshroudVampi
 
     public SkyshroudVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariLancer.java b/Mage.Sets/src/mage/sets/tempest/SoltariLancer.java
index cddc2574bd..385e00e2a2 100644
--- a/Mage.Sets/src/mage/sets/tempest/SoltariLancer.java
+++ b/Mage.Sets/src/mage/sets/tempest/SoltariLancer.java
@@ -37,7 +37,7 @@ public class SoltariLancer extends mage.sets.tempestremastered.SoltariLancer {
 
     public SoltariLancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/SpellBlast.java b/Mage.Sets/src/mage/sets/tempest/SpellBlast.java
index 9cbee5284b..f815b96365 100644
--- a/Mage.Sets/src/mage/sets/tempest/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/tempest/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/SpinalGraft.java b/Mage.Sets/src/mage/sets/tempest/SpinalGraft.java
index 40df20602c..e094e7e449 100644
--- a/Mage.Sets/src/mage/sets/tempest/SpinalGraft.java
+++ b/Mage.Sets/src/mage/sets/tempest/SpinalGraft.java
@@ -37,7 +37,7 @@ public class SpinalGraft extends mage.sets.vintagemasters.SpinalGraft {
 
     public SpinalGraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/SuddenImpact.java b/Mage.Sets/src/mage/sets/tempest/SuddenImpact.java
index c6729e030a..716bbf4dee 100644
--- a/Mage.Sets/src/mage/sets/tempest/SuddenImpact.java
+++ b/Mage.Sets/src/mage/sets/tempest/SuddenImpact.java
@@ -37,7 +37,7 @@ public class SuddenImpact extends mage.sets.seventhedition.SuddenImpact {
 
     public SuddenImpact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/ThalakosSeer.java b/Mage.Sets/src/mage/sets/tempest/ThalakosSeer.java
index b8577d2491..496cfe1df7 100644
--- a/Mage.Sets/src/mage/sets/tempest/ThalakosSeer.java
+++ b/Mage.Sets/src/mage/sets/tempest/ThalakosSeer.java
@@ -37,7 +37,7 @@ public class ThalakosSeer extends mage.sets.tempestremastered.ThalakosSeer {
 
     public ThalakosSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/TimeWarp.java b/Mage.Sets/src/mage/sets/tempest/TimeWarp.java
index b59b499100..3aa72e72e5 100644
--- a/Mage.Sets/src/mage/sets/tempest/TimeWarp.java
+++ b/Mage.Sets/src/mage/sets/tempest/TimeWarp.java
@@ -38,7 +38,7 @@ public class TimeWarp extends mage.sets.magic2010.TimeWarp {
 
     public TimeWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "TMP";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/Twitch.java b/Mage.Sets/src/mage/sets/tempest/Twitch.java
index 846a98ebc6..04aad7bc2d 100644
--- a/Mage.Sets/src/mage/sets/tempest/Twitch.java
+++ b/Mage.Sets/src/mage/sets/tempest/Twitch.java
@@ -37,7 +37,7 @@ public class Twitch extends mage.sets.worldwake.Twitch {
 
     public Twitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/WindDrake.java b/Mage.Sets/src/mage/sets/tempest/WindDrake.java
index bec335336c..9cb8b47e41 100644
--- a/Mage.Sets/src/mage/sets/tempest/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/tempest/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/WindsOfRath.java b/Mage.Sets/src/mage/sets/tempest/WindsOfRath.java
index 498350931d..818c031e2f 100644
--- a/Mage.Sets/src/mage/sets/tempest/WindsOfRath.java
+++ b/Mage.Sets/src/mage/sets/tempest/WindsOfRath.java
@@ -37,7 +37,7 @@ public class WindsOfRath extends mage.sets.heroesvsmonsters.WindsOfRath {
 
     public WindsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "TMP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/AcidicSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/AcidicSliver.java
index 315bd00353..e2d47ade84 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/AcidicSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/AcidicSliver.java
@@ -37,7 +37,7 @@ public class AcidicSliver extends mage.sets.stronghold.AcidicSliver {
 
     public AcidicSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Aftershock.java b/Mage.Sets/src/mage/sets/tempestremastered/Aftershock.java
index bdecf0e5ef..11273d051f 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Aftershock.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Aftershock.java
@@ -37,7 +37,7 @@ public class Aftershock extends mage.sets.tempest.Aftershock {
 
     public Aftershock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Aluren.java b/Mage.Sets/src/mage/sets/tempestremastered/Aluren.java
index 2a9f8e0b69..64cda20597 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Aluren.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Aluren.java
@@ -37,7 +37,7 @@ public class Aluren extends mage.sets.tempest.Aluren {
 
     public Aluren(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Anarchist.java b/Mage.Sets/src/mage/sets/tempestremastered/Anarchist.java
index 615878a605..82b7140573 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Anarchist.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Anarchist.java
@@ -38,7 +38,7 @@ public class Anarchist extends mage.sets.ninthedition.Anarchist {
 
     public Anarchist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/AngelicBlessing.java b/Mage.Sets/src/mage/sets/tempestremastered/AngelicBlessing.java
index 4c5e1daa33..5099e6165d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/AngelicBlessing.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/AngelicBlessing.java
@@ -37,7 +37,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing {
 
     public AngelicBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/AngelicProtector.java b/Mage.Sets/src/mage/sets/tempestremastered/AngelicProtector.java
index ce2c7ac5fb..32ea815361 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/AngelicProtector.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/AngelicProtector.java
@@ -37,7 +37,7 @@ public class AngelicProtector extends mage.sets.tempest.AngelicProtector {
 
     public AngelicProtector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Anoint.java b/Mage.Sets/src/mage/sets/tempestremastered/Anoint.java
index 6c7dd5c5ef..f3c799327a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Anoint.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Anoint.java
@@ -37,7 +37,7 @@ public class Anoint extends mage.sets.tempest.Anoint {
 
     public Anoint(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ArmorSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/ArmorSliver.java
index 55158b8b19..14c6e3339d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ArmorSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ArmorSliver.java
@@ -38,7 +38,7 @@ public class ArmorSliver extends mage.sets.tempest.ArmorSliver {
 
     public ArmorSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/tempestremastered/ArmoredPegasus.java
index 045e73aeac..f2504a4415 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ArmoredPegasus.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ArmoredPegasus.java
@@ -37,7 +37,7 @@ public class ArmoredPegasus extends mage.sets.tempest.ArmoredPegasus {
 
     public ArmoredPegasus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Bandage.java b/Mage.Sets/src/mage/sets/tempestremastered/Bandage.java
index fb11b774d4..0cdd5d607e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Bandage.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Bandage.java
@@ -37,7 +37,7 @@ public class Bandage extends mage.sets.tenthedition.Bandage {
 
     public Bandage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/BarbedSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/BarbedSliver.java
index a282a9f438..dea26323e4 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/BarbedSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/BarbedSliver.java
@@ -38,7 +38,7 @@ public class BarbedSliver extends mage.sets.tempest.BarbedSliver {
 
     public BarbedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/BottleGnomes.java b/Mage.Sets/src/mage/sets/tempestremastered/BottleGnomes.java
index 6c8f9ef0ac..bd79ad3626 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/BottleGnomes.java
@@ -38,7 +38,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CalderaLake.java b/Mage.Sets/src/mage/sets/tempestremastered/CalderaLake.java
index cdeaa22b01..fd602ff8d3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CalderaLake.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CalderaLake.java
@@ -38,7 +38,7 @@ public class CalderaLake extends mage.sets.tempest.CalderaLake {
 
     public CalderaLake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CanopySpider.java b/Mage.Sets/src/mage/sets/tempestremastered/CanopySpider.java
index 889ea99482..98ba28d715 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CanopySpider.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CanopySpider.java
@@ -37,7 +37,7 @@ public class CanopySpider extends mage.sets.tempest.CanopySpider {
 
     public CanopySpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CanyonWildcat.java b/Mage.Sets/src/mage/sets/tempestremastered/CanyonWildcat.java
index 33e93aee73..d7e8b2eb69 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CanyonWildcat.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CanyonWildcat.java
@@ -37,7 +37,7 @@ public class CanyonWildcat extends mage.sets.tempest.CanyonWildcat {
 
     public CanyonWildcat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Capsize.java b/Mage.Sets/src/mage/sets/tempestremastered/Capsize.java
index 613b1acdf8..106d412378 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Capsize.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Capsize.java
@@ -38,7 +38,7 @@ public class Capsize extends mage.sets.tempest.Capsize {
 
     public Capsize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Carnassid.java b/Mage.Sets/src/mage/sets/tempestremastered/Carnassid.java
index eff691f8a2..c4fc178f8c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Carnassid.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Carnassid.java
@@ -38,7 +38,7 @@ public class Carnassid extends mage.sets.stronghold.Carnassid {
 
     public Carnassid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Carnophage.java b/Mage.Sets/src/mage/sets/tempestremastered/Carnophage.java
index 0c2e302a63..026c6e1c7b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Carnophage.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Carnophage.java
@@ -37,7 +37,7 @@ public class Carnophage extends mage.sets.exodus.Carnophage {
 
     public Carnophage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Cataclysm.java b/Mage.Sets/src/mage/sets/tempestremastered/Cataclysm.java
index edbd09d879..8c6bb4d318 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Cataclysm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Cataclysm.java
@@ -38,7 +38,7 @@ public class Cataclysm extends mage.sets.exodus.Cataclysm {
 
     public Cataclysm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ChargingPaladin.java b/Mage.Sets/src/mage/sets/tempestremastered/ChargingPaladin.java
index dee3c8bdaa..b7d835c10a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ChargingPaladin.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ChargingPaladin.java
@@ -37,7 +37,7 @@ public class ChargingPaladin extends mage.sets.divinevsdemonic.ChargingPaladin {
 
     public ChargingPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CinderMarsh.java b/Mage.Sets/src/mage/sets/tempestremastered/CinderMarsh.java
index f9caecf3ee..64d275509e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CinderMarsh.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CinderMarsh.java
@@ -37,7 +37,7 @@ public class CinderMarsh extends mage.sets.tempest.CinderMarsh {
 
     public CinderMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CityOfTraitors.java b/Mage.Sets/src/mage/sets/tempestremastered/CityOfTraitors.java
index 211232c204..dcedf9d681 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CityOfTraitors.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CityOfTraitors.java
@@ -37,7 +37,7 @@ public class CityOfTraitors extends mage.sets.exodus.CityOfTraitors {
 
     public CityOfTraitors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ClotSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/ClotSliver.java
index 00d4527dd9..e50c1bed56 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ClotSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ClotSliver.java
@@ -37,7 +37,7 @@ public class ClotSliver extends mage.sets.tempest.ClotSliver {
 
     public ClotSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CoatOfArms.java b/Mage.Sets/src/mage/sets/tempestremastered/CoatOfArms.java
index c9941f4dd1..2a9ec9d587 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Coercion.java b/Mage.Sets/src/mage/sets/tempestremastered/Coercion.java
index b4664ccd84..027f5da661 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Coercion.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Coercion.java
@@ -37,7 +37,7 @@ public class Coercion extends mage.sets.visions.Coercion {
 
     public Coercion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CoiledTinviper.java b/Mage.Sets/src/mage/sets/tempestremastered/CoiledTinviper.java
index 75c73c7510..f35c1c10c5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CoiledTinviper.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CoiledTinviper.java
@@ -37,7 +37,7 @@ public class CoiledTinviper extends mage.sets.tempest.CoiledTinviper {
 
     public CoiledTinviper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CommanderGrevenIlVec.java b/Mage.Sets/src/mage/sets/tempestremastered/CommanderGrevenIlVec.java
index 08a348def4..4f761bfef3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CommanderGrevenIlVec.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CommanderGrevenIlVec.java
@@ -37,7 +37,7 @@ public class CommanderGrevenIlVec extends mage.sets.tempest.CommanderGrevenIlVec
 
     public CommanderGrevenIlVec(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Conviction.java b/Mage.Sets/src/mage/sets/tempestremastered/Conviction.java
index f859f92afb..068ad37019 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Conviction.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Conviction.java
@@ -37,7 +37,7 @@ public class Conviction extends mage.sets.stronghold.Conviction {
 
     public Conviction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CorpseDance.java b/Mage.Sets/src/mage/sets/tempestremastered/CorpseDance.java
index a613f5d459..ef0be6f117 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CorpseDance.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CorpseDance.java
@@ -37,7 +37,7 @@ public class CorpseDance extends mage.sets.tempest.CorpseDance {
 
     public CorpseDance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Counterspell.java b/Mage.Sets/src/mage/sets/tempestremastered/Counterspell.java
index 37bb1544ae..16286968c0 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CravenGiant.java b/Mage.Sets/src/mage/sets/tempestremastered/CravenGiant.java
index 4bdba66fbd..eb4b89716b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CravenGiant.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CravenGiant.java
@@ -37,7 +37,7 @@ public class CravenGiant extends mage.sets.stronghold.CravenGiant {
 
     public CravenGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CrovaxTheCursed.java b/Mage.Sets/src/mage/sets/tempestremastered/CrovaxTheCursed.java
index 08838dabde..0cf2aaeedd 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CrovaxTheCursed.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CrovaxTheCursed.java
@@ -37,7 +37,7 @@ public class CrovaxTheCursed extends mage.sets.stronghold.CrovaxTheCursed {
 
     public CrovaxTheCursed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CrystallineSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/CrystallineSliver.java
index a5b7283bb0..5583185101 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CrystallineSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CrystallineSliver.java
@@ -37,7 +37,7 @@ public class CrystallineSliver extends mage.sets.stronghold.CrystallineSliver {
 
     public CrystallineSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Curiosity.java b/Mage.Sets/src/mage/sets/tempestremastered/Curiosity.java
index 4d587ce793..6cad084ab4 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Curiosity.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Curiosity.java
@@ -37,7 +37,7 @@ public class Curiosity extends mage.sets.innistrad.Curiosity {
 
     public Curiosity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CursedFlesh.java b/Mage.Sets/src/mage/sets/tempestremastered/CursedFlesh.java
index 2ce7e1208a..d78a869b43 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CursedFlesh.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CursedFlesh.java
@@ -37,7 +37,7 @@ public class CursedFlesh extends mage.sets.invasion.CursedFlesh {
 
     public CursedFlesh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/CursedScroll.java b/Mage.Sets/src/mage/sets/tempestremastered/CursedScroll.java
index 0713065898..72160a2135 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/CursedScroll.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/CursedScroll.java
@@ -38,7 +38,7 @@ public class CursedScroll extends mage.sets.tempest.CursedScroll {
 
     public CursedScroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DarkBanishing.java b/Mage.Sets/src/mage/sets/tempestremastered/DarkBanishing.java
index 996bfcfb41..aa00e9b46b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DarkBanishing.java
@@ -37,7 +37,7 @@ public class DarkBanishing extends mage.sets.tempest.DarkBanishing {
 
     public DarkBanishing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DarkRitual.java b/Mage.Sets/src/mage/sets/tempestremastered/DarkRitual.java
index cde523508e..68dc77b2e5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DauthiHorror.java b/Mage.Sets/src/mage/sets/tempestremastered/DauthiHorror.java
index d174815b7f..8b1eaeb05c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DauthiHorror.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DauthiHorror.java
@@ -37,7 +37,7 @@ public class DauthiHorror extends mage.sets.tempest.DauthiHorror {
 
     public DauthiHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DauthiMarauder.java b/Mage.Sets/src/mage/sets/tempestremastered/DauthiMarauder.java
index 99eb29ee32..71f6a42bc6 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DauthiMarauder.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DauthiMarauder.java
@@ -38,7 +38,7 @@ public class DauthiMarauder extends mage.sets.tempest.DauthiMarauder {
 
     public DauthiMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DauthiSlayer.java b/Mage.Sets/src/mage/sets/tempestremastered/DauthiSlayer.java
index e5ec0f5f2b..1ddef86d47 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DauthiSlayer.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DauthiSlayer.java
@@ -38,7 +38,7 @@ public class DauthiSlayer extends mage.sets.tempest.DauthiSlayer {
 
     public DauthiSlayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DeathPitsOfRath.java b/Mage.Sets/src/mage/sets/tempestremastered/DeathPitsOfRath.java
index 11d283648f..c4f76f9061 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DeathPitsOfRath.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DeathPitsOfRath.java
@@ -37,7 +37,7 @@ public class DeathPitsOfRath extends mage.sets.tempest.DeathPitsOfRath {
 
     public DeathPitsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DeathStroke.java b/Mage.Sets/src/mage/sets/tempestremastered/DeathStroke.java
index 765c68cd33..b3f1d9e085 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DeathStroke.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DeathStroke.java
@@ -37,7 +37,7 @@ public class DeathStroke extends mage.sets.stronghold.DeathStroke {
 
     public DeathStroke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DiabolicEdict.java b/Mage.Sets/src/mage/sets/tempestremastered/DiabolicEdict.java
index c933259250..d9c5233de9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DiabolicEdict.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DiabolicEdict.java
@@ -37,7 +37,7 @@ public class DiabolicEdict extends mage.sets.tempest.DiabolicEdict {
 
     public DiabolicEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Disenchant.java b/Mage.Sets/src/mage/sets/tempestremastered/Disenchant.java
index 1feca7f484..2c590ac3c3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Dismiss.java b/Mage.Sets/src/mage/sets/tempestremastered/Dismiss.java
index 7c8581331a..249097b4aa 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Dismiss.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Dismiss.java
@@ -37,7 +37,7 @@ public class Dismiss extends mage.sets.tempest.Dismiss {
 
     public Dismiss(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Dracoplasm.java b/Mage.Sets/src/mage/sets/tempestremastered/Dracoplasm.java
index 7b0f75351b..8dd094d9e2 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Dracoplasm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Dracoplasm.java
@@ -37,7 +37,7 @@ public class Dracoplasm extends mage.sets.tempest.Dracoplasm {
 
     public Dracoplasm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DreamHalls.java b/Mage.Sets/src/mage/sets/tempestremastered/DreamHalls.java
index 646f0654ec..af94215809 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DreamHalls.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DreamHalls.java
@@ -38,7 +38,7 @@ public class DreamHalls extends mage.sets.stronghold.DreamHalls {
 
     public DreamHalls(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/DungeonShade.java b/Mage.Sets/src/mage/sets/tempestremastered/DungeonShade.java
index 3cbb2616f3..96cfbfa64e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/DungeonShade.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/DungeonShade.java
@@ -37,7 +37,7 @@ public class DungeonShade extends mage.sets.stronghold.DungeonShade {
 
     public DungeonShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ElvenRite.java b/Mage.Sets/src/mage/sets/tempestremastered/ElvenRite.java
index 6b428adf44..6151bdbda1 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ElvenRite.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ElvenRite.java
@@ -38,7 +38,7 @@ public class ElvenRite extends mage.sets.stronghold.ElvenRite {
 
     public ElvenRite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ElvishFury.java b/Mage.Sets/src/mage/sets/tempestremastered/ElvishFury.java
index a234e3f9ab..e6f9f113ed 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ElvishFury.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ElvishFury.java
@@ -37,7 +37,7 @@ public class ElvishFury extends mage.sets.tempest.ElvishFury {
 
     public ElvishFury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/EmmessiTome.java b/Mage.Sets/src/mage/sets/tempestremastered/EmmessiTome.java
index cae6db04dd..860bd368f7 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/EmmessiTome.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/EmmessiTome.java
@@ -38,7 +38,7 @@ public class EmmessiTome extends mage.sets.tempest.EmmessiTome {
 
     public EmmessiTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Ephemeron.java b/Mage.Sets/src/mage/sets/tempestremastered/Ephemeron.java
index 0bb7bda2d7..1d13b93120 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Ephemeron.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Ephemeron.java
@@ -37,7 +37,7 @@ public class Ephemeron extends mage.sets.exodus.Ephemeron {
 
     public Ephemeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ErraticPortal.java b/Mage.Sets/src/mage/sets/tempestremastered/ErraticPortal.java
index 072ed84e8a..c056d5fcf2 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ErraticPortal.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ErraticPortal.java
@@ -37,7 +37,7 @@ public class ErraticPortal extends mage.sets.exodus.ErraticPortal {
 
     public ErraticPortal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/EvincarsJustice.java b/Mage.Sets/src/mage/sets/tempestremastered/EvincarsJustice.java
index c06679f533..03d69cad2a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/EvincarsJustice.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/EvincarsJustice.java
@@ -38,7 +38,7 @@ public class EvincarsJustice extends mage.sets.tempest.EvincarsJustice {
 
     public EvincarsJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ExaltedDragon.java b/Mage.Sets/src/mage/sets/tempestremastered/ExaltedDragon.java
index cb56fb0cc8..6e50dc6c00 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ExaltedDragon.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ExaltedDragon.java
@@ -37,7 +37,7 @@ public class ExaltedDragon extends mage.sets.exodus.ExaltedDragon {
 
     public ExaltedDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/FanningTheFlames.java b/Mage.Sets/src/mage/sets/tempestremastered/FanningTheFlames.java
index 50c4a767c7..7f9eec8237 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/FanningTheFlames.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/FanningTheFlames.java
@@ -38,7 +38,7 @@ public class FanningTheFlames extends mage.sets.stronghold.FanningTheFlames {
 
     public FanningTheFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/FightingDrake.java b/Mage.Sets/src/mage/sets/tempestremastered/FightingDrake.java
index a93431f765..56ec7f8ffe 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/FightingDrake.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/FightingDrake.java
@@ -37,7 +37,7 @@ public class FightingDrake extends mage.sets.tempest.FightingDrake {
 
     public FightingDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/FlameWave.java b/Mage.Sets/src/mage/sets/tempestremastered/FlameWave.java
index 1db2894a9b..d4a296ecb5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/FlameWave.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/FlameWave.java
@@ -38,7 +38,7 @@ public class FlameWave extends mage.sets.ninthedition.FlameWave {
 
     public FlameWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneBlade.java b/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneBlade.java
index 230fb68753..6271402851 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneBlade.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneBlade.java
@@ -37,7 +37,7 @@ public class FlowstoneBlade extends mage.sets.conspiracy.FlowstoneBlade {
 
     public FlowstoneBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneMauler.java b/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneMauler.java
index 8a1fd3240b..d41f95477d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneMauler.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneMauler.java
@@ -38,7 +38,7 @@ public class FlowstoneMauler extends mage.sets.stronghold.FlowstoneMauler {
 
     public FlowstoneMauler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneWyvern.java b/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneWyvern.java
index e54974e329..3b6211b582 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneWyvern.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/FlowstoneWyvern.java
@@ -38,7 +38,7 @@ public class FlowstoneWyvern extends mage.sets.tempest.FlowstoneWyvern {
 
     public FlowstoneWyvern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Forbid.java b/Mage.Sets/src/mage/sets/tempestremastered/Forbid.java
index 3deb80158e..ed0ab96d51 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Forbid.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Forbid.java
@@ -38,7 +38,7 @@ public class Forbid extends mage.sets.exodus.Forbid {
 
     public Forbid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Fugue.java b/Mage.Sets/src/mage/sets/tempestremastered/Fugue.java
index 3a9ad82a7a..4ae9da09e0 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Fugue.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Fugue.java
@@ -37,7 +37,7 @@ public class Fugue extends mage.sets.seventhedition.Fugue {
 
     public Fugue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Gallantry.java b/Mage.Sets/src/mage/sets/tempestremastered/Gallantry.java
index 491fac41a9..9b4c1f34d1 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Gallantry.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Gallantry.java
@@ -37,7 +37,7 @@ public class Gallantry extends mage.sets.tempest.Gallantry {
 
     public Gallantry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/GaseousForm.java b/Mage.Sets/src/mage/sets/tempestremastered/GaseousForm.java
index ed37e0377a..602a29bda6 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/GaseousForm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/GaseousForm.java
@@ -37,7 +37,7 @@ public class GaseousForm extends mage.sets.tempest.GaseousForm {
 
     public GaseousForm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/GerrardsBattleCry.java b/Mage.Sets/src/mage/sets/tempestremastered/GerrardsBattleCry.java
index a8ffeeabcd..9729ac719a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/GerrardsBattleCry.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/GerrardsBattleCry.java
@@ -37,7 +37,7 @@ public class GerrardsBattleCry extends mage.sets.tempest.GerrardsBattleCry {
 
     public GerrardsBattleCry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/GoblinBombardment.java b/Mage.Sets/src/mage/sets/tempestremastered/GoblinBombardment.java
index 7777364c85..5c7f3ee303 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/GoblinBombardment.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/GoblinBombardment.java
@@ -37,7 +37,7 @@ public class GoblinBombardment extends mage.sets.tempest.GoblinBombardment {
 
     public GoblinBombardment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Gravedigger.java b/Mage.Sets/src/mage/sets/tempestremastered/Gravedigger.java
index e5c8cc674b..0276125cee 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Gravedigger.java
@@ -37,7 +37,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Grindstone.java b/Mage.Sets/src/mage/sets/tempestremastered/Grindstone.java
index a494ef2a41..51e4217694 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Grindstone.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Grindstone.java
@@ -38,7 +38,7 @@ public class Grindstone extends mage.sets.tempest.Grindstone {
 
     public Grindstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Harrow.java b/Mage.Sets/src/mage/sets/tempestremastered/Harrow.java
index f490e3ecd9..cbed2a5b82 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Harrow.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Harrow.java
@@ -37,7 +37,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/HeartwoodGiant.java b/Mage.Sets/src/mage/sets/tempestremastered/HeartwoodGiant.java
index 9a19bc0a52..d74c4f8924 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/HeartwoodGiant.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/HeartwoodGiant.java
@@ -37,7 +37,7 @@ public class HeartwoodGiant extends mage.sets.tempest.HeartwoodGiant {
 
     public HeartwoodGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/HermitDruid.java b/Mage.Sets/src/mage/sets/tempestremastered/HermitDruid.java
index 071ddf9771..d94400f937 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/HermitDruid.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/HermitDruid.java
@@ -38,7 +38,7 @@ public class HermitDruid extends mage.sets.stronghold.HermitDruid {
 
     public HermitDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/HibernationSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/HibernationSliver.java
index 00a72e4fc9..2cdbc9e89e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/HibernationSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/HibernationSliver.java
@@ -37,7 +37,7 @@ public class HibernationSliver extends mage.sets.stronghold.HibernationSliver {
 
     public HibernationSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/HornedSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/HornedSliver.java
index bf720f3cf2..b6239b9114 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/HornedSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/HornedSliver.java
@@ -38,7 +38,7 @@ public class HornedSliver extends mage.sets.tempest.HornedSliver {
 
     public HornedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/HornedTurtle.java b/Mage.Sets/src/mage/sets/tempestremastered/HornedTurtle.java
index b6ce591bab..9f947343d9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/HornedTurtle.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/HornedTurtle.java
@@ -37,7 +37,7 @@ public class HornedTurtle extends mage.sets.magic2010.HornedTurtle {
 
     public HornedTurtle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Humility.java b/Mage.Sets/src/mage/sets/tempestremastered/Humility.java
index 1935712f06..3f48e6d9ce 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Humility.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Humility.java
@@ -38,7 +38,7 @@ public class Humility extends mage.sets.tempest.Humility {
 
     public Humility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Intuition.java b/Mage.Sets/src/mage/sets/tempestremastered/Intuition.java
index 3e0e25ee22..f2fda9e65a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Intuition.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Intuition.java
@@ -37,7 +37,7 @@ public class Intuition extends mage.sets.tempest.Intuition {
 
     public Intuition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/JinxedIdol.java b/Mage.Sets/src/mage/sets/tempestremastered/JinxedIdol.java
index 4bb4c0a166..92f3ca6923 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/JinxedIdol.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/JinxedIdol.java
@@ -37,7 +37,7 @@ public class JinxedIdol extends mage.sets.magic2011.JinxedIdol {
 
     public JinxedIdol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Kezzerdrix.java b/Mage.Sets/src/mage/sets/tempestremastered/Kezzerdrix.java
index bbf0446c47..56c111fb19 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Kezzerdrix.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Kezzerdrix.java
@@ -37,7 +37,7 @@ public class Kezzerdrix extends mage.sets.tempest.Kezzerdrix {
 
     public Kezzerdrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Kindle.java b/Mage.Sets/src/mage/sets/tempestremastered/Kindle.java
index b8d66195f0..d064aa6f01 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Kindle.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Kindle.java
@@ -37,7 +37,7 @@ public class Kindle extends mage.sets.tempest.Kindle {
 
     public Kindle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/KorChant.java b/Mage.Sets/src/mage/sets/tempestremastered/KorChant.java
index fd7614b0c3..eeaa213b1b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/KorChant.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/KorChant.java
@@ -38,7 +38,7 @@ public class KorChant extends mage.sets.exodus.KorChant {
 
     public KorChant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Krakilin.java b/Mage.Sets/src/mage/sets/tempestremastered/Krakilin.java
index f19a2c3c07..14f86d2709 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Krakilin.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Krakilin.java
@@ -38,7 +38,7 @@ public class Krakilin extends mage.sets.tempest.Krakilin {
 
     public Krakilin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/LabRats.java b/Mage.Sets/src/mage/sets/tempestremastered/LabRats.java
index a529989b66..b2b8bae2d7 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/LabRats.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/LabRats.java
@@ -37,7 +37,7 @@ public class LabRats extends mage.sets.stronghold.LabRats {
 
     public LabRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/LegacysAllure.java b/Mage.Sets/src/mage/sets/tempestremastered/LegacysAllure.java
index 9f88acee8c..baea5b9562 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/LegacysAllure.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/LegacysAllure.java
@@ -38,7 +38,7 @@ public class LegacysAllure extends mage.sets.tempest.LegacysAllure {
 
     public LegacysAllure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Legerdemain.java b/Mage.Sets/src/mage/sets/tempestremastered/Legerdemain.java
index b87455515f..1ea185f4b5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Legerdemain.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Legerdemain.java
@@ -37,7 +37,7 @@ public class Legerdemain extends mage.sets.tempest.Legerdemain {
 
     public Legerdemain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/LightningBlast.java b/Mage.Sets/src/mage/sets/tempestremastered/LightningBlast.java
index 69069d1cb7..6b050e7718 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/LightningBlast.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/LightningBlast.java
@@ -37,7 +37,7 @@ public class LightningBlast extends mage.sets.tempest.LightningBlast {
 
     public LightningBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/LivingDeath.java b/Mage.Sets/src/mage/sets/tempestremastered/LivingDeath.java
index 97e1833830..0c49373329 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/LivingDeath.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/LivingDeath.java
@@ -38,7 +38,7 @@ public class LivingDeath extends mage.sets.tempest.LivingDeath {
 
     public LivingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/LotusPetal.java b/Mage.Sets/src/mage/sets/tempestremastered/LotusPetal.java
index 634303d1dd..d84abb526d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/LotusPetal.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/LotusPetal.java
@@ -38,7 +38,7 @@ public class LotusPetal extends mage.sets.tempest.LotusPetal {
 
     public LotusPetal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/LowlandGiant.java b/Mage.Sets/src/mage/sets/tempestremastered/LowlandGiant.java
index 605895ea9c..56592e070b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/LowlandGiant.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/LowlandGiant.java
@@ -37,7 +37,7 @@ public class LowlandGiant extends mage.sets.tempest.LowlandGiant {
 
     public LowlandGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MageIlVec.java b/Mage.Sets/src/mage/sets/tempestremastered/MageIlVec.java
index 807e3ea2ac..4850304904 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MageIlVec.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MageIlVec.java
@@ -38,7 +38,7 @@ public class MageIlVec extends mage.sets.exodus.MageIlVec {
 
     public MageIlVec(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Magmasaur.java b/Mage.Sets/src/mage/sets/tempestremastered/Magmasaur.java
index 7750244699..cd12645381 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Magmasaur.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Magmasaur.java
@@ -37,7 +37,7 @@ public class Magmasaur extends mage.sets.tempest.Magmasaur {
 
     public Magmasaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ManaLeak.java b/Mage.Sets/src/mage/sets/tempestremastered/ManaLeak.java
index 39b071f57c..99e5bb2610 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ManaLeak.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ManaLeak.java
@@ -37,7 +37,7 @@ public class ManaLeak extends mage.sets.magic2011.ManaLeak {
 
     public ManaLeak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Manabond.java b/Mage.Sets/src/mage/sets/tempestremastered/Manabond.java
index ea845fa6c9..4b049c8733 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Manabond.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Manabond.java
@@ -37,7 +37,7 @@ public class Manabond extends mage.sets.exodus.Manabond {
 
     public Manabond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ManiacalRage.java b/Mage.Sets/src/mage/sets/tempestremastered/ManiacalRage.java
index 36330594ae..3d063bf9da 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ManiacalRage.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ManiacalRage.java
@@ -37,7 +37,7 @@ public class ManiacalRage extends mage.sets.conflux.ManiacalRage {
 
     public ManiacalRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MasterDecoy.java b/Mage.Sets/src/mage/sets/tempestremastered/MasterDecoy.java
index ee4e5b29eb..813f1c9de5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MasterDecoy.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MasterDecoy.java
@@ -37,7 +37,7 @@ public class MasterDecoy extends mage.sets.tempest.MasterDecoy {
 
     public MasterDecoy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Mawcor.java b/Mage.Sets/src/mage/sets/tempestremastered/Mawcor.java
index 5acc9c3890..8bdae3fb79 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Mawcor.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Mawcor.java
@@ -37,7 +37,7 @@ public class Mawcor extends mage.sets.tempest.Mawcor {
 
     public Mawcor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MazeOfShadows.java b/Mage.Sets/src/mage/sets/tempestremastered/MazeOfShadows.java
index 623b452337..57d8ec336d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MazeOfShadows.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MazeOfShadows.java
@@ -37,7 +37,7 @@ public class MazeOfShadows extends mage.sets.tempest.MazeOfShadows {
 
     public MazeOfShadows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Meditate.java b/Mage.Sets/src/mage/sets/tempestremastered/Meditate.java
index 511b921662..c12673ca86 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Meditate.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Meditate.java
@@ -37,7 +37,7 @@ public class Meditate extends mage.sets.tempest.Meditate {
 
     public Meditate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MerfolkLooter.java b/Mage.Sets/src/mage/sets/tempestremastered/MerfolkLooter.java
index bf84662bb6..bc67371e46 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MerfolkLooter.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MerfolkLooter.java
@@ -37,7 +37,7 @@ public class MerfolkLooter extends mage.sets.magic2012.MerfolkLooter {
 
     public MerfolkLooter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MetallicSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/MetallicSliver.java
index fb828cc073..f8099b4f47 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MetallicSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MetallicSliver.java
@@ -37,7 +37,7 @@ public class MetallicSliver extends mage.sets.tempest.MetallicSliver {
 
     public MetallicSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MindlessAutomaton.java b/Mage.Sets/src/mage/sets/tempestremastered/MindlessAutomaton.java
index 9a0a8f094e..522a0c9c5c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MindlessAutomaton.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MindlessAutomaton.java
@@ -37,7 +37,7 @@ public class MindlessAutomaton extends mage.sets.exodus.MindlessAutomaton {
 
     public MindlessAutomaton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MirriCatWarrior.java b/Mage.Sets/src/mage/sets/tempestremastered/MirriCatWarrior.java
index 4f4bc93a5d..faf8bc446f 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MirriCatWarrior.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MirriCatWarrior.java
@@ -37,7 +37,7 @@ public class MirriCatWarrior extends mage.sets.tenthedition.MirriCatWarrior {
 
     public MirriCatWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MnemonicSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/MnemonicSliver.java
index cec43f5499..17fcdc93a3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MnemonicSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MnemonicSliver.java
@@ -38,7 +38,7 @@ public class MnemonicSliver extends mage.sets.tempest.MnemonicSliver {
 
     public MnemonicSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MoggConscripts.java b/Mage.Sets/src/mage/sets/tempestremastered/MoggConscripts.java
index 6c3073644b..72a5c4ed11 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MoggConscripts.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MoggConscripts.java
@@ -37,7 +37,7 @@ public class MoggConscripts extends mage.sets.tempest.MoggConscripts {
 
     public MoggConscripts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MoggFanatic.java b/Mage.Sets/src/mage/sets/tempestremastered/MoggFanatic.java
index 7e709a2f48..be9e29280f 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MoggFanatic.java
@@ -37,7 +37,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MoggFlunkies.java b/Mage.Sets/src/mage/sets/tempestremastered/MoggFlunkies.java
index d8855a1be8..ffc8a6b2a3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MoggFlunkies.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MoggFlunkies.java
@@ -37,7 +37,7 @@ public class MoggFlunkies extends mage.sets.magic2013.MoggFlunkies {
 
     public MoggFlunkies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MoggHollows.java b/Mage.Sets/src/mage/sets/tempestremastered/MoggHollows.java
index d4d75bd411..516a23ffde 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MoggHollows.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MoggHollows.java
@@ -37,7 +37,7 @@ public class MoggHollows extends mage.sets.tempest.MoggHollows {
 
     public MoggHollows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MoggInfestation.java b/Mage.Sets/src/mage/sets/tempestremastered/MoggInfestation.java
index 7392319db5..075d7138c5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MoggInfestation.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MoggInfestation.java
@@ -37,7 +37,7 @@ public class MoggInfestation extends mage.sets.stronghold.MoggInfestation {
 
     public MoggInfestation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MoxDiamond.java b/Mage.Sets/src/mage/sets/tempestremastered/MoxDiamond.java
index d22e3b038e..d2ff05727e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MoxDiamond.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MoxDiamond.java
@@ -38,7 +38,7 @@ public class MoxDiamond extends mage.sets.stronghold.MoxDiamond {
 
     public MoxDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Mulch.java b/Mage.Sets/src/mage/sets/tempestremastered/Mulch.java
index 281fcc50ba..8c61b5e4ac 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Mulch.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Mulch.java
@@ -37,7 +37,7 @@ public class Mulch extends mage.sets.innistrad.Mulch {
 
     public Mulch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/MuscleSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/MuscleSliver.java
index fe9fbdc1fe..cf7c920370 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/MuscleSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/MuscleSliver.java
@@ -37,7 +37,7 @@ public class MuscleSliver extends mage.sets.tempest.MuscleSliver {
 
     public MuscleSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/NeedleStorm.java b/Mage.Sets/src/mage/sets/tempestremastered/NeedleStorm.java
index fac51386d8..e9a4136b08 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/NeedleStorm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/NeedleStorm.java
@@ -37,7 +37,7 @@ public class NeedleStorm extends mage.sets.tempest.NeedleStorm {
 
     public NeedleStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/NomadsEnKor.java b/Mage.Sets/src/mage/sets/tempestremastered/NomadsEnKor.java
index 982563363e..a295e143f3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/NomadsEnKor.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/NomadsEnKor.java
@@ -37,7 +37,7 @@ public class NomadsEnKor extends mage.sets.stronghold.NomadsEnKor {
 
     public NomadsEnKor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/OathOfDruids.java b/Mage.Sets/src/mage/sets/tempestremastered/OathOfDruids.java
index c8b742198f..5b5dfbee5a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/OathOfDruids.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/OathOfDruids.java
@@ -38,7 +38,7 @@ public class OathOfDruids extends mage.sets.exodus.OathOfDruids {
 
     public OathOfDruids(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/OgreShaman.java b/Mage.Sets/src/mage/sets/tempestremastered/OgreShaman.java
index 81b8562d8f..2724693f4e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/OgreShaman.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/OgreShaman.java
@@ -37,7 +37,7 @@ public class OgreShaman extends mage.sets.exodus.OgreShaman {
 
     public OgreShaman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/OrimSamiteHealer.java b/Mage.Sets/src/mage/sets/tempestremastered/OrimSamiteHealer.java
index b739f9985f..bc2e34bf56 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/OrimSamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/OrimSamiteHealer.java
@@ -37,7 +37,7 @@ public class OrimSamiteHealer extends mage.sets.tempest.OrimSamiteHealer {
 
     public OrimSamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Overrun.java b/Mage.Sets/src/mage/sets/tempestremastered/Overrun.java
index 6164eb1ffd..b517aee02b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Overrun.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Pacifism.java b/Mage.Sets/src/mage/sets/tempestremastered/Pacifism.java
index 5900f30e6c..99c1131957 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Pacifism.java
@@ -38,7 +38,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/PaladinEnVec.java b/Mage.Sets/src/mage/sets/tempestremastered/PaladinEnVec.java
index 9dff8b4279..f69f2c22f5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/PaladinEnVec.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/PaladinEnVec.java
@@ -37,7 +37,7 @@ public class PaladinEnVec extends mage.sets.ninthedition.PaladinEnVec {
 
     public PaladinEnVec(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Pandemonium.java b/Mage.Sets/src/mage/sets/tempestremastered/Pandemonium.java
index ecbae1e211..069fd98418 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Pandemonium.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Pandemonium.java
@@ -38,7 +38,7 @@ public class Pandemonium extends mage.sets.timeshifted.Pandemonium {
 
     public Pandemonium(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/PatchworkGnomes.java b/Mage.Sets/src/mage/sets/tempestremastered/PatchworkGnomes.java
index 9d338e4b69..27275b06a9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/PatchworkGnomes.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/PatchworkGnomes.java
@@ -38,7 +38,7 @@ public class PatchworkGnomes extends mage.sets.tempest.PatchworkGnomes {
 
     public PatchworkGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/PegasusStampede.java b/Mage.Sets/src/mage/sets/tempestremastered/PegasusStampede.java
index 65df872800..25cd216dc2 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/PegasusStampede.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/PegasusStampede.java
@@ -37,7 +37,7 @@ public class PegasusStampede extends mage.sets.exodus.PegasusStampede {
 
     public PegasusStampede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/tempestremastered/PhyrexianHulk.java
index b038197913..e9dfabdd17 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/PhyrexianHulk.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/PhyrexianHulk.java
@@ -38,7 +38,7 @@ public class PhyrexianHulk extends mage.sets.newphyrexia.PhyrexianHulk {
 
     public PhyrexianHulk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/PineBarrens.java b/Mage.Sets/src/mage/sets/tempestremastered/PineBarrens.java
index 98acc6fce7..30717ea79a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/PineBarrens.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/PineBarrens.java
@@ -38,7 +38,7 @@ public class PineBarrens extends mage.sets.tempest.PineBarrens {
 
     public PineBarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Provoke.java b/Mage.Sets/src/mage/sets/tempestremastered/Provoke.java
index 910bb9d166..e4311acbc4 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Provoke.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Provoke.java
@@ -37,7 +37,7 @@ public class Provoke extends mage.sets.stronghold.Provoke {
 
     public Provoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RampantGrowth.java b/Mage.Sets/src/mage/sets/tempestremastered/RampantGrowth.java
index cc318bd2a9..e734341d1c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RathiDragon.java b/Mage.Sets/src/mage/sets/tempestremastered/RathiDragon.java
index 4dcbeee310..aea61b589c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RathiDragon.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RathiDragon.java
@@ -37,7 +37,7 @@ public class RathiDragon extends mage.sets.ninthedition.RathiDragon {
 
     public RathiDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RatsOfRath.java b/Mage.Sets/src/mage/sets/tempestremastered/RatsOfRath.java
index f4f86ebddb..9ed5c4a1d1 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RatsOfRath.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RatsOfRath.java
@@ -37,7 +37,7 @@ public class RatsOfRath extends mage.sets.tempest.RatsOfRath {
 
     public RatsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RealityAnchor.java b/Mage.Sets/src/mage/sets/tempestremastered/RealityAnchor.java
index 5d95e0b6e2..7b10937512 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RealityAnchor.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RealityAnchor.java
@@ -37,7 +37,7 @@ public class RealityAnchor extends mage.sets.tempest.RealityAnchor {
 
     public RealityAnchor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Reanimate.java b/Mage.Sets/src/mage/sets/tempestremastered/Reanimate.java
index 292d1115b6..feed3dd239 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Reanimate.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Reanimate.java
@@ -37,7 +37,7 @@ public class Reanimate extends mage.sets.tempest.Reanimate {
 
     public Reanimate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RecurringNightmare.java b/Mage.Sets/src/mage/sets/tempestremastered/RecurringNightmare.java
index d0fe940546..72c75195f8 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RecurringNightmare.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RecurringNightmare.java
@@ -38,7 +38,7 @@ public class RecurringNightmare extends mage.sets.exodus.RecurringNightmare {
 
     public RecurringNightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Recycle.java b/Mage.Sets/src/mage/sets/tempestremastered/Recycle.java
index a9a9ff86a9..490693fa42 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Recycle.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Recycle.java
@@ -37,7 +37,7 @@ public class Recycle extends mage.sets.tempest.Recycle {
 
     public Recycle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RenegadeWarlord.java b/Mage.Sets/src/mage/sets/tempestremastered/RenegadeWarlord.java
index 82fd4a419f..13d31dd047 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RenegadeWarlord.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RenegadeWarlord.java
@@ -37,7 +37,7 @@ public class RenegadeWarlord extends mage.sets.tempest.RenegadeWarlord {
 
     public RenegadeWarlord(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RootbreakerWurm.java b/Mage.Sets/src/mage/sets/tempestremastered/RootbreakerWurm.java
index c55c169dd3..c11d61c1aa 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RootbreakerWurm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RootbreakerWurm.java
@@ -38,7 +38,7 @@ public class RootbreakerWurm extends mage.sets.tempest.RootbreakerWurm {
 
     public RootbreakerWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Rootwalla.java b/Mage.Sets/src/mage/sets/tempestremastered/Rootwalla.java
index e4cad9c555..1eed08ed70 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Rootwalla.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Rootwalla.java
@@ -37,7 +37,7 @@ public class Rootwalla extends mage.sets.tempest.Rootwalla {
 
     public Rootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RootwaterDepths.java b/Mage.Sets/src/mage/sets/tempestremastered/RootwaterDepths.java
index f6258519aa..6b3c3a39c7 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RootwaterDepths.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RootwaterDepths.java
@@ -37,7 +37,7 @@ public class RootwaterDepths extends mage.sets.tempest.RootwaterDepths {
 
     public RootwaterDepths(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/RootwaterHunter.java b/Mage.Sets/src/mage/sets/tempestremastered/RootwaterHunter.java
index a2df32b384..6111280fc4 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/RootwaterHunter.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/RootwaterHunter.java
@@ -38,7 +38,7 @@ public class RootwaterHunter extends mage.sets.tempest.RootwaterHunter {
 
     public RootwaterHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SabertoothWyvern.java b/Mage.Sets/src/mage/sets/tempestremastered/SabertoothWyvern.java
index 169338dd3f..e9e0b2f092 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SabertoothWyvern.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SabertoothWyvern.java
@@ -37,7 +37,7 @@ public class SabertoothWyvern extends mage.sets.exodus.SabertoothWyvern {
 
     public SabertoothWyvern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SaltFlats.java b/Mage.Sets/src/mage/sets/tempestremastered/SaltFlats.java
index 0491810332..db026d0715 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SaltFlats.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SaltFlats.java
@@ -38,7 +38,7 @@ public class SaltFlats extends mage.sets.tempest.SaltFlats {
 
     public SaltFlats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SandstoneWarrior.java b/Mage.Sets/src/mage/sets/tempestremastered/SandstoneWarrior.java
index 9ae4f54bd7..94e8f3c662 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SandstoneWarrior.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SandstoneWarrior.java
@@ -37,7 +37,7 @@ public class SandstoneWarrior extends mage.sets.tempest.SandstoneWarrior {
 
     public SandstoneWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Sarcomancy.java b/Mage.Sets/src/mage/sets/tempestremastered/Sarcomancy.java
index 651fb1d0c8..4f4e14f0a5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Sarcomancy.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Sarcomancy.java
@@ -38,7 +38,7 @@ public class Sarcomancy extends mage.sets.tempest.Sarcomancy {
 
     public Sarcomancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Scabland.java b/Mage.Sets/src/mage/sets/tempestremastered/Scabland.java
index f224e01751..65a38c0f27 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Scabland.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Scabland.java
@@ -38,7 +38,7 @@ public class Scabland extends mage.sets.tempest.Scabland {
 
     public Scabland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ScreechingHarpy.java b/Mage.Sets/src/mage/sets/tempestremastered/ScreechingHarpy.java
index fac1e52cea..b2cfa74d90 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ScreechingHarpy.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ScreechingHarpy.java
@@ -37,7 +37,7 @@ public class ScreechingHarpy extends mage.sets.tempest.ScreechingHarpy {
 
     public ScreechingHarpy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Scrivener.java b/Mage.Sets/src/mage/sets/tempestremastered/Scrivener.java
index 9435574415..ca65cd4409 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Scrivener.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Scrivener.java
@@ -38,7 +38,7 @@ public class Scrivener extends mage.sets.exodus.Scrivener {
 
     public Scrivener(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SeaMonster.java b/Mage.Sets/src/mage/sets/tempestremastered/SeaMonster.java
index 91a65703a3..2940cb5dec 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SeaMonster.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SeaMonster.java
@@ -37,7 +37,7 @@ public class SeaMonster extends mage.sets.tempest.SeaMonster {
 
     public SeaMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SearingTouch.java b/Mage.Sets/src/mage/sets/tempestremastered/SearingTouch.java
index 4b377dfb81..782bb6e0d5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SearingTouch.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SearingTouch.java
@@ -37,7 +37,7 @@ public class SearingTouch extends mage.sets.tempest.SearingTouch {
 
     public SearingTouch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SeleniaDarkAngel.java b/Mage.Sets/src/mage/sets/tempestremastered/SeleniaDarkAngel.java
index eba0cdd802..ed9b10b91e 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SeleniaDarkAngel.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SeleniaDarkAngel.java
@@ -37,7 +37,7 @@ public class SeleniaDarkAngel extends mage.sets.tempest.SeleniaDarkAngel {
 
     public SeleniaDarkAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SerpentWarrior.java b/Mage.Sets/src/mage/sets/tempestremastered/SerpentWarrior.java
index e58058512f..c455e4d726 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SerpentWarrior.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SerpentWarrior.java
@@ -37,7 +37,7 @@ public class SerpentWarrior extends mage.sets.stronghold.SerpentWarrior {
 
     public SerpentWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Shackles.java b/Mage.Sets/src/mage/sets/tempestremastered/Shackles.java
index a6ff38c8f7..5fffa4fed6 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Shackles.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Shackles.java
@@ -37,7 +37,7 @@ public class Shackles extends mage.sets.invasion.Shackles {
 
     public Shackles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ShadowRift.java b/Mage.Sets/src/mage/sets/tempestremastered/ShadowRift.java
index 28b143c5c4..9c1bd6f3c9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ShadowRift.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ShadowRift.java
@@ -37,7 +37,7 @@ public class ShadowRift extends mage.sets.tempest.ShadowRift {
 
     public ShadowRift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Shadowstorm.java b/Mage.Sets/src/mage/sets/tempestremastered/Shadowstorm.java
index 336f886773..3debd0e62d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Shadowstorm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Shadowstorm.java
@@ -37,7 +37,7 @@ public class Shadowstorm extends mage.sets.tempest.Shadowstorm {
 
     public Shadowstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ShamanEnKor.java b/Mage.Sets/src/mage/sets/tempestremastered/ShamanEnKor.java
index 12ff4d5b3f..62589d3b64 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ShamanEnKor.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ShamanEnKor.java
@@ -37,7 +37,7 @@ public class ShamanEnKor extends mage.sets.stronghold.ShamanEnKor {
 
     public ShamanEnKor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Shatter.java b/Mage.Sets/src/mage/sets/tempestremastered/Shatter.java
index 19ec6d752d..3fd4c556d6 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Shatter.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Sift.java b/Mage.Sets/src/mage/sets/tempestremastered/Sift.java
index 840dbec347..f3c6e6f546 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Sift.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Sift.java
@@ -37,7 +37,7 @@ public class Sift extends mage.sets.tenthedition.Sift {
 
     public Sift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudElf.java b/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudElf.java
index 86e8c2eefb..2ddb2c8850 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudElf.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudElf.java
@@ -37,7 +37,7 @@ public class SkyshroudElf extends mage.sets.tempest.SkyshroudElf {
 
     public SkyshroudElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudForest.java b/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudForest.java
index 3abdc42db9..a572bf8c98 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudForest.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudForest.java
@@ -38,7 +38,7 @@ public class SkyshroudForest extends mage.sets.tempest.SkyshroudForest {
 
     public SkyshroudForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudTroll.java b/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudTroll.java
index 8576a3c4de..7fbecdae1d 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudTroll.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SkyshroudTroll.java
@@ -37,7 +37,7 @@ public class SkyshroudTroll extends mage.sets.tempest.SkyshroudTroll {
 
     public SkyshroudTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SliverQueen.java b/Mage.Sets/src/mage/sets/tempestremastered/SliverQueen.java
index b393ae07d7..e375164698 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SliverQueen.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SliverQueen.java
@@ -38,7 +38,7 @@ public class SliverQueen extends mage.sets.stronghold.SliverQueen {
 
     public SliverQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Smite.java b/Mage.Sets/src/mage/sets/tempestremastered/Smite.java
index b15b66421a..4a16348314 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Smite.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Smite.java
@@ -37,7 +37,7 @@ public class Smite extends mage.sets.riseoftheeldrazi.Smite {
 
     public Smite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SoltariChampion.java b/Mage.Sets/src/mage/sets/tempestremastered/SoltariChampion.java
index 1eafd106e1..a2c1b097c8 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SoltariChampion.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SoltariChampion.java
@@ -38,7 +38,7 @@ public class SoltariChampion extends mage.sets.stronghold.SoltariChampion {
 
     public SoltariChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SoltariGuerrillas.java b/Mage.Sets/src/mage/sets/tempestremastered/SoltariGuerrillas.java
index 619b1c704c..7c5d437d4a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SoltariGuerrillas.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SoltariGuerrillas.java
@@ -37,7 +37,7 @@ public class SoltariGuerrillas extends mage.sets.tempest.SoltariGuerrillas {
 
     public SoltariGuerrillas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SoltariMonk.java b/Mage.Sets/src/mage/sets/tempestremastered/SoltariMonk.java
index 654c7b0e3e..db6e17b7a2 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SoltariMonk.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SoltariMonk.java
@@ -37,7 +37,7 @@ public class SoltariMonk extends mage.sets.tempest.SoltariMonk {
 
     public SoltariMonk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SoltariPriest.java b/Mage.Sets/src/mage/sets/tempestremastered/SoltariPriest.java
index a8b5778b7b..6f25fef479 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SoltariPriest.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SoltariPriest.java
@@ -37,7 +37,7 @@ public class SoltariPriest extends mage.sets.tempest.SoltariPriest {
 
     public SoltariPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SoltariTrooper.java b/Mage.Sets/src/mage/sets/tempestremastered/SoltariTrooper.java
index f2d3118e90..8f3f0b197a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SoltariTrooper.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SoltariTrooper.java
@@ -37,7 +37,7 @@ public class SoltariTrooper extends mage.sets.tempest.SoltariTrooper {
 
     public SoltariTrooper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpellBlast.java b/Mage.Sets/src/mage/sets/tempestremastered/SpellBlast.java
index 42bedcfd66..2a38e58826 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpikeColony.java b/Mage.Sets/src/mage/sets/tempestremastered/SpikeColony.java
index fcd882c369..275a2eb9e1 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpikeColony.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpikeColony.java
@@ -37,7 +37,7 @@ public class SpikeColony extends mage.sets.stronghold.SpikeColony {
 
     public SpikeColony(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpikeFeeder.java b/Mage.Sets/src/mage/sets/tempestremastered/SpikeFeeder.java
index 30be0cafe1..d58db8fb45 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpikeFeeder.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpikeFeeder.java
@@ -38,7 +38,7 @@ public class SpikeFeeder extends mage.sets.timeshifted.SpikeFeeder {
 
     public SpikeFeeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpinalGraft.java b/Mage.Sets/src/mage/sets/tempestremastered/SpinalGraft.java
index 0a01251fab..4561b0eef1 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpinalGraft.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpinalGraft.java
@@ -37,7 +37,7 @@ public class SpinalGraft extends mage.sets.vintagemasters.SpinalGraft {
 
     public SpinalGraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpinedSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/SpinedSliver.java
index 81fe62f496..89a5c468a9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpinedSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpinedSliver.java
@@ -37,7 +37,7 @@ public class SpinedSliver extends mage.sets.stronghold.SpinedSliver {
 
     public SpinedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpinedWurm.java b/Mage.Sets/src/mage/sets/tempestremastered/SpinedWurm.java
index 31861f695e..51e95cf12b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpinedWurm.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpinedWurm.java
@@ -37,7 +37,7 @@ public class SpinedWurm extends mage.sets.tenthedition.SpinedWurm {
 
     public SpinedWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SpiritMirror.java b/Mage.Sets/src/mage/sets/tempestremastered/SpiritMirror.java
index 63bda5043f..9b74b415dc 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SpiritMirror.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SpiritMirror.java
@@ -37,7 +37,7 @@ public class SpiritMirror extends mage.sets.tempest.SpiritMirror {
 
     public SpiritMirror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/StalkingStones.java b/Mage.Sets/src/mage/sets/tempestremastered/StalkingStones.java
index 7beef6d8a0..b8cd23d699 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/StalkingStones.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/StalkingStones.java
@@ -37,7 +37,7 @@ public class StalkingStones extends mage.sets.tempest.StalkingStones {
 
     public StalkingStones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/StandingTroops.java b/Mage.Sets/src/mage/sets/tempestremastered/StandingTroops.java
index 8be4953834..adacc3a366 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/StandingTroops.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/StandingTroops.java
@@ -37,7 +37,7 @@ public class StandingTroops extends mage.sets.eighthedition.StandingTroops {
 
     public StandingTroops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/StarkeOfRath.java b/Mage.Sets/src/mage/sets/tempestremastered/StarkeOfRath.java
index f1adabbc4f..5febd987fe 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/StarkeOfRath.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/StarkeOfRath.java
@@ -38,7 +38,7 @@ public class StarkeOfRath extends mage.sets.tempest.StarkeOfRath {
 
     public StarkeOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/StaunchDefenders.java b/Mage.Sets/src/mage/sets/tempestremastered/StaunchDefenders.java
index 3ca6f557e6..6f4439abf2 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/StaunchDefenders.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/StaunchDefenders.java
@@ -38,7 +38,7 @@ public class StaunchDefenders extends mage.sets.tempest.StaunchDefenders {
 
     public StaunchDefenders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/StrongholdAssassin.java b/Mage.Sets/src/mage/sets/tempestremastered/StrongholdAssassin.java
index 0d5b858f5f..8ec0c78899 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/StrongholdAssassin.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/StrongholdAssassin.java
@@ -37,7 +37,7 @@ public class StrongholdAssassin extends mage.sets.stronghold.StrongholdAssassin
 
     public StrongholdAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Stun.java b/Mage.Sets/src/mage/sets/tempestremastered/Stun.java
index ed2001f493..9c90b33629 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Stun.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Stun.java
@@ -37,7 +37,7 @@ public class Stun extends mage.sets.tempest.Stun {
 
     public Stun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/sets/tempestremastered/SurvivalOfTheFittest.java
index f50bfe8a80..834a398f3b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/SurvivalOfTheFittest.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/SurvivalOfTheFittest.java
@@ -38,7 +38,7 @@ public class SurvivalOfTheFittest extends mage.sets.exodus.SurvivalOfTheFittest
 
     public SurvivalOfTheFittest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Telethopter.java b/Mage.Sets/src/mage/sets/tempestremastered/Telethopter.java
index 210465c8fc..861a334f0c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Telethopter.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Telethopter.java
@@ -38,7 +38,7 @@ public class Telethopter extends mage.sets.tempest.Telethopter {
 
     public Telethopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ThalakosLowlands.java b/Mage.Sets/src/mage/sets/tempestremastered/ThalakosLowlands.java
index 74fd6fa7b7..39a0037fdf 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ThalakosLowlands.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ThalakosLowlands.java
@@ -37,7 +37,7 @@ public class ThalakosLowlands extends mage.sets.tempest.ThalakosLowlands {
 
     public ThalakosLowlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ThopterSquadron.java b/Mage.Sets/src/mage/sets/tempestremastered/ThopterSquadron.java
index 5c4fcf9bd5..abbf649178 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ThopterSquadron.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ThopterSquadron.java
@@ -38,7 +38,7 @@ public class ThopterSquadron extends mage.sets.vintagemasters.ThopterSquadron {
 
     public ThopterSquadron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/ThrullSurgeon.java b/Mage.Sets/src/mage/sets/tempestremastered/ThrullSurgeon.java
index 178112e25b..8249ea1e63 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/ThrullSurgeon.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/ThrullSurgeon.java
@@ -38,7 +38,7 @@ public class ThrullSurgeon extends mage.sets.tenthedition.ThrullSurgeon {
 
     public ThrullSurgeon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/TimeEbb.java b/Mage.Sets/src/mage/sets/tempestremastered/TimeEbb.java
index aca26e256e..cc34115f00 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/TimeEbb.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/TimeEbb.java
@@ -37,7 +37,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb {
 
     public TimeEbb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/TimeWarp.java b/Mage.Sets/src/mage/sets/tempestremastered/TimeWarp.java
index 8f4267ab51..c66eccd9d1 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/TimeWarp.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/TimeWarp.java
@@ -37,7 +37,7 @@ public class TimeWarp extends mage.sets.magic2010.TimeWarp {
 
     public TimeWarp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/TradewindRider.java b/Mage.Sets/src/mage/sets/tempestremastered/TradewindRider.java
index 9f415a4ba4..d47d845555 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/TradewindRider.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/TradewindRider.java
@@ -37,7 +37,7 @@ public class TradewindRider extends mage.sets.tempest.TradewindRider {
 
     public TradewindRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/TrainedArmodon.java b/Mage.Sets/src/mage/sets/tempestremastered/TrainedArmodon.java
index eb2df01684..702e67b474 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/TrainedArmodon.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/TrainedArmodon.java
@@ -37,7 +37,7 @@ public class TrainedArmodon extends mage.sets.tempest.TrainedArmodon {
 
     public TrainedArmodon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Tranquility.java b/Mage.Sets/src/mage/sets/tempestremastered/Tranquility.java
index be0636766e..1e246800f9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Tranquility.java
@@ -38,7 +38,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Twitch.java b/Mage.Sets/src/mage/sets/tempestremastered/Twitch.java
index 3481ada592..84303ee5eb 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Twitch.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Twitch.java
@@ -37,7 +37,7 @@ public class Twitch extends mage.sets.worldwake.Twitch {
 
     public Twitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VampireHounds.java b/Mage.Sets/src/mage/sets/tempestremastered/VampireHounds.java
index 3fa4bf94fb..45aa8cafb7 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VampireHounds.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VampireHounds.java
@@ -37,7 +37,7 @@ public class VampireHounds extends mage.sets.exodus.VampireHounds {
 
     public VampireHounds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VecTownships.java b/Mage.Sets/src/mage/sets/tempestremastered/VecTownships.java
index fe5d000582..34f7adfcc3 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VecTownships.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VecTownships.java
@@ -37,7 +37,7 @@ public class VecTownships extends mage.sets.tempest.VecTownships {
 
     public VecTownships(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VerdantForce.java b/Mage.Sets/src/mage/sets/tempestremastered/VerdantForce.java
index 3c03986a89..6fc7e64df9 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VerdantForce.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VerdantForce.java
@@ -37,7 +37,7 @@ public class VerdantForce extends mage.sets.tempest.VerdantForce {
 
     public VerdantForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Verdigris.java b/Mage.Sets/src/mage/sets/tempestremastered/Verdigris.java
index 3be4194c51..6205d0cd10 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Verdigris.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Verdigris.java
@@ -38,7 +38,7 @@ public class Verdigris extends mage.sets.tempest.Verdigris {
 
     public Verdigris(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VhatiIlDal.java b/Mage.Sets/src/mage/sets/tempestremastered/VhatiIlDal.java
index dccabdc9d7..2589c3b075 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VhatiIlDal.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VhatiIlDal.java
@@ -37,7 +37,7 @@ public class VhatiIlDal extends mage.sets.tempest.VhatiIlDal {
 
     public VhatiIlDal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VictualSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/VictualSliver.java
index e2cceb1bc3..c8364db17f 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VictualSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VictualSliver.java
@@ -37,7 +37,7 @@ public class VictualSliver extends mage.sets.stronghold.VictualSliver {
 
     public VictualSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VolrathsCurse.java b/Mage.Sets/src/mage/sets/tempestremastered/VolrathsCurse.java
index e7df53b37a..9d36cae946 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VolrathsCurse.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VolrathsCurse.java
@@ -38,7 +38,7 @@ public class VolrathsCurse extends mage.sets.tempest.VolrathsCurse {
 
     public VolrathsCurse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/VolrathsStronghold.java b/Mage.Sets/src/mage/sets/tempestremastered/VolrathsStronghold.java
index 02f2ba8336..5591d6f921 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/VolrathsStronghold.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/VolrathsStronghold.java
@@ -38,7 +38,7 @@ public class VolrathsStronghold extends mage.sets.stronghold.VolrathsStronghold
 
     public VolrathsStronghold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/tempestremastered/WallOfBlossoms.java
index 68ba56f2ec..e92815642a 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WallOfBlossoms.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WallOfBlossoms.java
@@ -37,7 +37,7 @@ public class WallOfBlossoms extends mage.sets.stronghold.WallOfBlossoms {
 
     public WallOfBlossoms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WallOfDiffusion.java b/Mage.Sets/src/mage/sets/tempestremastered/WallOfDiffusion.java
index da90a2ac8e..47883c0a32 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WallOfDiffusion.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WallOfDiffusion.java
@@ -37,7 +37,7 @@ public class WallOfDiffusion extends mage.sets.tempest.WallOfDiffusion {
 
     public WallOfDiffusion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WallOfEssence.java b/Mage.Sets/src/mage/sets/tempestremastered/WallOfEssence.java
index 89e85d9845..fbad923477 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WallOfEssence.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WallOfEssence.java
@@ -37,7 +37,7 @@ public class WallOfEssence extends mage.sets.stronghold.WallOfEssence {
 
     public WallOfEssence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/Wasteland.java b/Mage.Sets/src/mage/sets/tempestremastered/Wasteland.java
index c64ba71458..79f805503f 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/Wasteland.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/Wasteland.java
@@ -38,7 +38,7 @@ public class Wasteland extends mage.sets.tempest.Wasteland {
 
     public Wasteland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WhispersOfTheMuse.java b/Mage.Sets/src/mage/sets/tempestremastered/WhispersOfTheMuse.java
index d315cc5fde..7618659cca 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WhispersOfTheMuse.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WhispersOfTheMuse.java
@@ -38,7 +38,7 @@ public class WhispersOfTheMuse extends mage.sets.tempest.WhispersOfTheMuse {
 
     public WhispersOfTheMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "TPR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WindDancer.java b/Mage.Sets/src/mage/sets/tempestremastered/WindDancer.java
index 4ec67a43d8..afa11f7899 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WindDancer.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WindDancer.java
@@ -37,7 +37,7 @@ public class WindDancer extends mage.sets.tempest.WindDancer {
 
     public WindDancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WindDrake.java b/Mage.Sets/src/mage/sets/tempestremastered/WindDrake.java
index 2b59ad6dd7..edb769b176 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WindDrake.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WindDrake.java
@@ -37,7 +37,7 @@ public class WindDrake extends mage.sets.magic2010.WindDrake {
 
     public WindDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WindsOfRath.java b/Mage.Sets/src/mage/sets/tempestremastered/WindsOfRath.java
index 62dee5a6ac..54d6cda08c 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WindsOfRath.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WindsOfRath.java
@@ -37,7 +37,7 @@ public class WindsOfRath extends mage.sets.heroesvsmonsters.WindsOfRath {
 
     public WindsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WingedSliver.java b/Mage.Sets/src/mage/sets/tempestremastered/WingedSliver.java
index 5d39e4ce55..067114215b 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WingedSliver.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WingedSliver.java
@@ -37,7 +37,7 @@ public class WingedSliver extends mage.sets.tempest.WingedSliver {
 
     public WingedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/WoodSage.java b/Mage.Sets/src/mage/sets/tempestremastered/WoodSage.java
index d8d8f82491..9009cd0ad6 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/WoodSage.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/WoodSage.java
@@ -37,7 +37,7 @@ public class WoodSage extends mage.sets.tempest.WoodSage {
 
     public WoodSage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempestremastered/YouthfulKnight.java b/Mage.Sets/src/mage/sets/tempestremastered/YouthfulKnight.java
index 1fd5c1653b..679b4cafe5 100644
--- a/Mage.Sets/src/mage/sets/tempestremastered/YouthfulKnight.java
+++ b/Mage.Sets/src/mage/sets/tempestremastered/YouthfulKnight.java
@@ -37,7 +37,7 @@ public class YouthfulKnight extends mage.sets.tenthedition.YouthfulKnight {
 
     public YouthfulKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "TPR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AgonizingMemories.java b/Mage.Sets/src/mage/sets/tenthedition/AgonizingMemories.java
index a6ef68f1b5..db2be463b4 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AgonizingMemories.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AgonizingMemories.java
@@ -37,7 +37,7 @@ public class AgonizingMemories extends mage.sets.seventhedition.AgonizingMemorie
 
     public AgonizingMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AirElemental.java b/Mage.Sets/src/mage/sets/tenthedition/AirElemental.java
index 1bdab60086..0afedd580c 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AngelicChorus.java b/Mage.Sets/src/mage/sets/tenthedition/AngelicChorus.java
index 9ceaef6b5d..1b51192c0f 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AngelicChorus.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AngelicChorus.java
@@ -37,7 +37,7 @@ public class AngelicChorus extends mage.sets.urzassaga.AngelicChorus {
 
     public AngelicChorus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AscendantEvincar.java b/Mage.Sets/src/mage/sets/tenthedition/AscendantEvincar.java
index 8326347954..078a6ca15a 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AscendantEvincar.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AscendantEvincar.java
@@ -37,7 +37,7 @@ public class AscendantEvincar extends mage.sets.planechase.AscendantEvincar {
 
     public AscendantEvincar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AuraOfSilence.java b/Mage.Sets/src/mage/sets/tenthedition/AuraOfSilence.java
index 56e2de7abb..2e33821962 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AuraOfSilence.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AuraOfSilence.java
@@ -37,7 +37,7 @@ public class AuraOfSilence extends mage.sets.weatherlight.AuraOfSilence {
 
     public AuraOfSilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AvatarOfMight.java b/Mage.Sets/src/mage/sets/tenthedition/AvatarOfMight.java
index ed7d64257d..608b8ae9f2 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AvatarOfMight.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AvatarOfMight.java
@@ -37,7 +37,7 @@ public class AvatarOfMight extends mage.sets.prophecy.AvatarOfMight {
 
     public AvatarOfMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/AvenWindreader.java b/Mage.Sets/src/mage/sets/tenthedition/AvenWindreader.java
index 6df37477d2..7942bbb893 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/AvenWindreader.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/AvenWindreader.java
@@ -37,7 +37,7 @@ public class AvenWindreader extends mage.sets.ninthedition.AvenWindreader {
 
     public AvenWindreader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BallistaSquad.java b/Mage.Sets/src/mage/sets/tenthedition/BallistaSquad.java
index f62bd1be6f..cbafcd3a2b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BallistaSquad.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BallistaSquad.java
@@ -37,7 +37,7 @@ public class BallistaSquad extends mage.sets.mercadianmasques.BallistaSquad {
 
     public BallistaSquad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BattlefieldForge.java b/Mage.Sets/src/mage/sets/tenthedition/BattlefieldForge.java
index 73eb068efe..7ed084d4f1 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BattlefieldForge.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BattlefieldForge.java
@@ -37,7 +37,7 @@ public class BattlefieldForge extends mage.sets.apocalypse.BattlefieldForge {
 
     public BattlefieldForge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 348;
+        this.cardNumber = "348";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BeaconOfUnrest.java b/Mage.Sets/src/mage/sets/tenthedition/BeaconOfUnrest.java
index b8bb9e33b8..aeca5107fc 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BeaconOfUnrest.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BeaconOfUnrest.java
@@ -37,7 +37,7 @@ public class BeaconOfUnrest extends mage.sets.planechase.BeaconOfUnrest {
 
     public BeaconOfUnrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Blaze.java b/Mage.Sets/src/mage/sets/tenthedition/Blaze.java
index 2e1ddeefb2..7fc54c9465 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Blaze.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Blaze.java
@@ -37,7 +37,7 @@ public class Blaze extends mage.sets.planechase.Blaze {
 
     public Blaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BloodfireColossus.java b/Mage.Sets/src/mage/sets/tenthedition/BloodfireColossus.java
index 6f66aa8cca..a979a12ea9 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BloodfireColossus.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BloodfireColossus.java
@@ -38,7 +38,7 @@ public class BloodfireColossus extends mage.sets.apocalypse.BloodfireColossus {
 
     public BloodfireColossus (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BogWraith.java b/Mage.Sets/src/mage/sets/tenthedition/BogWraith.java
index 1c83ad9099..82e83b1d74 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BogardanFirefiend.java b/Mage.Sets/src/mage/sets/tenthedition/BogardanFirefiend.java
index baf4b35bf7..b3d9ed689e 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BogardanFirefiend.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BogardanFirefiend.java
@@ -37,7 +37,7 @@ public class BogardanFirefiend extends mage.sets.planechase.BogardanFirefiend {
 
     public BogardanFirefiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/BottleGnomes.java b/Mage.Sets/src/mage/sets/tenthedition/BottleGnomes.java
index 83fb967b7d..fba8fe19ce 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/BottleGnomes.java
@@ -37,7 +37,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
 
     public BottleGnomes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CanopySpider.java b/Mage.Sets/src/mage/sets/tenthedition/CanopySpider.java
index df67a64d82..8b1618f4b6 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CanopySpider.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CanopySpider.java
@@ -37,7 +37,7 @@ public class CanopySpider extends mage.sets.tempest.CanopySpider {
 
     public CanopySpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CavesOfKoilos.java b/Mage.Sets/src/mage/sets/tenthedition/CavesOfKoilos.java
index aaf9d84754..8f9cecd4e0 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CavesOfKoilos.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CavesOfKoilos.java
@@ -37,7 +37,7 @@ public class CavesOfKoilos extends mage.sets.apocalypse.CavesOfKoilos {
 
     public CavesOfKoilos(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 350;
+        this.cardNumber = "350";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CephalidConstable.java b/Mage.Sets/src/mage/sets/tenthedition/CephalidConstable.java
index fbc5884eec..7c4a24d2fe 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CephalidConstable.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CephalidConstable.java
@@ -37,7 +37,7 @@ public class CephalidConstable extends mage.sets.judgment.CephalidConstable {
 
     public CephalidConstable(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ChimericStaff.java b/Mage.Sets/src/mage/sets/tenthedition/ChimericStaff.java
index 63d75e0004..090e738c5c 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ChimericStaff.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ChimericStaff.java
@@ -37,7 +37,7 @@ public class ChimericStaff extends mage.sets.urzassaga.ChimericStaff {
 
     public ChimericStaff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CitanulFlute.java b/Mage.Sets/src/mage/sets/tenthedition/CitanulFlute.java
index 3270742bcc..4867c10d83 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CitanulFlute.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CitanulFlute.java
@@ -37,7 +37,7 @@ public class CitanulFlute extends mage.sets.urzassaga.CitanulFlute {
 
     public CitanulFlute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CoatOfArms.java b/Mage.Sets/src/mage/sets/tenthedition/CoatOfArms.java
index bcedb98a86..65870ee2d5 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CoatOfArms.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CoatOfArms.java
@@ -37,7 +37,7 @@ public class CoatOfArms extends mage.sets.magic2010.CoatOfArms {
 
     public CoatOfArms(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ColossusOfSardia.java b/Mage.Sets/src/mage/sets/tenthedition/ColossusOfSardia.java
index 3a4ea3a63b..84c77e7402 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ColossusOfSardia.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ColossusOfSardia.java
@@ -37,7 +37,7 @@ public class ColossusOfSardia extends mage.sets.fifthedition.ColossusOfSardia {
 
     public ColossusOfSardia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CommuneWithNature.java b/Mage.Sets/src/mage/sets/tenthedition/CommuneWithNature.java
index b14a3282b8..0c84c10287 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CommuneWithNature.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CommuneWithNature.java
@@ -37,7 +37,7 @@ public class CommuneWithNature extends mage.sets.championsofkamigawa.CommuneWith
 
     public CommuneWithNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ConeOfFlame.java b/Mage.Sets/src/mage/sets/tenthedition/ConeOfFlame.java
index 4b37f01303..00b1cd2d16 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/tenthedition/ConsumeSpirit.java
index d5ca8d46d0..102c5c087a 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ConsumeSpirit.java
@@ -37,7 +37,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
 
     public ConsumeSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ContaminatedBond.java b/Mage.Sets/src/mage/sets/tenthedition/ContaminatedBond.java
index e80feba52c..9b13d2e75c 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ContaminatedBond.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ContaminatedBond.java
@@ -37,7 +37,7 @@ public class ContaminatedBond extends mage.sets.ninthedition.ContaminatedBond {
 
     public ContaminatedBond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/CounselOfTheSoratami.java b/Mage.Sets/src/mage/sets/tenthedition/CounselOfTheSoratami.java
index 9cdef66677..a6ef399ff8 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/CounselOfTheSoratami.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/CounselOfTheSoratami.java
@@ -39,7 +39,7 @@ public class CounselOfTheSoratami extends mage.sets.championsofkamigawa.CounselO
     public CounselOfTheSoratami (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "10E";
-        this.cardNumber = 76;
+        this.cardNumber = "76";
 
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/DreambornMuse.java b/Mage.Sets/src/mage/sets/tenthedition/DreambornMuse.java
index 391e92d124..ea16a9ba1f 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/DreambornMuse.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/DreambornMuse.java
@@ -37,7 +37,7 @@ public class DreambornMuse extends mage.sets.legions.DreambornMuse {
 
     public DreambornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/tenthedition/DrudgeSkeletons.java
index bffa08bf35..277d276ee0 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/DrudgeSkeletons.java
@@ -38,7 +38,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/DuctCrawler.java b/Mage.Sets/src/mage/sets/tenthedition/DuctCrawler.java
index 7fc0e05954..58e037e245 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/DuctCrawler.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/DuctCrawler.java
@@ -37,7 +37,7 @@ public class DuctCrawler extends mage.sets.stronghold.DuctCrawler {
 
     public DuctCrawler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ElvenRiders.java b/Mage.Sets/src/mage/sets/tenthedition/ElvenRiders.java
index af36f32ecc..364a487ef4 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ElvenRiders.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ElvenRiders.java
@@ -37,7 +37,7 @@ public class ElvenRiders extends mage.sets.onslaught.ElvenRiders {
 
     public ElvenRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ElvishBerserker.java b/Mage.Sets/src/mage/sets/tenthedition/ElvishBerserker.java
index 83ff3259f9..6a70096c90 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ElvishBerserker.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ElvishBerserker.java
@@ -37,7 +37,7 @@ public class ElvishBerserker extends mage.sets.ninthedition.ElvishBerserker {
 
     public ElvishBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ElvishPiper.java b/Mage.Sets/src/mage/sets/tenthedition/ElvishPiper.java
index 19cacfba0b..dabf349691 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ElvishPiper.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ElvishPiper.java
@@ -37,7 +37,7 @@ public class ElvishPiper extends mage.sets.magic2010.ElvishPiper {
 
     public ElvishPiper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/EnormousBaloth.java b/Mage.Sets/src/mage/sets/tenthedition/EnormousBaloth.java
index fc46597499..2d8d5f282b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/EnormousBaloth.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/EnormousBaloth.java
@@ -37,7 +37,7 @@ public class EnormousBaloth extends mage.sets.magic2010.EnormousBaloth {
 
     public EnormousBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/EssenceDrain.java b/Mage.Sets/src/mage/sets/tenthedition/EssenceDrain.java
index f366d98086..affa20f966 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/EssenceDrain.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/EssenceDrain.java
@@ -37,7 +37,7 @@ public class EssenceDrain extends mage.sets.darksteel.EssenceDrain {
 
     public EssenceDrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Evacuation.java b/Mage.Sets/src/mage/sets/tenthedition/Evacuation.java
index 2317509f03..8955a77ef5 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Evacuation.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Evacuation.java
@@ -37,7 +37,7 @@ public class Evacuation extends mage.sets.stronghold.Evacuation {
 
     public Evacuation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/FesteringGoblin.java b/Mage.Sets/src/mage/sets/tenthedition/FesteringGoblin.java
index da70205024..2f8a3ee84e 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/FesteringGoblin.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/FesteringGoblin.java
@@ -37,7 +37,7 @@ public class FesteringGoblin extends mage.sets.planechase.FesteringGoblin {
 
     public FesteringGoblin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Firebreathing.java b/Mage.Sets/src/mage/sets/tenthedition/Firebreathing.java
index de971f2ba1..446122d1b6 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Firebreathing.java
@@ -38,7 +38,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/FurnaceOfRath.java b/Mage.Sets/src/mage/sets/tenthedition/FurnaceOfRath.java
index 17cffbba0f..c1b0fee03f 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/FurnaceOfRath.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/FurnaceOfRath.java
@@ -37,7 +37,7 @@ public class FurnaceOfRath extends mage.sets.tempest.FurnaceOfRath {
 
     public FurnaceOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/GravePact.java b/Mage.Sets/src/mage/sets/tenthedition/GravePact.java
index 638c49e182..995742e252 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/GravePact.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/GravePact.java
@@ -37,7 +37,7 @@ public class GravePact extends mage.sets.ninthedition.GravePact {
 
     public GravePact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/GuerrillaTactics.java b/Mage.Sets/src/mage/sets/tenthedition/GuerrillaTactics.java
index 3c5b78507d..ffd4a37835 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/GuerrillaTactics.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/GuerrillaTactics.java
@@ -37,7 +37,7 @@ public class GuerrillaTactics extends mage.sets.ninthedition.GuerrillaTactics {
 
     public GuerrillaTactics(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HailOfArrows.java b/Mage.Sets/src/mage/sets/tenthedition/HailOfArrows.java
index 2a51776571..2c11695e0b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HailOfArrows.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HailOfArrows.java
@@ -37,7 +37,7 @@ public class HailOfArrows extends mage.sets.saviorsofkamigawa.HailOfArrows {
 
     public HailOfArrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HeartOfLight.java b/Mage.Sets/src/mage/sets/tenthedition/HeartOfLight.java
index 060d1bd8cc..b41e966398 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HeartOfLight.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HeartOfLight.java
@@ -37,7 +37,7 @@ public class HeartOfLight extends mage.sets.betrayersofkamigawa.HeartOfLight {
 
     public HeartOfLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HighGround.java b/Mage.Sets/src/mage/sets/tenthedition/HighGround.java
index 3ed0f25cee..f2b6f86b02 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HighGround.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HighGround.java
@@ -37,7 +37,7 @@ public class HighGround extends mage.sets.exodus.HighGround {
 
     public HighGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HolyDay.java b/Mage.Sets/src/mage/sets/tenthedition/HolyDay.java
index 76bad1998f..75d3d169bf 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HolyDay.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HolyDay.java
@@ -37,7 +37,7 @@ public class HolyDay extends mage.sets.invasion.HolyDay {
 
     public HolyDay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/tenthedition/HowlingMine.java
index 955ba504cf..a5d5cb76bd 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HuntedWumpus.java b/Mage.Sets/src/mage/sets/tenthedition/HuntedWumpus.java
index 6170a90020..dd4fae3bc0 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HuntedWumpus.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HuntedWumpus.java
@@ -37,7 +37,7 @@ public class HuntedWumpus extends mage.sets.ninthedition.HuntedWumpus {
 
     public HuntedWumpus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HurkylsRecall.java b/Mage.Sets/src/mage/sets/tenthedition/HurkylsRecall.java
index aa6ba2c9b8..b23353db3b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HurkylsRecall.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HurkylsRecall.java
@@ -37,7 +37,7 @@ public class HurkylsRecall extends mage.sets.fifthedition.HurkylsRecall {
 
     public HurkylsRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Hurricane.java b/Mage.Sets/src/mage/sets/tenthedition/Hurricane.java
index a349db1a7c..278a0739ef 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Hurricane.java
@@ -38,7 +38,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/tenthedition/HypnoticSpecter.java
index 9c3caffdfc..2d23792e65 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/HypnoticSpecter.java
@@ -37,7 +37,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/KarplusanStrider.java b/Mage.Sets/src/mage/sets/tenthedition/KarplusanStrider.java
index f4ae335376..d42f27dcfa 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/KarplusanStrider.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/KarplusanStrider.java
@@ -37,7 +37,7 @@ public class KarplusanStrider extends mage.sets.modernmasters2015.KarplusanStrid
 
     public KarplusanStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/sets/tenthedition/KjeldoranRoyalGuard.java
index 659adcee35..f18d79d60b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/KjeldoranRoyalGuard.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/KjeldoranRoyalGuard.java
@@ -37,7 +37,7 @@ public class KjeldoranRoyalGuard extends mage.sets.iceage.KjeldoranRoyalGuard {
 
     public KjeldoranRoyalGuard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/KnightOfDusk.java b/Mage.Sets/src/mage/sets/tenthedition/KnightOfDusk.java
index 795676d125..6dce67d11d 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/KnightOfDusk.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/KnightOfDusk.java
@@ -37,7 +37,7 @@ public class KnightOfDusk extends mage.sets.tempest.KnightOfDusk {
 
     public KnightOfDusk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java b/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java
index 65bde3e149..e42db924a7 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java
@@ -37,7 +37,7 @@ public class LavabornMuse extends mage.sets.sorinvstibalt.LavabornMuse {
 
     public LavabornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LegacyWeapon.java b/Mage.Sets/src/mage/sets/tenthedition/LegacyWeapon.java
index 138e031d31..e89f1f7409 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LegacyWeapon.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LegacyWeapon.java
@@ -37,7 +37,7 @@ public class LegacyWeapon extends mage.sets.apocalypse.LegacyWeapon {
 
     public LegacyWeapon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 330;
+        this.cardNumber = "330";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LlanowarSentinel.java b/Mage.Sets/src/mage/sets/tenthedition/LlanowarSentinel.java
index f578e36ffc..9e65cf2834 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LlanowarSentinel.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LlanowarSentinel.java
@@ -38,7 +38,7 @@ public class LlanowarSentinel extends mage.sets.weatherlight.LlanowarSentinel {
 
     public LlanowarSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LlanowarWastes.java b/Mage.Sets/src/mage/sets/tenthedition/LlanowarWastes.java
index 03c645d21f..191fdf4637 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LlanowarWastes.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LlanowarWastes.java
@@ -37,7 +37,7 @@ public class LlanowarWastes extends mage.sets.apocalypse.LlanowarWastes {
 
     public LlanowarWastes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 355;
+        this.cardNumber = "355";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LoomingShade.java b/Mage.Sets/src/mage/sets/tenthedition/LoomingShade.java
index 96e8cf010f..3a1b04ad9b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LoomingShade.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LoomingShade.java
@@ -37,7 +37,7 @@ public class LoomingShade extends mage.sets.magic2010.LoomingShade {
 
     public LoomingShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LordOfThePit.java b/Mage.Sets/src/mage/sets/tenthedition/LordOfThePit.java
index 236620677d..a288b27d3b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LoxodonMystic.java b/Mage.Sets/src/mage/sets/tenthedition/LoxodonMystic.java
index 7b66f9c843..e7c623e853 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LoxodonMystic.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LoxodonMystic.java
@@ -37,7 +37,7 @@ public class LoxodonMystic extends mage.sets.darksteel.LoxodonMystic {
 
     public LoxodonMystic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/tenthedition/LoxodonWarhammer.java
index 2e9fb7ea05..e8508e7c50 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/LoxodonWarhammer.java
@@ -37,7 +37,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
 
     public LoxodonWarhammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 332;
+        this.cardNumber = "332";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Lure.java b/Mage.Sets/src/mage/sets/tenthedition/Lure.java
index b96662c0f5..917a27d808 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Lure.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Lure.java
@@ -38,7 +38,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "10E";
 
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/MerfolkLooter.java b/Mage.Sets/src/mage/sets/tenthedition/MerfolkLooter.java
index f1892e1c3a..7e8677ad2e 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/MerfolkLooter.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/MerfolkLooter.java
@@ -37,7 +37,7 @@ public class MerfolkLooter extends mage.sets.magic2012.MerfolkLooter {
 
     public MerfolkLooter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/MidnightRitual.java b/Mage.Sets/src/mage/sets/tenthedition/MidnightRitual.java
index 5853ace91b..9ad9f4bb28 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/MidnightRitual.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/MidnightRitual.java
@@ -37,7 +37,7 @@ public class MidnightRitual extends mage.sets.mercadianmasques.MidnightRitual {
 
     public MidnightRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/MightOfOaks.java b/Mage.Sets/src/mage/sets/tenthedition/MightOfOaks.java
index 6608505953..583b71d61e 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/MightOfOaks.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/MightOfOaks.java
@@ -37,7 +37,7 @@ public class MightOfOaks extends mage.sets.magic2010.MightOfOaks {
 
     public MightOfOaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Millstone.java b/Mage.Sets/src/mage/sets/tenthedition/Millstone.java
index e9f06b2db2..cdffe07178 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Millstone.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Millstone.java
@@ -37,7 +37,7 @@ public class Millstone extends mage.sets.fifthedition.Millstone {
 
     public Millstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 334;
+        this.cardNumber = "334";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/MoggFanatic.java b/Mage.Sets/src/mage/sets/tenthedition/MoggFanatic.java
index 735b9c44aa..9ef2598160 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/NaturalSpring.java b/Mage.Sets/src/mage/sets/tenthedition/NaturalSpring.java
index d15081d028..48d7ce3cb0 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/NaturalSpring.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/NaturalSpring.java
@@ -37,7 +37,7 @@ public class NaturalSpring extends mage.sets.tempest.NaturalSpring {
 
     public NaturalSpring(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Nekrataal.java b/Mage.Sets/src/mage/sets/tenthedition/Nekrataal.java
index f26a220247..582ef14869 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Nekrataal.java
@@ -38,7 +38,7 @@ public class Nekrataal extends mage.sets.ninthedition.Nekrataal {
 
     public Nekrataal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/NoRestForTheWicked.java b/Mage.Sets/src/mage/sets/tenthedition/NoRestForTheWicked.java
index 0b266f3776..8b70f263d8 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/NoRestForTheWicked.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/NoRestForTheWicked.java
@@ -37,7 +37,7 @@ public class NoRestForTheWicked extends mage.sets.urzassaga.NoRestForTheWicked {
 
     public NoRestForTheWicked(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/NomadMythmaker.java b/Mage.Sets/src/mage/sets/tenthedition/NomadMythmaker.java
index 9f9876bba2..58e4791784 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/NomadMythmaker.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/NomadMythmaker.java
@@ -37,7 +37,7 @@ public class NomadMythmaker extends mage.sets.judgment.NomadMythmaker {
 
     public NomadMythmaker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/tenthedition/OrcishArtillery.java
index 55f95ec010..08ec20d39e 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Overgrowth.java b/Mage.Sets/src/mage/sets/tenthedition/Overgrowth.java
index 1868b1de1c..681b99b356 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Overgrowth.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Overgrowth.java
@@ -37,7 +37,7 @@ public class Overgrowth extends mage.sets.stronghold.Overgrowth {
 
     public Overgrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Overrun.java b/Mage.Sets/src/mage/sets/tenthedition/Overrun.java
index 55299382da..faa908d7d8 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Overrun.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Overrun.java
@@ -37,7 +37,7 @@ public class Overrun extends mage.sets.magic2010.Overrun {
 
     public Overrun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/PaladinEnVec.java b/Mage.Sets/src/mage/sets/tenthedition/PaladinEnVec.java
index ec69fe2ba5..48dcc2a648 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/PaladinEnVec.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/PaladinEnVec.java
@@ -37,7 +37,7 @@ public class PaladinEnVec extends mage.sets.ninthedition.PaladinEnVec {
 
     public PaladinEnVec(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Pariah.java b/Mage.Sets/src/mage/sets/tenthedition/Pariah.java
index 3fd016320f..d815f43c1e 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Pariah.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Pariah.java
@@ -37,7 +37,7 @@ public class Pariah extends mage.sets.urzassaga.Pariah {
 
     public Pariah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/PhantomWarrior.java b/Mage.Sets/src/mage/sets/tenthedition/PhantomWarrior.java
index f1cab10923..14a731a401 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/PincherBeetles.java b/Mage.Sets/src/mage/sets/tenthedition/PincherBeetles.java
index 56db0129ae..4ce5c45e95 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/PincherBeetles.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/PincherBeetles.java
@@ -37,7 +37,7 @@ public class PincherBeetles extends mage.sets.tempest.PincherBeetles {
 
     public PincherBeetles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 285;
+        this.cardNumber = "285";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/PithingNeedle.java b/Mage.Sets/src/mage/sets/tenthedition/PithingNeedle.java
index f01c7ff015..41f30862d2 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/PithingNeedle.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/PithingNeedle.java
@@ -37,7 +37,7 @@ public class PithingNeedle extends mage.sets.saviorsofkamigawa.PithingNeedle {
 
     public PithingNeedle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 338;
+        this.cardNumber = "338";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Plagiarize.java b/Mage.Sets/src/mage/sets/tenthedition/Plagiarize.java
index 071fdc37f5..fcef8718d3 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Plagiarize.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Plagiarize.java
@@ -37,7 +37,7 @@ public class Plagiarize extends mage.sets.ninthedition.Plagiarize {
 
     public Plagiarize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/PlagueWind.java b/Mage.Sets/src/mage/sets/tenthedition/PlagueWind.java
index 65fab0463c..e42fa1e9d9 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/PlagueWind.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/PlagueWind.java
@@ -37,7 +37,7 @@ public class PlagueWind extends mage.sets.prophecy.PlagueWind {
 
     public PlagueWind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 169;
+        this.cardNumber = "169";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/RainOfTears.java b/Mage.Sets/src/mage/sets/tenthedition/RainOfTears.java
index f7e9cd4530..507a9600d1 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/RainOfTears.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/RainOfTears.java
@@ -37,7 +37,7 @@ public class RainOfTears extends mage.sets.tempest.RainOfTears {
 
     public RainOfTears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/RampantGrowth.java b/Mage.Sets/src/mage/sets/tenthedition/RampantGrowth.java
index 5216e1cba3..4a91b90496 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/RampantGrowth.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/RampantGrowth.java
@@ -37,7 +37,7 @@ public class RampantGrowth extends mage.sets.magic2010.RampantGrowth {
 
     public RampantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 288;
+        this.cardNumber = "288";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Recover.java b/Mage.Sets/src/mage/sets/tenthedition/Recover.java
index 5685b2035b..c08017a294 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Recover.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Recover.java
@@ -37,7 +37,7 @@ public class Recover extends mage.sets.invasion.Recover {
 
     public Recover(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Regeneration.java b/Mage.Sets/src/mage/sets/tenthedition/Regeneration.java
index 5a48ee346d..faeb965957 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Regeneration.java
@@ -38,7 +38,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/tenthedition/RelentlessAssault.java
index ca6661c224..4b59dbfb42 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Reminisce.java b/Mage.Sets/src/mage/sets/tenthedition/Reminisce.java
index 2f5c744080..9636206db0 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Reminisce.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Reminisce.java
@@ -37,7 +37,7 @@ public class Reminisce extends mage.sets.onslaught.Reminisce {
 
     public Reminisce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/RootMaze.java b/Mage.Sets/src/mage/sets/tenthedition/RootMaze.java
index 031ceabb8b..088ec70d12 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/RootMaze.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/RootMaze.java
@@ -37,7 +37,7 @@ public class RootMaze extends mage.sets.tempest.RootMaze {
 
     public RootMaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Rootwalla.java b/Mage.Sets/src/mage/sets/tenthedition/Rootwalla.java
index d2ca889f1c..5dad374ddf 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Rootwalla.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Rootwalla.java
@@ -37,7 +37,7 @@ public class Rootwalla extends mage.sets.tempest.Rootwalla {
 
     public Rootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/RootwaterMatriarch.java b/Mage.Sets/src/mage/sets/tenthedition/RootwaterMatriarch.java
index b32ce2400f..bf7af9aa45 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/RootwaterMatriarch.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/RootwaterMatriarch.java
@@ -37,7 +37,7 @@ public class RootwaterMatriarch extends mage.sets.tempest.RootwaterMatriarch {
 
     public RootwaterMatriarch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SageOwl.java b/Mage.Sets/src/mage/sets/tenthedition/SageOwl.java
index 7d7be9a941..e2ee86c908 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SageOwl.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SageOwl.java
@@ -37,7 +37,7 @@ public class SageOwl extends mage.sets.magic2010.SageOwl {
 
     public SageOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SeaMonster.java b/Mage.Sets/src/mage/sets/tenthedition/SeaMonster.java
index 375d633857..6dc7864372 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SeaMonster.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SeaMonster.java
@@ -37,7 +37,7 @@ public class SeaMonster extends mage.sets.tempest.SeaMonster {
 
     public SeaMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SeedbornMuse.java b/Mage.Sets/src/mage/sets/tenthedition/SeedbornMuse.java
index 2270e01002..a18c49a782 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SeedbornMuse.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SeedbornMuse.java
@@ -37,7 +37,7 @@ public class SeedbornMuse extends mage.sets.ninthedition.SeedbornMuse {
 
     public SeedbornMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SeismicAssault.java b/Mage.Sets/src/mage/sets/tenthedition/SeismicAssault.java
index 99705ee82c..0575db80f3 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SeismicAssault.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SeismicAssault.java
@@ -37,7 +37,7 @@ public class SeismicAssault extends mage.sets.seventhedition.SeismicAssault {
 
     public SeismicAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/tenthedition/Shatterstorm.java
index 19088e7365..f187a70bec 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Shatterstorm.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Shatterstorm.java
@@ -37,7 +37,7 @@ public class Shatterstorm extends mage.sets.fifthedition.Shatterstorm {
 
     public Shatterstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ShimmeringWings.java b/Mage.Sets/src/mage/sets/tenthedition/ShimmeringWings.java
index 1ef94c3b22..7ac5247052 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ShimmeringWings.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ShimmeringWings.java
@@ -37,7 +37,7 @@ public class ShimmeringWings extends mage.sets.tempest.ShimmeringWings {
 
     public ShimmeringWings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ShivanReef.java b/Mage.Sets/src/mage/sets/tenthedition/ShivanReef.java
index f0e18fc844..5a1bf59e31 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ShivanReef.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ShivanReef.java
@@ -37,7 +37,7 @@ public class ShivanReef extends mage.sets.apocalypse.ShivanReef {
 
     public ShivanReef(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 357;
+        this.cardNumber = "357";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/tenthedition/SiegeGangCommander.java
index 58ecb28cbb..18f808b951 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SiegeGangCommander.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SiegeGangCommander.java
@@ -37,7 +37,7 @@ public class SiegeGangCommander extends mage.sets.magic2010.SiegeGangCommander {
 
     public SiegeGangCommander(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SkyshroudRanger.java b/Mage.Sets/src/mage/sets/tenthedition/SkyshroudRanger.java
index 1d4c50ec95..a76391fd1b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SkyshroudRanger.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SkyshroudRanger.java
@@ -37,7 +37,7 @@ public class SkyshroudRanger extends mage.sets.tempest.SkyshroudRanger {
 
     public SkyshroudRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SleeperAgent.java b/Mage.Sets/src/mage/sets/tenthedition/SleeperAgent.java
index e6d3102563..9e821d7478 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SleeperAgent.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SleeperAgent.java
@@ -37,7 +37,7 @@ public class SleeperAgent extends mage.sets.urzassaga.SleeperAgent {
 
     public SleeperAgent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Smash.java b/Mage.Sets/src/mage/sets/tenthedition/Smash.java
index fa97fa4de4..7f80e3fa4b 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Smash.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Smash.java
@@ -37,7 +37,7 @@ public class Smash extends mage.sets.apocalypse.Smash {
 
     public Smash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SnappingDrake.java b/Mage.Sets/src/mage/sets/tenthedition/SnappingDrake.java
index 9974bf15d6..b2cf07fc2d 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SnappingDrake.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SnappingDrake.java
@@ -38,7 +38,7 @@ public class SnappingDrake extends mage.sets.ravnica.SnappingDrake {
 
     public SnappingDrake (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SoulWarden.java b/Mage.Sets/src/mage/sets/tenthedition/SoulWarden.java
index 7231d09e10..f75d1778f2 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SoulWarden.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SoulWarden.java
@@ -38,7 +38,7 @@ public class SoulWarden extends mage.sets.magic2010.SoulWarden {
 
     public SoulWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Spellbook.java b/Mage.Sets/src/mage/sets/tenthedition/Spellbook.java
index ac3c49acef..0440018ffe 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Spellbook.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Spellbook.java
@@ -37,7 +37,7 @@ public class Spellbook extends mage.sets.magic2010.Spellbook {
 
     public Spellbook(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 343;
+        this.cardNumber = "343";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/tenthedition/SpiritLink.java
index 4a10cd7c91..9c006665c0 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SpiritLink.java
@@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
 
     public SpiritLink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/StoryCircle.java b/Mage.Sets/src/mage/sets/tenthedition/StoryCircle.java
index 40f09b108f..47919af0ad 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/StoryCircle.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/StoryCircle.java
@@ -39,7 +39,7 @@ public class StoryCircle extends mage.sets.mercadianmasques.StoryCircle {
 
     public StoryCircle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/StrongholdDiscipline.java b/Mage.Sets/src/mage/sets/tenthedition/StrongholdDiscipline.java
index fc1ad76ba5..8b90ec4ed5 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/StrongholdDiscipline.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/StrongholdDiscipline.java
@@ -38,7 +38,7 @@ public class StrongholdDiscipline extends mage.sets.conspiracy.StrongholdDiscipl
 
     public StrongholdDiscipline(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Stun.java b/Mage.Sets/src/mage/sets/tenthedition/Stun.java
index 233d449201..e02e02a8eb 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Stun.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Stun.java
@@ -37,7 +37,7 @@ public class Stun extends mage.sets.tempest.Stun {
 
     public Stun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SuddenImpact.java b/Mage.Sets/src/mage/sets/tenthedition/SuddenImpact.java
index 0fa17e0212..804a34152d 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SuddenImpact.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SuddenImpact.java
@@ -37,7 +37,7 @@ public class SuddenImpact extends mage.sets.seventhedition.SuddenImpact {
 
     public SuddenImpact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SunkenHope.java b/Mage.Sets/src/mage/sets/tenthedition/SunkenHope.java
index 00935885e3..a0cf6d9856 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SunkenHope.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SunkenHope.java
@@ -37,7 +37,7 @@ public class SunkenHope extends mage.sets.planeshift.SunkenHope {
 
     public SunkenHope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/SylvanBasilisk.java b/Mage.Sets/src/mage/sets/tenthedition/SylvanBasilisk.java
index b09865278d..7c49d5ed43 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/SylvanBasilisk.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/SylvanBasilisk.java
@@ -38,7 +38,7 @@ public class SylvanBasilisk extends mage.sets.portalsecondage.SylvanBasilisk {
 
     public SylvanBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/TangleSpider.java b/Mage.Sets/src/mage/sets/tenthedition/TangleSpider.java
index 952232a43c..7fb5445b99 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/TangleSpider.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/TangleSpider.java
@@ -38,7 +38,7 @@ public class TangleSpider extends mage.sets.darksteel.TangleSpider {
 
     public TangleSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 303;
+        this.cardNumber = "303";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Telepathy.java b/Mage.Sets/src/mage/sets/tenthedition/Telepathy.java
index 603a7f5e05..adb9a9ca27 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Telepathy.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Telepathy.java
@@ -36,7 +36,7 @@ public class Telepathy extends mage.sets.urzassaga.Telepathy {
 
     public Telepathy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/TempestOfLight.java b/Mage.Sets/src/mage/sets/tenthedition/TempestOfLight.java
index 88caae2ed5..d2d30bc488 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/TempestOfLight.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/TempestOfLight.java
@@ -37,7 +37,7 @@ public class TempestOfLight extends mage.sets.magic2010.TempestOfLight {
 
     public TempestOfLight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ThievingMagpie.java b/Mage.Sets/src/mage/sets/tenthedition/ThievingMagpie.java
index cc8f70cdb7..c33f3288ca 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ThievingMagpie.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ThievingMagpie.java
@@ -37,7 +37,7 @@ public class ThievingMagpie extends mage.sets.ninthedition.ThievingMagpie {
 
     public ThievingMagpie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/TreetopBracers.java b/Mage.Sets/src/mage/sets/tenthedition/TreetopBracers.java
index bd6f243556..7806a9de20 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/TreetopBracers.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/TreetopBracers.java
@@ -38,7 +38,7 @@ public class TreetopBracers extends mage.sets.nemesis.TreetopBracers {
 
     public TreetopBracers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/TrollAscetic.java b/Mage.Sets/src/mage/sets/tenthedition/TrollAscetic.java
index 4ec831b705..6a2f269bda 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/TrollAscetic.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/TrollAscetic.java
@@ -38,7 +38,7 @@ public class TrollAscetic extends mage.sets.mirrodin.TrollAscetic {
 
     public TrollAscetic (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/TrueBeliever.java b/Mage.Sets/src/mage/sets/tenthedition/TrueBeliever.java
index ade99991e8..bde1ddd300 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/TrueBeliever.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/TrueBeliever.java
@@ -37,7 +37,7 @@ public class TrueBeliever extends mage.sets.onslaught.TrueBeliever {
 
     public TrueBeliever(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Twincast.java b/Mage.Sets/src/mage/sets/tenthedition/Twincast.java
index 26b1b85f81..820b15bab3 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Twincast.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Twincast.java
@@ -37,7 +37,7 @@ public class Twincast extends mage.sets.magic2010.Twincast {
 
     public Twincast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Twitch.java b/Mage.Sets/src/mage/sets/tenthedition/Twitch.java
index 71a373f695..e2efb02cab 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Twitch.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Twitch.java
@@ -37,7 +37,7 @@ public class Twitch extends mage.sets.worldwake.Twitch {
 
     public Twitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/UncontrollableAnger.java b/Mage.Sets/src/mage/sets/tenthedition/UncontrollableAnger.java
index a94089876c..5f78bf546f 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/UncontrollableAnger.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/UncontrollableAnger.java
@@ -38,7 +38,7 @@ public class UncontrollableAnger extends mage.sets.championsofkamigawa.Uncontrol
 
     public UncontrollableAnger (UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/UnderworldDreams.java b/Mage.Sets/src/mage/sets/tenthedition/UnderworldDreams.java
index 179f85248a..39b2b6234f 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/UnderworldDreams.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/UnderworldDreams.java
@@ -37,7 +37,7 @@ public class UnderworldDreams extends mage.sets.magic2010.UnderworldDreams {
 
     public UnderworldDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/VampireBats.java b/Mage.Sets/src/mage/sets/tenthedition/VampireBats.java
index e0df6727fa..4d8e124a82 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/VampireBats.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/VampireBats.java
@@ -37,7 +37,7 @@ public class VampireBats extends mage.sets.fifthedition.VampireBats {
 
     public VampireBats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/VerdantForce.java b/Mage.Sets/src/mage/sets/tenthedition/VerdantForce.java
index 5348b847b0..94ccf61415 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/VerdantForce.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/VerdantForce.java
@@ -37,7 +37,7 @@ public class VerdantForce extends mage.sets.tempest.VerdantForce {
 
     public VerdantForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/ViashinoSandscout.java b/Mage.Sets/src/mage/sets/tenthedition/ViashinoSandscout.java
index 7032f96718..df8e77579a 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/ViashinoSandscout.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/ViashinoSandscout.java
@@ -37,7 +37,7 @@ public class ViashinoSandscout extends mage.sets.urzaslegacy.ViashinoSandscout {
 
     public ViashinoSandscout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/VoiceOfAll.java b/Mage.Sets/src/mage/sets/tenthedition/VoiceOfAll.java
index 2bad94ce3d..bf1304df3c 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/VoiceOfAll.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/VoiceOfAll.java
@@ -38,7 +38,7 @@ public class VoiceOfAll extends mage.sets.planeshift.VoiceOfAll {
 
     public VoiceOfAll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "10E";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/tenthedition/WarpWorld.java b/Mage.Sets/src/mage/sets/tenthedition/WarpWorld.java
index fb96415422..8de69e9247 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/WarpWorld.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/WarpWorld.java
@@ -37,7 +37,7 @@ public class WarpWorld extends mage.sets.magic2010.WarpWorld {
 
     public WarpWorld(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenthedition/YavimayaCoast.java b/Mage.Sets/src/mage/sets/tenthedition/YavimayaCoast.java
index b1a16e41c1..9385c3027d 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/YavimayaCoast.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/YavimayaCoast.java
@@ -37,7 +37,7 @@ public class YavimayaCoast extends mage.sets.apocalypse.YavimayaCoast {
 
     public YavimayaCoast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 363;
+        this.cardNumber = "363";
         this.expansionSetCode = "10E";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java b/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java
index 2c66993687..2995472d00 100644
--- a/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java
+++ b/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java
@@ -38,7 +38,7 @@ public class ApprenticeWizard extends mage.sets.mastersedition.ApprenticeWizard
 
     public ApprenticeWizard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java b/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java
index c428daf5d8..d14eae763e 100644
--- a/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java
+++ b/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java
@@ -38,7 +38,7 @@ public class AshesToAshes extends mage.sets.fifthedition.AshesToAshes {
 
     public AshesToAshes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/BallLightning.java b/Mage.Sets/src/mage/sets/thedark/BallLightning.java
index e71653700b..9c5311abdc 100644
--- a/Mage.Sets/src/mage/sets/thedark/BallLightning.java
+++ b/Mage.Sets/src/mage/sets/thedark/BallLightning.java
@@ -37,7 +37,7 @@ public class BallLightning extends mage.sets.magic2010.BallLightning {
 
     public BallLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/BloodMoon.java b/Mage.Sets/src/mage/sets/thedark/BloodMoon.java
index bc9f2812b6..1a6c65cde1 100644
--- a/Mage.Sets/src/mage/sets/thedark/BloodMoon.java
+++ b/Mage.Sets/src/mage/sets/thedark/BloodMoon.java
@@ -37,7 +37,7 @@ public class BloodMoon extends mage.sets.ninthedition.BloodMoon {
 
     public BloodMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/BogImp.java b/Mage.Sets/src/mage/sets/thedark/BogImp.java
index 6575989d97..852ab3a6b3 100644
--- a/Mage.Sets/src/mage/sets/thedark/BogImp.java
+++ b/Mage.Sets/src/mage/sets/thedark/BogImp.java
@@ -37,7 +37,7 @@ public class BogImp extends mage.sets.fifthedition.BogImp {
 
     public BogImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/BoneFlute.java b/Mage.Sets/src/mage/sets/thedark/BoneFlute.java
index 95e29040fb..9f47e49962 100644
--- a/Mage.Sets/src/mage/sets/thedark/BoneFlute.java
+++ b/Mage.Sets/src/mage/sets/thedark/BoneFlute.java
@@ -38,7 +38,7 @@ public class BoneFlute extends mage.sets.masterseditioniii.BoneFlute {
 
     public BoneFlute(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/BrothersOfFire.java b/Mage.Sets/src/mage/sets/thedark/BrothersOfFire.java
index 401e9fe27d..ee1798cbbc 100644
--- a/Mage.Sets/src/mage/sets/thedark/BrothersOfFire.java
+++ b/Mage.Sets/src/mage/sets/thedark/BrothersOfFire.java
@@ -38,7 +38,7 @@ public class BrothersOfFire extends mage.sets.fourthedition.BrothersOfFire {
 
     public BrothersOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/CarnivorousPlant.java b/Mage.Sets/src/mage/sets/thedark/CarnivorousPlant.java
index 9446330a41..2f21bac8b4 100644
--- a/Mage.Sets/src/mage/sets/thedark/CarnivorousPlant.java
+++ b/Mage.Sets/src/mage/sets/thedark/CarnivorousPlant.java
@@ -37,7 +37,7 @@ public class CarnivorousPlant extends mage.sets.fourthedition.CarnivorousPlant {
 
     public CarnivorousPlant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/CoalGolem.java b/Mage.Sets/src/mage/sets/thedark/CoalGolem.java
index 373694dd00..6cee130b5d 100644
--- a/Mage.Sets/src/mage/sets/thedark/CoalGolem.java
+++ b/Mage.Sets/src/mage/sets/thedark/CoalGolem.java
@@ -38,7 +38,7 @@ public class CoalGolem extends mage.sets.masterseditioniii.CoalGolem {
 
     public CoalGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java
index fd5dcc608e..7e9c73fd65 100644
--- a/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java
+++ b/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java
@@ -38,7 +38,7 @@ public class DarkHeartOfTheWood extends mage.sets.ravnica.DarkHeartOfTheWood {
 
     public DarkHeartOfTheWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/DiabolicMachine.java b/Mage.Sets/src/mage/sets/thedark/DiabolicMachine.java
index 5466c2308a..aa97ad54f2 100644
--- a/Mage.Sets/src/mage/sets/thedark/DiabolicMachine.java
+++ b/Mage.Sets/src/mage/sets/thedark/DiabolicMachine.java
@@ -37,7 +37,7 @@ public class DiabolicMachine extends mage.sets.fourthedition.DiabolicMachine {
 
     public DiabolicMachine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/EaterOfTheDead.java b/Mage.Sets/src/mage/sets/thedark/EaterOfTheDead.java
index d82460f0cb..28e3d7b89f 100644
--- a/Mage.Sets/src/mage/sets/thedark/EaterOfTheDead.java
+++ b/Mage.Sets/src/mage/sets/thedark/EaterOfTheDead.java
@@ -37,7 +37,7 @@ public class EaterOfTheDead extends mage.sets.mastersedition.EaterOfTheDead {
 
     public EaterOfTheDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java
index cf0e1df72c..00ea9edff6 100644
--- a/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java
+++ b/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java
@@ -38,7 +38,7 @@ public class ElvesOfDeepShadow extends mage.sets.ravnica.ElvesOfDeepShadow {
 
     public ElvesOfDeepShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/Exorcist.java b/Mage.Sets/src/mage/sets/thedark/Exorcist.java
index 0e79d4a60c..e00e9902ac 100644
--- a/Mage.Sets/src/mage/sets/thedark/Exorcist.java
+++ b/Mage.Sets/src/mage/sets/thedark/Exorcist.java
@@ -38,7 +38,7 @@ public class Exorcist extends mage.sets.masterseditioniii.Exorcist {
 
     public Exorcist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/FellwarStone.java b/Mage.Sets/src/mage/sets/thedark/FellwarStone.java
index 6aca0cea9f..6e5ac6ea9a 100644
--- a/Mage.Sets/src/mage/sets/thedark/FellwarStone.java
+++ b/Mage.Sets/src/mage/sets/thedark/FellwarStone.java
@@ -37,7 +37,7 @@ public class FellwarStone extends mage.sets.ninthedition.FellwarStone {
 
     public FellwarStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/FireDrake.java b/Mage.Sets/src/mage/sets/thedark/FireDrake.java
index 5e18399b7f..6febf25fc5 100644
--- a/Mage.Sets/src/mage/sets/thedark/FireDrake.java
+++ b/Mage.Sets/src/mage/sets/thedark/FireDrake.java
@@ -37,7 +37,7 @@ public class FireDrake extends mage.sets.fifthedition.FireDrake {
 
     public FireDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/Flood.java b/Mage.Sets/src/mage/sets/thedark/Flood.java
index a3a64e3277..b87e8e6e64 100644
--- a/Mage.Sets/src/mage/sets/thedark/Flood.java
+++ b/Mage.Sets/src/mage/sets/thedark/Flood.java
@@ -38,7 +38,7 @@ public class Flood extends mage.sets.fourthedition.Flood {
 
     public Flood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/FountainOfYouth.java b/Mage.Sets/src/mage/sets/thedark/FountainOfYouth.java
index e818433030..19f5757a5b 100644
--- a/Mage.Sets/src/mage/sets/thedark/FountainOfYouth.java
+++ b/Mage.Sets/src/mage/sets/thedark/FountainOfYouth.java
@@ -37,7 +37,7 @@ public class FountainOfYouth extends mage.sets.tenthedition.FountainOfYouth {
 
     public FountainOfYouth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/GhostShip.java b/Mage.Sets/src/mage/sets/thedark/GhostShip.java
index 3254e0a3d9..c667fbf491 100644
--- a/Mage.Sets/src/mage/sets/thedark/GhostShip.java
+++ b/Mage.Sets/src/mage/sets/thedark/GhostShip.java
@@ -38,7 +38,7 @@ public class GhostShip extends mage.sets.timeshifted.GhostShip {
 
     public GhostShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinHero.java b/Mage.Sets/src/mage/sets/thedark/GoblinHero.java
index a6831ad56f..865fd2770e 100644
--- a/Mage.Sets/src/mage/sets/thedark/GoblinHero.java
+++ b/Mage.Sets/src/mage/sets/thedark/GoblinHero.java
@@ -37,7 +37,7 @@ public class GoblinHero extends mage.sets.fifthedition.GoblinHero {
 
     public GoblinHero(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/LandLeeches.java b/Mage.Sets/src/mage/sets/thedark/LandLeeches.java
index c9b9ccdef8..0fb0f4bce0 100644
--- a/Mage.Sets/src/mage/sets/thedark/LandLeeches.java
+++ b/Mage.Sets/src/mage/sets/thedark/LandLeeches.java
@@ -37,7 +37,7 @@ public class LandLeeches extends mage.sets.fourthedition.LandLeeches {
 
     public LandLeeches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/ManaClash.java b/Mage.Sets/src/mage/sets/thedark/ManaClash.java
index 1aa1d6755d..22b5c6a640 100644
--- a/Mage.Sets/src/mage/sets/thedark/ManaClash.java
+++ b/Mage.Sets/src/mage/sets/thedark/ManaClash.java
@@ -37,7 +37,7 @@ public class ManaClash extends mage.sets.fourthedition.ManaClash {
 
     public ManaClash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/ManaVortex.java b/Mage.Sets/src/mage/sets/thedark/ManaVortex.java
index c14a493450..5f64d4c5f9 100644
--- a/Mage.Sets/src/mage/sets/thedark/ManaVortex.java
+++ b/Mage.Sets/src/mage/sets/thedark/ManaVortex.java
@@ -37,7 +37,7 @@ public class ManaVortex extends mage.sets.masterseditioniii.ManaVortex {
 
     public ManaVortex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/MurkDwellers.java b/Mage.Sets/src/mage/sets/thedark/MurkDwellers.java
index dc10233190..418e92a70f 100644
--- a/Mage.Sets/src/mage/sets/thedark/MurkDwellers.java
+++ b/Mage.Sets/src/mage/sets/thedark/MurkDwellers.java
@@ -37,7 +37,7 @@ public class MurkDwellers extends mage.sets.fifthedition.MurkDwellers {
 
     public MurkDwellers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/Preacher.java b/Mage.Sets/src/mage/sets/thedark/Preacher.java
index c74472babe..8dcd953370 100644
--- a/Mage.Sets/src/mage/sets/thedark/Preacher.java
+++ b/Mage.Sets/src/mage/sets/thedark/Preacher.java
@@ -37,7 +37,7 @@ public class Preacher extends mage.sets.mastersedition.Preacher {
 
     public Preacher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/ScavengerFolk.java b/Mage.Sets/src/mage/sets/thedark/ScavengerFolk.java
index 4071c8bb2d..396a3ec9c3 100644
--- a/Mage.Sets/src/mage/sets/thedark/ScavengerFolk.java
+++ b/Mage.Sets/src/mage/sets/thedark/ScavengerFolk.java
@@ -38,7 +38,7 @@ public class ScavengerFolk extends mage.sets.fifthedition.ScavengerFolk {
 
     public ScavengerFolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/SistersOfTheFlame.java b/Mage.Sets/src/mage/sets/thedark/SistersOfTheFlame.java
index ea0281fc24..948cb88786 100644
--- a/Mage.Sets/src/mage/sets/thedark/SistersOfTheFlame.java
+++ b/Mage.Sets/src/mage/sets/thedark/SistersOfTheFlame.java
@@ -38,7 +38,7 @@ public class SistersOfTheFlame extends mage.sets.fourthedition.SistersOfTheFlame
 
     public SistersOfTheFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/Squire.java b/Mage.Sets/src/mage/sets/thedark/Squire.java
index 3331e7c2a3..1690e71c80 100644
--- a/Mage.Sets/src/mage/sets/thedark/Squire.java
+++ b/Mage.Sets/src/mage/sets/thedark/Squire.java
@@ -38,7 +38,7 @@ public class Squire extends mage.sets.timeshifted.Squire {
 
     public Squire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/StoneCalendar.java b/Mage.Sets/src/mage/sets/thedark/StoneCalendar.java
index 2b690f82e0..5fed3c7149 100644
--- a/Mage.Sets/src/mage/sets/thedark/StoneCalendar.java
+++ b/Mage.Sets/src/mage/sets/thedark/StoneCalendar.java
@@ -38,7 +38,7 @@ public class StoneCalendar extends mage.sets.mastersedition.StoneCalendar {
 
     public StoneCalendar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/SunkenCity.java b/Mage.Sets/src/mage/sets/thedark/SunkenCity.java
index 5f7aa1bd35..e272c8d0b4 100644
--- a/Mage.Sets/src/mage/sets/thedark/SunkenCity.java
+++ b/Mage.Sets/src/mage/sets/thedark/SunkenCity.java
@@ -38,7 +38,7 @@ public class SunkenCity extends mage.sets.mastersedition.SunkenCity {
 
     public SunkenCity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java b/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java
index aa68e0e1c7..f6c6559d06 100644
--- a/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java
+++ b/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java
@@ -38,7 +38,7 @@ public class TormodsCrypt extends mage.sets.timeshifted.TormodsCrypt {
 
     public TormodsCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/Tracker.java b/Mage.Sets/src/mage/sets/thedark/Tracker.java
index 18d3bf592a..19345e564b 100644
--- a/Mage.Sets/src/mage/sets/thedark/Tracker.java
+++ b/Mage.Sets/src/mage/sets/thedark/Tracker.java
@@ -38,7 +38,7 @@ public class Tracker extends mage.sets.masterseditioniii.Tracker {
 
     public Tracker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DRK";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/thedark/WordOfBinding.java b/Mage.Sets/src/mage/sets/thedark/WordOfBinding.java
index ecd0f63a4b..0dbf4a54cd 100644
--- a/Mage.Sets/src/mage/sets/thedark/WordOfBinding.java
+++ b/Mage.Sets/src/mage/sets/thedark/WordOfBinding.java
@@ -37,7 +37,7 @@ public class WordOfBinding extends mage.sets.fourthedition.WordOfBinding {
 
     public WordOfBinding(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DRK";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/Annul.java b/Mage.Sets/src/mage/sets/theros/Annul.java
index 22393e01e1..ab8a99320d 100644
--- a/Mage.Sets/src/mage/sets/theros/Annul.java
+++ b/Mage.Sets/src/mage/sets/theros/Annul.java
@@ -37,7 +37,7 @@ public class Annul extends mage.sets.mirrodin.Annul {
 
     public Annul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/Demolish.java b/Mage.Sets/src/mage/sets/theros/Demolish.java
index 9b450bb2fa..e991e0d1b8 100644
--- a/Mage.Sets/src/mage/sets/theros/Demolish.java
+++ b/Mage.Sets/src/mage/sets/theros/Demolish.java
@@ -37,7 +37,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/DivineVerdict.java b/Mage.Sets/src/mage/sets/theros/DivineVerdict.java
index df8a6e2e0b..06b4526046 100644
--- a/Mage.Sets/src/mage/sets/theros/DivineVerdict.java
+++ b/Mage.Sets/src/mage/sets/theros/DivineVerdict.java
@@ -37,7 +37,7 @@ public class DivineVerdict extends mage.sets.magic2010.DivineVerdict {
 
     public DivineVerdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/Griptide.java b/Mage.Sets/src/mage/sets/theros/Griptide.java
index 841f65e5c0..65a9a3b1c4 100644
--- a/Mage.Sets/src/mage/sets/theros/Griptide.java
+++ b/Mage.Sets/src/mage/sets/theros/Griptide.java
@@ -37,7 +37,7 @@ public class Griptide extends mage.sets.darkascension.Griptide {
 
     public Griptide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/LastBreath.java b/Mage.Sets/src/mage/sets/theros/LastBreath.java
index 7e2ef1a383..ade024763a 100644
--- a/Mage.Sets/src/mage/sets/theros/LastBreath.java
+++ b/Mage.Sets/src/mage/sets/theros/LastBreath.java
@@ -37,7 +37,7 @@ public class LastBreath extends mage.sets.shadowmoor.LastBreath {
 
     public LastBreath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/MagmaJet.java b/Mage.Sets/src/mage/sets/theros/MagmaJet.java
index 77141de930..a55680621d 100644
--- a/Mage.Sets/src/mage/sets/theros/MagmaJet.java
+++ b/Mage.Sets/src/mage/sets/theros/MagmaJet.java
@@ -37,7 +37,7 @@ public class MagmaJet extends mage.sets.fifthdawn.MagmaJet {
 
     public MagmaJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/MnemonicWall.java b/Mage.Sets/src/mage/sets/theros/MnemonicWall.java
index 1283237295..d837dbb342 100644
--- a/Mage.Sets/src/mage/sets/theros/MnemonicWall.java
+++ b/Mage.Sets/src/mage/sets/theros/MnemonicWall.java
@@ -37,7 +37,7 @@ public class MnemonicWall extends mage.sets.riseoftheeldrazi.MnemonicWall {
 
     public MnemonicWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/NessianCourser.java b/Mage.Sets/src/mage/sets/theros/NessianCourser.java
index 11793fdada..213ca78419 100644
--- a/Mage.Sets/src/mage/sets/theros/NessianCourser.java
+++ b/Mage.Sets/src/mage/sets/theros/NessianCourser.java
@@ -37,7 +37,7 @@ public class NessianCourser extends mage.sets.futuresight.NessianCourser {
 
     public NessianCourser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/SavageSurge.java b/Mage.Sets/src/mage/sets/theros/SavageSurge.java
index 1014318ae1..a1aafe9a28 100644
--- a/Mage.Sets/src/mage/sets/theros/SavageSurge.java
+++ b/Mage.Sets/src/mage/sets/theros/SavageSurge.java
@@ -38,7 +38,7 @@ public class SavageSurge extends mage.sets.returntoravnica.SavageSurge {
 
     public SavageSurge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "THS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/theros/Thoughtseize.java b/Mage.Sets/src/mage/sets/theros/Thoughtseize.java
index 182fdb596b..13f3251c7d 100644
--- a/Mage.Sets/src/mage/sets/theros/Thoughtseize.java
+++ b/Mage.Sets/src/mage/sets/theros/Thoughtseize.java
@@ -37,7 +37,7 @@ public class Thoughtseize extends mage.sets.lorwyn.Thoughtseize {
 
     public Thoughtseize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/TravelersAmulet.java b/Mage.Sets/src/mage/sets/theros/TravelersAmulet.java
index 24b92ca65b..806bb9b9bd 100644
--- a/Mage.Sets/src/mage/sets/theros/TravelersAmulet.java
+++ b/Mage.Sets/src/mage/sets/theros/TravelersAmulet.java
@@ -37,7 +37,7 @@ public class TravelersAmulet extends mage.sets.innistrad.TravelersAmulet {
 
     public TravelersAmulet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "THS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Auratog.java b/Mage.Sets/src/mage/sets/timeshifted/Auratog.java
index 3d66700050..8aff297d00 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Auratog.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Auratog.java
@@ -38,7 +38,7 @@ public class Auratog extends mage.sets.tempest.Auratog {
 
     public Auratog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java b/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java
index e186c38c4c..20ea971f1b 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java
@@ -38,7 +38,7 @@ public class AvalancheRiders extends mage.sets.urzaslegacy.AvalancheRiders {
 
     public AvalancheRiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/AvatarOfWoe.java b/Mage.Sets/src/mage/sets/timeshifted/AvatarOfWoe.java
index 1a3ec405b4..e2b1c89064 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/AvatarOfWoe.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/AvatarOfWoe.java
@@ -38,7 +38,7 @@ public class AvatarOfWoe extends mage.sets.archenemy.AvatarOfWoe {
 
     public AvatarOfWoe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/AvoidFate.java b/Mage.Sets/src/mage/sets/timeshifted/AvoidFate.java
index 038b8d97e2..721898199b 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/AvoidFate.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/AvoidFate.java
@@ -38,7 +38,7 @@ public class AvoidFate extends mage.sets.legends.AvoidFate {
 
     public AvoidFate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java b/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java
index 0769d812b9..f41c41e324 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java
@@ -38,7 +38,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Browbeat.java b/Mage.Sets/src/mage/sets/timeshifted/Browbeat.java
index b581918b43..a6dda760f1 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Browbeat.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Browbeat.java
@@ -38,7 +38,7 @@ public class Browbeat extends mage.sets.judgment.Browbeat {
 
     public Browbeat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java b/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java
index f69942cfa8..0e0b089dd5 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java
@@ -38,7 +38,7 @@ public class ClawsOfGix extends mage.sets.urzassaga.ClawsOfGix {
 
     public ClawsOfGix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Cockatrice.java b/Mage.Sets/src/mage/sets/timeshifted/Cockatrice.java
index 9e79ac9aa2..c70089f584 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Cockatrice.java
@@ -38,7 +38,7 @@ public class Cockatrice extends mage.sets.limitedalpha.Cockatrice {
 
     public Cockatrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "TSB";
 		this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/CrawGiant.java b/Mage.Sets/src/mage/sets/timeshifted/CrawGiant.java
index 00e5b6d6d0..126ccb3119 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/CrawGiant.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/CrawGiant.java
@@ -38,7 +38,7 @@ public class CrawGiant extends mage.sets.legends.CrawGiant {
 
     public CrawGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Dandan.java b/Mage.Sets/src/mage/sets/timeshifted/Dandan.java
index a3955b2093..60bd0dec0e 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Dandan.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Dandan.java
@@ -39,7 +39,7 @@ public class Dandan extends mage.sets.fifthedition.Dandan {
 
     public Dandan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java b/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java
index de9e044e74..c1500ed0fa 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java
@@ -38,7 +38,7 @@ public class DauthiSlayer extends mage.sets.tempest.DauthiSlayer {
 
     public DauthiSlayer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/DesolationGiant.java b/Mage.Sets/src/mage/sets/timeshifted/DesolationGiant.java
index 0ac394369d..fed316fd07 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/DesolationGiant.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/DesolationGiant.java
@@ -38,7 +38,7 @@ public class DesolationGiant extends mage.sets.apocalypse.DesolationGiant {
 
     public DesolationGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java b/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java
index 4d64a6605d..3a3c287cbf 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java
@@ -38,7 +38,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Disintegrate.java b/Mage.Sets/src/mage/sets/timeshifted/Disintegrate.java
index 4bc3c5e2b6..c5a9dc8d99 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Disintegrate.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Disintegrate.java
@@ -38,7 +38,7 @@ public class Disintegrate extends mage.sets.limitedalpha.Disintegrate {
 
     public Disintegrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Dodecapod.java b/Mage.Sets/src/mage/sets/timeshifted/Dodecapod.java
index 50876e1079..cc3c82801d 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Dodecapod.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Dodecapod.java
@@ -38,7 +38,7 @@ public class Dodecapod extends mage.sets.apocalypse.Dodecapod {
 
     public Dodecapod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java b/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java
index af5899018d..0330baaa76 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java
@@ -38,7 +38,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/EnduringRenewal.java b/Mage.Sets/src/mage/sets/timeshifted/EnduringRenewal.java
index e73d30f633..b4a920ff91 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/EnduringRenewal.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/EnduringRenewal.java
@@ -38,7 +38,7 @@ public class EnduringRenewal extends mage.sets.iceage.EnduringRenewal {
 
     public EnduringRenewal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/EronTheRelentless.java b/Mage.Sets/src/mage/sets/timeshifted/EronTheRelentless.java
index 999111c479..758c78459e 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/EronTheRelentless.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/EronTheRelentless.java
@@ -38,7 +38,7 @@ public class EronTheRelentless extends mage.sets.homelands.EronTheRelentless {
 
     public EronTheRelentless(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/sets/timeshifted/EvilEyeOfOrmsByGore.java
index 36e7a1029e..0f7a638874 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/EvilEyeOfOrmsByGore.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/EvilEyeOfOrmsByGore.java
@@ -38,7 +38,7 @@ public class EvilEyeOfOrmsByGore extends mage.sets.fifthedition.EvilEyeOfOrmsByG
 
     public EvilEyeOfOrmsByGore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/FieryJustice.java b/Mage.Sets/src/mage/sets/timeshifted/FieryJustice.java
index fc14033d65..79b2bbf205 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/FieryJustice.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/FieryJustice.java
@@ -38,7 +38,7 @@ public class FieryJustice extends mage.sets.iceage.FieryJustice {
 
     public FieryJustice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/GoblinSnowman.java b/Mage.Sets/src/mage/sets/timeshifted/GoblinSnowman.java
index 24e791b194..7e749521db 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/GoblinSnowman.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/GoblinSnowman.java
@@ -37,7 +37,7 @@ public class GoblinSnowman extends mage.sets.iceage.GoblinSnowman {
 
     public GoblinSnowman(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "TSB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timeshifted/HuntingMoa.java b/Mage.Sets/src/mage/sets/timeshifted/HuntingMoa.java
index 841d321e92..e98a21d914 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/HuntingMoa.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/HuntingMoa.java
@@ -38,7 +38,7 @@ public class HuntingMoa extends mage.sets.urzasdestiny.HuntingMoa {
 
     public HuntingMoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java
index c286899663..2c1ca0ea4f 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java
@@ -38,7 +38,7 @@ public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelinee
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java
index 71d772bf7b..9f57217df0 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java
@@ -38,7 +38,7 @@ public class JolraelEmpressOfBeasts extends mage.sets.prophecy.JolraelEmpressOfB
 
     public JolraelEmpressOfBeasts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/LightningAngel.java b/Mage.Sets/src/mage/sets/timeshifted/LightningAngel.java
index 1af260bc02..05eccbd482 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/LightningAngel.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/LightningAngel.java
@@ -38,7 +38,7 @@ public class LightningAngel extends mage.sets.apocalypse.LightningAngel {
 
     public LightningAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/timeshifted/LordOfAtlantis.java
index 8b54d54584..f588b38edf 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/LordOfAtlantis.java
@@ -38,7 +38,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/MerfolkAssassin.java b/Mage.Sets/src/mage/sets/timeshifted/MerfolkAssassin.java
index c0f621caf5..cd9d24abf1 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/MerfolkAssassin.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/MerfolkAssassin.java
@@ -38,7 +38,7 @@ public class MerfolkAssassin extends mage.sets.thedark.MerfolkAssassin {
 
     public MerfolkAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/MeriekeRiBerit.java b/Mage.Sets/src/mage/sets/timeshifted/MeriekeRiBerit.java
index 2f1df323b7..cda9f4c608 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/MeriekeRiBerit.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/MeriekeRiBerit.java
@@ -38,7 +38,7 @@ public class MeriekeRiBerit extends mage.sets.iceage.MeriekeRiBerit {
 
     public MeriekeRiBerit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/MindlessAutomaton.java b/Mage.Sets/src/mage/sets/timeshifted/MindlessAutomaton.java
index 5ba569a574..1354d3cdc3 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/MindlessAutomaton.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/MindlessAutomaton.java
@@ -38,7 +38,7 @@ public class MindlessAutomaton extends mage.sets.exodus.MindlessAutomaton {
 
     public MindlessAutomaton(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Mirari.java b/Mage.Sets/src/mage/sets/timeshifted/Mirari.java
index 8e82d87d72..3607bdf1f3 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Mirari.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Mirari.java
@@ -38,7 +38,7 @@ public class Mirari extends mage.sets.commander2013.Mirari {
 
     public Mirari(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/MysticSnake.java b/Mage.Sets/src/mage/sets/timeshifted/MysticSnake.java
index b82bb070c5..35493cabe5 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/MysticSnake.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/MysticSnake.java
@@ -38,7 +38,7 @@ public class MysticSnake extends mage.sets.apocalypse.MysticSnake {
 
     public MysticSnake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/NicolBolas.java b/Mage.Sets/src/mage/sets/timeshifted/NicolBolas.java
index 888db880a1..53f782d023 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/NicolBolas.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/NicolBolas.java
@@ -38,7 +38,7 @@ public class NicolBolas extends mage.sets.legends.NicolBolas {
 
     public NicolBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/OrcishLibrarian.java b/Mage.Sets/src/mage/sets/timeshifted/OrcishLibrarian.java
index 7e6587cfa5..b4682ee25c 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/OrcishLibrarian.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/OrcishLibrarian.java
@@ -38,7 +38,7 @@ public class OrcishLibrarian extends mage.sets.iceage.OrcishLibrarian {
 
     public OrcishLibrarian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/PirateShip.java b/Mage.Sets/src/mage/sets/timeshifted/PirateShip.java
index a7e0f8461b..25bcf9676b 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/PirateShip.java
@@ -39,7 +39,7 @@ public class PirateShip extends mage.sets.limitedalpha.PirateShip {
 
     public PirateShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Resurrection.java b/Mage.Sets/src/mage/sets/timeshifted/Resurrection.java
index 71b1e8a779..d9f04b83e2 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Resurrection.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Resurrection.java
@@ -39,7 +39,7 @@ public class Resurrection extends mage.sets.limitedalpha.Resurrection {
 
     public Resurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SacredMesa.java b/Mage.Sets/src/mage/sets/timeshifted/SacredMesa.java
index 4dbc07dd83..757f7c06cb 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SacredMesa.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SacredMesa.java
@@ -38,7 +38,7 @@ public class SacredMesa extends mage.sets.mirage.SacredMesa {
 
     public SacredMesa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SafeHaven.java b/Mage.Sets/src/mage/sets/timeshifted/SafeHaven.java
index 02e81eaaee..021bb026af 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SafeHaven.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SafeHaven.java
@@ -38,7 +38,7 @@ public class SafeHaven extends mage.sets.thedark.SafeHaven {
 
     public SafeHaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Scragnoth.java b/Mage.Sets/src/mage/sets/timeshifted/Scragnoth.java
index ff5d3184c1..69cc4f8684 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Scragnoth.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Scragnoth.java
@@ -38,7 +38,7 @@ public class Scragnoth extends mage.sets.tempest.Scragnoth {
 
     public Scragnoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SengirAutocrat.java b/Mage.Sets/src/mage/sets/timeshifted/SengirAutocrat.java
index 54785d640b..637c8cf6d1 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SengirAutocrat.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SengirAutocrat.java
@@ -38,7 +38,7 @@ public class SengirAutocrat extends mage.sets.homelands.SengirAutocrat {
 
     public SengirAutocrat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SerratedArrows.java b/Mage.Sets/src/mage/sets/timeshifted/SerratedArrows.java
index 0654b4fe7b..0f2e4d8bef 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SerratedArrows.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SerratedArrows.java
@@ -38,7 +38,7 @@ public class SerratedArrows extends mage.sets.homelands.SerratedArrows {
 
     public SerratedArrows(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/ShadowGuildmage.java b/Mage.Sets/src/mage/sets/timeshifted/ShadowGuildmage.java
index 8d76411452..79494ce7d2 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/ShadowGuildmage.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/ShadowGuildmage.java
@@ -38,7 +38,7 @@ public class ShadowGuildmage extends mage.sets.mirage.ShadowGuildmage {
 
     public ShadowGuildmage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Sindbad.java b/Mage.Sets/src/mage/sets/timeshifted/Sindbad.java
index 1dec06bf32..be0661e998 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Sindbad.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Sindbad.java
@@ -38,7 +38,7 @@ public class Sindbad extends mage.sets.fourthedition.Sindbad {
 
     public Sindbad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java b/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java
index 0d3c0b8f14..d3592c8279 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java
@@ -38,7 +38,7 @@ public class SoltariPriest extends mage.sets.tempest.SoltariPriest {
 
     public SoltariPriest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SpinedSliver.java b/Mage.Sets/src/mage/sets/timeshifted/SpinedSliver.java
index 2c62b813ec..b877411af0 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SpinedSliver.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SpinedSliver.java
@@ -38,7 +38,7 @@ public class SpinedSliver extends mage.sets.stronghold.SpinedSliver {
 
     public SpinedSliver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Stormbind.java b/Mage.Sets/src/mage/sets/timeshifted/Stormbind.java
index bcb9d0fb54..96bf4bf520 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Stormbind.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Stormbind.java
@@ -39,7 +39,7 @@ public class Stormbind extends mage.sets.iceage.Stormbind {
 
     public Stormbind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SwampMosquito.java b/Mage.Sets/src/mage/sets/timeshifted/SwampMosquito.java
index 93773da760..de690ba543 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SwampMosquito.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SwampMosquito.java
@@ -38,7 +38,7 @@ public class SwampMosquito extends mage.sets.alliances.SwampMosquito1 {
 
     public SwampMosquito(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/TheRack.java b/Mage.Sets/src/mage/sets/timeshifted/TheRack.java
index 8dbcce76ef..d718f07a3e 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/TheRack.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/TheRack.java
@@ -38,7 +38,7 @@ public class TheRack extends mage.sets.fourthedition.TheRack {
 
     public TheRack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/ThornscapeBattlemage.java b/Mage.Sets/src/mage/sets/timeshifted/ThornscapeBattlemage.java
index 2665139062..234e9046eb 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/ThornscapeBattlemage.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/ThornscapeBattlemage.java
@@ -38,7 +38,7 @@ public class ThornscapeBattlemage extends mage.sets.phyrexiavsthecoalition.Thorn
 
     public ThornscapeBattlemage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java b/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java
index d2b8817bab..dceb7ad376 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java
@@ -38,7 +38,7 @@ public class TribalFlames extends mage.sets.invasion.TribalFlames {
 
     public TribalFlames(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/UncleIstvan.java b/Mage.Sets/src/mage/sets/timeshifted/UncleIstvan.java
index ddcc7b008a..a1b0bdb723 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/UncleIstvan.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/UncleIstvan.java
@@ -38,7 +38,7 @@ public class UncleIstvan extends mage.sets.thedark.UncleIstvan {
 
     public UncleIstvan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/UndeadWarchief.java b/Mage.Sets/src/mage/sets/timeshifted/UndeadWarchief.java
index d8ab7fe76e..0dc737cd70 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/UndeadWarchief.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/UndeadWarchief.java
@@ -37,7 +37,7 @@ public class UndeadWarchief extends mage.sets.planechase.UndeadWarchief {
 
     public UndeadWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "TSB";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timeshifted/UnstableMutation.java b/Mage.Sets/src/mage/sets/timeshifted/UnstableMutation.java
index 7ef4b61fc3..115afb3a8a 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/UnstableMutation.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/UnstableMutation.java
@@ -39,7 +39,7 @@ public class UnstableMutation extends mage.sets.arabiannights.UnstableMutation {
 
     public UnstableMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/UthdenTroll.java b/Mage.Sets/src/mage/sets/timeshifted/UthdenTroll.java
index e2d2a0dd95..ed12d5412c 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/UthdenTroll.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/UthdenTroll.java
@@ -38,7 +38,7 @@ public class UthdenTroll extends mage.sets.limitedalpha.UthdenTroll {
 
     public UthdenTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Valor.java b/Mage.Sets/src/mage/sets/timeshifted/Valor.java
index b565b57ee7..5579daca7d 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Valor.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Valor.java
@@ -38,7 +38,7 @@ public class Valor extends mage.sets.judgment.Valor {
 
     public Valor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "TSB";
 		this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/VerdelothTheAncient.java b/Mage.Sets/src/mage/sets/timeshifted/VerdelothTheAncient.java
index e7cd1270a6..3cd5cc1ebc 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/VerdelothTheAncient.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/VerdelothTheAncient.java
@@ -38,7 +38,7 @@ public class VerdelothTheAncient extends mage.sets.invasion.VerdelothTheAncient
 
     public VerdelothTheAncient(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/VhatiIlDal.java b/Mage.Sets/src/mage/sets/timeshifted/VhatiIlDal.java
index 2f64c6aac6..ec2fc81665 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/VhatiIlDal.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/VhatiIlDal.java
@@ -38,7 +38,7 @@ public class VhatiIlDal extends mage.sets.tempest.VhatiIlDal {
 
     public VhatiIlDal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Void.java b/Mage.Sets/src/mage/sets/timeshifted/Void.java
index bad88a00b3..b05f3b1928 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Void.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Void.java
@@ -38,7 +38,7 @@ public class Void extends mage.sets.invasion.Void {
 
     public Void(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/VoidmageProdigy.java b/Mage.Sets/src/mage/sets/timeshifted/VoidmageProdigy.java
index a94ab6ade6..bc8657064e 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/VoidmageProdigy.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/VoidmageProdigy.java
@@ -38,7 +38,7 @@ public class VoidmageProdigy extends mage.sets.onslaught.VoidmageProdigy {
 
     public VoidmageProdigy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/WhispersOfTheMuse.java b/Mage.Sets/src/mage/sets/timeshifted/WhispersOfTheMuse.java
index 4517840643..bc46f390fa 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/WhispersOfTheMuse.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/WhispersOfTheMuse.java
@@ -38,7 +38,7 @@ public class WhispersOfTheMuse extends mage.sets.tempest.WhispersOfTheMuse {
 
     public WhispersOfTheMuse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/WildfireEmissary.java b/Mage.Sets/src/mage/sets/timeshifted/WildfireEmissary.java
index 2befb05562..3176339456 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/WildfireEmissary.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/WildfireEmissary.java
@@ -38,7 +38,7 @@ public class WildfireEmissary extends mage.sets.mirage.WildfireEmissary {
 
     public WildfireEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Willbender.java b/Mage.Sets/src/mage/sets/timeshifted/Willbender.java
index d148bc4878..b9c441c35a 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Willbender.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Willbender.java
@@ -38,7 +38,7 @@ public class Willbender extends mage.sets.commander2014.Willbender {
 
     public Willbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/WitchHunter.java b/Mage.Sets/src/mage/sets/timeshifted/WitchHunter.java
index 61f7efbdd4..57af95d575 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/WitchHunter.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/WitchHunter.java
@@ -38,7 +38,7 @@ public class WitchHunter extends mage.sets.thedark.WitchHunter {
 
     public WitchHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java b/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java
index b04bce3e63..d6351a3903 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java
@@ -38,7 +38,7 @@ public class WitheredWretch extends mage.sets.planechase.WitheredWretch {
 
     public WitheredWretch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "TSB";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/timespiral/AncientGrudge.java b/Mage.Sets/src/mage/sets/timespiral/AncientGrudge.java
index 9cbdd9e616..b951c4a1f2 100644
--- a/Mage.Sets/src/mage/sets/timespiral/AncientGrudge.java
+++ b/Mage.Sets/src/mage/sets/timespiral/AncientGrudge.java
@@ -37,7 +37,7 @@ public class AncientGrudge extends mage.sets.innistrad.AncientGrudge {
 
     public AncientGrudge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/Assassinate.java b/Mage.Sets/src/mage/sets/timespiral/Assassinate.java
index 4f39f4e66b..dbc0686ba9 100644
--- a/Mage.Sets/src/mage/sets/timespiral/Assassinate.java
+++ b/Mage.Sets/src/mage/sets/timespiral/Assassinate.java
@@ -37,7 +37,7 @@ public class Assassinate extends mage.sets.tenthedition.Assassinate {
 
     public Assassinate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/BarbedShocker.java b/Mage.Sets/src/mage/sets/timespiral/BarbedShocker.java
index 03aba14035..8c3ae6d9ba 100644
--- a/Mage.Sets/src/mage/sets/timespiral/BarbedShocker.java
+++ b/Mage.Sets/src/mage/sets/timespiral/BarbedShocker.java
@@ -37,7 +37,7 @@ public class BarbedShocker extends mage.sets.conspiracy.BarbedShocker {
 
     public BarbedShocker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java b/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java
index 223848924a..9a0ed51ae9 100644
--- a/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java
+++ b/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java
@@ -38,7 +38,7 @@ public class BogardanHellkite extends mage.sets.magic2010.BogardanHellkite {
 
     public BogardanHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "TSP";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/timespiral/BogardanRager.java b/Mage.Sets/src/mage/sets/timespiral/BogardanRager.java
index b92b615f59..44abea725c 100644
--- a/Mage.Sets/src/mage/sets/timespiral/BogardanRager.java
+++ b/Mage.Sets/src/mage/sets/timespiral/BogardanRager.java
@@ -37,7 +37,7 @@ public class BogardanRager extends mage.sets.planechase.BogardanRager {
 
     public BogardanRager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/BrineElemental.java b/Mage.Sets/src/mage/sets/timespiral/BrineElemental.java
index 57ad815cf2..ca26bb6c40 100644
--- a/Mage.Sets/src/mage/sets/timespiral/BrineElemental.java
+++ b/Mage.Sets/src/mage/sets/timespiral/BrineElemental.java
@@ -37,7 +37,7 @@ public class BrineElemental extends mage.sets.commander2014.BrineElemental {
 
     public BrineElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/Cancel.java b/Mage.Sets/src/mage/sets/timespiral/Cancel.java
index 577a3ee02f..9174a34ecf 100644
--- a/Mage.Sets/src/mage/sets/timespiral/Cancel.java
+++ b/Mage.Sets/src/mage/sets/timespiral/Cancel.java
@@ -37,7 +37,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/CelestialCrusader.java b/Mage.Sets/src/mage/sets/timespiral/CelestialCrusader.java
index 2f34f67f50..56b89dbb46 100644
--- a/Mage.Sets/src/mage/sets/timespiral/CelestialCrusader.java
+++ b/Mage.Sets/src/mage/sets/timespiral/CelestialCrusader.java
@@ -37,7 +37,7 @@ public class CelestialCrusader extends mage.sets.elspethvstezzeret.CelestialCrus
 
     public CelestialCrusader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java b/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java
index f2d29a770c..61dfa08ff5 100644
--- a/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java
+++ b/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java
@@ -38,7 +38,7 @@ public class ChromaticStar extends mage.sets.tenthedition.ChromaticStar {
 
     public ChromaticStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "TSP";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java b/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java
index 87e1290029..d602369229 100644
--- a/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java
+++ b/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java
@@ -37,7 +37,7 @@ public class CoalStoker extends mage.sets.sorinvstibalt.CoalStoker {
 
     public CoalStoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/CoralTrickster.java b/Mage.Sets/src/mage/sets/timespiral/CoralTrickster.java
index c94f376cbe..fddc1c8718 100644
--- a/Mage.Sets/src/mage/sets/timespiral/CoralTrickster.java
+++ b/Mage.Sets/src/mage/sets/timespiral/CoralTrickster.java
@@ -37,7 +37,7 @@ public class CoralTrickster extends mage.sets.speedvscunning.CoralTrickster {
 
     public CoralTrickster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/DreadshipReef.java b/Mage.Sets/src/mage/sets/timespiral/DreadshipReef.java
index 54502506f4..8218db1d07 100644
--- a/Mage.Sets/src/mage/sets/timespiral/DreadshipReef.java
+++ b/Mage.Sets/src/mage/sets/timespiral/DreadshipReef.java
@@ -37,7 +37,7 @@ public class DreadshipReef extends mage.sets.commander.DreadshipReef {
 
     public DreadshipReef(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/DreamStalker.java b/Mage.Sets/src/mage/sets/timespiral/DreamStalker.java
index af941bd242..ba38500dfd 100644
--- a/Mage.Sets/src/mage/sets/timespiral/DreamStalker.java
+++ b/Mage.Sets/src/mage/sets/timespiral/DreamStalker.java
@@ -37,7 +37,7 @@ public class DreamStalker extends mage.sets.jacevsvraska.DreamStalker {
 
     public DreamStalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/sets/timespiral/EndrekSahrMasterBreeder.java
index 03972d9e6f..45fd0dc26d 100644
--- a/Mage.Sets/src/mage/sets/timespiral/EndrekSahrMasterBreeder.java
+++ b/Mage.Sets/src/mage/sets/timespiral/EndrekSahrMasterBreeder.java
@@ -37,7 +37,7 @@ public class EndrekSahrMasterBreeder extends mage.sets.commander2013.EndrekSahrM
 
     public EndrekSahrMasterBreeder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/FathomSeer.java b/Mage.Sets/src/mage/sets/timespiral/FathomSeer.java
index 62b75d7116..fdac4a5cf3 100644
--- a/Mage.Sets/src/mage/sets/timespiral/FathomSeer.java
+++ b/Mage.Sets/src/mage/sets/timespiral/FathomSeer.java
@@ -37,7 +37,7 @@ public class FathomSeer extends mage.sets.jacevschandra.FathomSeer {
 
     public FathomSeer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/FledglingMawcor.java b/Mage.Sets/src/mage/sets/timespiral/FledglingMawcor.java
index d7a13270bb..370fff1894 100644
--- a/Mage.Sets/src/mage/sets/timespiral/FledglingMawcor.java
+++ b/Mage.Sets/src/mage/sets/timespiral/FledglingMawcor.java
@@ -37,7 +37,7 @@ public class FledglingMawcor extends mage.sets.jacevschandra.FledglingMawcor {
 
     public FledglingMawcor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/FoolsDemise.java b/Mage.Sets/src/mage/sets/timespiral/FoolsDemise.java
index ead8e2adba..1c25b49b9d 100644
--- a/Mage.Sets/src/mage/sets/timespiral/FoolsDemise.java
+++ b/Mage.Sets/src/mage/sets/timespiral/FoolsDemise.java
@@ -37,7 +37,7 @@ public class FoolsDemise extends mage.sets.commander2014.FoolsDemise {
 
     public FoolsDemise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/FungalReaches.java b/Mage.Sets/src/mage/sets/timespiral/FungalReaches.java
index 03c08f2e2d..8916ab7240 100644
--- a/Mage.Sets/src/mage/sets/timespiral/FungalReaches.java
+++ b/Mage.Sets/src/mage/sets/timespiral/FungalReaches.java
@@ -37,7 +37,7 @@ public class FungalReaches extends mage.sets.commander.FungalReaches {
 
     public FungalReaches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/sets/timespiral/IbHalfheartGoblinTactician.java
index 1a0de22898..0eb55df3e2 100644
--- a/Mage.Sets/src/mage/sets/timespiral/IbHalfheartGoblinTactician.java
+++ b/Mage.Sets/src/mage/sets/timespiral/IbHalfheartGoblinTactician.java
@@ -37,7 +37,7 @@ public class IbHalfheartGoblinTactician extends mage.sets.elvesvsgoblins.IbHalfh
 
     public IbHalfheartGoblinTactician(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/Ixidron.java b/Mage.Sets/src/mage/sets/timespiral/Ixidron.java
index b50cafca52..c2ca2e4e97 100644
--- a/Mage.Sets/src/mage/sets/timespiral/Ixidron.java
+++ b/Mage.Sets/src/mage/sets/timespiral/Ixidron.java
@@ -37,7 +37,7 @@ public class Ixidron extends mage.sets.commander2014.Ixidron {
 
     public Ixidron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/KherKeep.java b/Mage.Sets/src/mage/sets/timespiral/KherKeep.java
index 987d735621..a4d38769e1 100644
--- a/Mage.Sets/src/mage/sets/timespiral/KherKeep.java
+++ b/Mage.Sets/src/mage/sets/timespiral/KherKeep.java
@@ -37,7 +37,7 @@ public class KherKeep extends mage.sets.commander2013.KherKeep {
 
     public KherKeep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/MagusOfTheMirror.java b/Mage.Sets/src/mage/sets/timespiral/MagusOfTheMirror.java
index 135184f14f..76e4915368 100644
--- a/Mage.Sets/src/mage/sets/timespiral/MagusOfTheMirror.java
+++ b/Mage.Sets/src/mage/sets/timespiral/MagusOfTheMirror.java
@@ -37,7 +37,7 @@ public class MagusOfTheMirror extends mage.sets.conspiracy.MagusOfTheMirror {
 
     public MagusOfTheMirror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/MoltenSlagheap.java b/Mage.Sets/src/mage/sets/timespiral/MoltenSlagheap.java
index 57861a4b80..50516ae574 100644
--- a/Mage.Sets/src/mage/sets/timespiral/MoltenSlagheap.java
+++ b/Mage.Sets/src/mage/sets/timespiral/MoltenSlagheap.java
@@ -37,7 +37,7 @@ public class MoltenSlagheap extends mage.sets.commander2013.MoltenSlagheap {
 
     public MoltenSlagheap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/OrcishCannonade.java b/Mage.Sets/src/mage/sets/timespiral/OrcishCannonade.java
index cc94f8ad71..2aff5dc83b 100644
--- a/Mage.Sets/src/mage/sets/timespiral/OrcishCannonade.java
+++ b/Mage.Sets/src/mage/sets/timespiral/OrcishCannonade.java
@@ -37,7 +37,7 @@ public class OrcishCannonade extends mage.sets.speedvscunning.OrcishCannonade {
 
     public OrcishCannonade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 172;
+        this.cardNumber = "172";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/PenumbraSpider.java b/Mage.Sets/src/mage/sets/timespiral/PenumbraSpider.java
index 3c8ae84874..065e4a44d5 100644
--- a/Mage.Sets/src/mage/sets/timespiral/PenumbraSpider.java
+++ b/Mage.Sets/src/mage/sets/timespiral/PenumbraSpider.java
@@ -37,7 +37,7 @@ public class PenumbraSpider extends mage.sets.planechase2012.PenumbraSpider {
 
     public PenumbraSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/PhyrexianTotem.java b/Mage.Sets/src/mage/sets/timespiral/PhyrexianTotem.java
index 9231c2a809..8e40c99405 100644
--- a/Mage.Sets/src/mage/sets/timespiral/PhyrexianTotem.java
+++ b/Mage.Sets/src/mage/sets/timespiral/PhyrexianTotem.java
@@ -37,7 +37,7 @@ public class PhyrexianTotem extends mage.sets.phyrexiavsthecoalition.PhyrexianTo
 
     public PhyrexianTotem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/ReturnToDust.java b/Mage.Sets/src/mage/sets/timespiral/ReturnToDust.java
index 03629fbe3b..82ad936eaa 100644
--- a/Mage.Sets/src/mage/sets/timespiral/ReturnToDust.java
+++ b/Mage.Sets/src/mage/sets/timespiral/ReturnToDust.java
@@ -37,7 +37,7 @@ public class ReturnToDust extends mage.sets.commander.ReturnToDust {
 
     public ReturnToDust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/SaltcrustedSteppe.java b/Mage.Sets/src/mage/sets/timespiral/SaltcrustedSteppe.java
index d7b6eb58c0..e464cf7633 100644
--- a/Mage.Sets/src/mage/sets/timespiral/SaltcrustedSteppe.java
+++ b/Mage.Sets/src/mage/sets/timespiral/SaltcrustedSteppe.java
@@ -37,7 +37,7 @@ public class SaltcrustedSteppe extends mage.sets.commander2013.SaltcrustedSteppe
 
     public SaltcrustedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/Smallpox.java b/Mage.Sets/src/mage/sets/timespiral/Smallpox.java
index a2895e5f24..93f9c2c447 100644
--- a/Mage.Sets/src/mage/sets/timespiral/Smallpox.java
+++ b/Mage.Sets/src/mage/sets/timespiral/Smallpox.java
@@ -37,7 +37,7 @@ public class Smallpox extends mage.sets.magic2012.Smallpox {
 
     public Smallpox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java b/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java
index fb8de84eab..0ea5daa119 100644
--- a/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java
+++ b/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java
@@ -37,7 +37,7 @@ public class StranglingSoot extends mage.sets.sorinvstibalt.StranglingSoot {
 
     public StranglingSoot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/timespiral/TendrilsOfCorruption.java
index d833f1d37b..89c0cd206e 100644
--- a/Mage.Sets/src/mage/sets/timespiral/TendrilsOfCorruption.java
+++ b/Mage.Sets/src/mage/sets/timespiral/TendrilsOfCorruption.java
@@ -37,7 +37,7 @@ public class TendrilsOfCorruption extends mage.sets.magic2010.TendrilsOfCorrupti
 
     public TendrilsOfCorruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/timespiral/TerramorphicExpanse.java
index 2b5412d137..059b9c65f2 100644
--- a/Mage.Sets/src/mage/sets/timespiral/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/timespiral/TerramorphicExpanse.java
@@ -37,7 +37,7 @@ public class TerramorphicExpanse extends mage.sets.tenthedition.TerramorphicExpa
 
     public TerramorphicExpanse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/ThinkTwice.java b/Mage.Sets/src/mage/sets/timespiral/ThinkTwice.java
index 62f06913c1..4f22fb3d89 100644
--- a/Mage.Sets/src/mage/sets/timespiral/ThinkTwice.java
+++ b/Mage.Sets/src/mage/sets/timespiral/ThinkTwice.java
@@ -37,7 +37,7 @@ public class ThinkTwice extends mage.sets.innistrad.ThinkTwice {
 
     public ThinkTwice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/UndyingRage.java b/Mage.Sets/src/mage/sets/timespiral/UndyingRage.java
index 9a9b1fb5a8..52e944953b 100644
--- a/Mage.Sets/src/mage/sets/timespiral/UndyingRage.java
+++ b/Mage.Sets/src/mage/sets/timespiral/UndyingRage.java
@@ -37,7 +37,7 @@ public class UndyingRage extends mage.sets.heroesvsmonsters.UndyingRage {
 
     public UndyingRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/VoidmageHusher.java b/Mage.Sets/src/mage/sets/timespiral/VoidmageHusher.java
index f74b44b3dc..8e35790227 100644
--- a/Mage.Sets/src/mage/sets/timespiral/VoidmageHusher.java
+++ b/Mage.Sets/src/mage/sets/timespiral/VoidmageHusher.java
@@ -38,7 +38,7 @@ public class VoidmageHusher extends mage.sets.mediainserts.VoidmageHusher {
 
     public VoidmageHusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "TSP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/timespiral/WordOfSeizing.java b/Mage.Sets/src/mage/sets/timespiral/WordOfSeizing.java
index a1b8eebdec..90bd0e2d06 100644
--- a/Mage.Sets/src/mage/sets/timespiral/WordOfSeizing.java
+++ b/Mage.Sets/src/mage/sets/timespiral/WordOfSeizing.java
@@ -37,7 +37,7 @@ public class WordOfSeizing extends mage.sets.commander2014.WordOfSeizing {
 
     public WordOfSeizing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 188;
+        this.cardNumber = "188";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/YavimayaDryad.java b/Mage.Sets/src/mage/sets/timespiral/YavimayaDryad.java
index 751d29864f..892792c9a4 100644
--- a/Mage.Sets/src/mage/sets/timespiral/YavimayaDryad.java
+++ b/Mage.Sets/src/mage/sets/timespiral/YavimayaDryad.java
@@ -37,7 +37,7 @@ public class YavimayaDryad extends mage.sets.archenemy.YavimayaDryad {
 
     public YavimayaDryad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "TSP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/AmbassadorLaquatus.java b/Mage.Sets/src/mage/sets/torment/AmbassadorLaquatus.java
index 81b3528439..389e347129 100644
--- a/Mage.Sets/src/mage/sets/torment/AmbassadorLaquatus.java
+++ b/Mage.Sets/src/mage/sets/torment/AmbassadorLaquatus.java
@@ -37,7 +37,7 @@ public class AmbassadorLaquatus extends mage.sets.tenthedition.AmbassadorLaquatu
 
     public AmbassadorLaquatus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/Breakthrough.java b/Mage.Sets/src/mage/sets/torment/Breakthrough.java
index 471a2b6270..98f1e95f00 100644
--- a/Mage.Sets/src/mage/sets/torment/Breakthrough.java
+++ b/Mage.Sets/src/mage/sets/torment/Breakthrough.java
@@ -37,7 +37,7 @@ public class Breakthrough extends mage.sets.conspiracy.Breakthrough {
 
     public Breakthrough(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/CabalCoffers.java b/Mage.Sets/src/mage/sets/torment/CabalCoffers.java
index bf676fa7af..4b63d07e1e 100644
--- a/Mage.Sets/src/mage/sets/torment/CabalCoffers.java
+++ b/Mage.Sets/src/mage/sets/torment/CabalCoffers.java
@@ -37,7 +37,7 @@ public class CabalCoffers extends mage.sets.planechase.CabalCoffers {
 
     public CabalCoffers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/ChainersEdict.java b/Mage.Sets/src/mage/sets/torment/ChainersEdict.java
index 9b62b97b15..d8c57f6fb5 100644
--- a/Mage.Sets/src/mage/sets/torment/ChainersEdict.java
+++ b/Mage.Sets/src/mage/sets/torment/ChainersEdict.java
@@ -38,7 +38,7 @@ public class ChainersEdict extends mage.sets.vintagemasters.ChainersEdict {
 
     public ChainersEdict(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "TOR";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/torment/FacelessButcher.java b/Mage.Sets/src/mage/sets/torment/FacelessButcher.java
index 2c295c3be1..1e26a8a5b8 100644
--- a/Mage.Sets/src/mage/sets/torment/FacelessButcher.java
+++ b/Mage.Sets/src/mage/sets/torment/FacelessButcher.java
@@ -38,7 +38,7 @@ public class FacelessButcher extends mage.sets.timeshifted.FacelessButcher {
 
     public FacelessButcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "TOR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/torment/FieryTemper.java b/Mage.Sets/src/mage/sets/torment/FieryTemper.java
index 64fffaffc1..c9f28ccd92 100644
--- a/Mage.Sets/src/mage/sets/torment/FieryTemper.java
+++ b/Mage.Sets/src/mage/sets/torment/FieryTemper.java
@@ -39,7 +39,7 @@ public class FieryTemper extends mage.sets.timeshifted.FieryTemper {
 
     public FieryTemper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "TOR";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/torment/GhostlyWings.java b/Mage.Sets/src/mage/sets/torment/GhostlyWings.java
index 1318ea0d97..af18a1cf4a 100644
--- a/Mage.Sets/src/mage/sets/torment/GhostlyWings.java
+++ b/Mage.Sets/src/mage/sets/torment/GhostlyWings.java
@@ -37,7 +37,7 @@ public class GhostlyWings extends mage.sets.shadowsoverinnistrad.GhostlyWings {
 
     public GhostlyWings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/GrimLavamancer.java b/Mage.Sets/src/mage/sets/torment/GrimLavamancer.java
index 55062b0faf..98e8b36511 100644
--- a/Mage.Sets/src/mage/sets/torment/GrimLavamancer.java
+++ b/Mage.Sets/src/mage/sets/torment/GrimLavamancer.java
@@ -37,7 +37,7 @@ public class GrimLavamancer extends mage.sets.magic2012.GrimLavamancer {
 
     public GrimLavamancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/MindSludge.java b/Mage.Sets/src/mage/sets/torment/MindSludge.java
index d106d9c5f9..fc1c095af8 100644
--- a/Mage.Sets/src/mage/sets/torment/MindSludge.java
+++ b/Mage.Sets/src/mage/sets/torment/MindSludge.java
@@ -37,7 +37,7 @@ public class MindSludge extends mage.sets.zendikar.MindSludge {
 
     public MindSludge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/MortalCombat.java b/Mage.Sets/src/mage/sets/torment/MortalCombat.java
index 0d7f31f0af..5b85a7cb76 100644
--- a/Mage.Sets/src/mage/sets/torment/MortalCombat.java
+++ b/Mage.Sets/src/mage/sets/torment/MortalCombat.java
@@ -37,7 +37,7 @@ public class MortalCombat extends mage.sets.tenthedition.MortalCombat {
 
     public MortalCombat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/Mutilate.java b/Mage.Sets/src/mage/sets/torment/Mutilate.java
index bc44389618..0a34314c58 100644
--- a/Mage.Sets/src/mage/sets/torment/Mutilate.java
+++ b/Mage.Sets/src/mage/sets/torment/Mutilate.java
@@ -37,7 +37,7 @@ public class Mutilate extends mage.sets.magic2013.Mutilate {
 
     public Mutilate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/NantukoShade.java b/Mage.Sets/src/mage/sets/torment/NantukoShade.java
index 81a320a66a..5c11fe1cfc 100644
--- a/Mage.Sets/src/mage/sets/torment/NantukoShade.java
+++ b/Mage.Sets/src/mage/sets/torment/NantukoShade.java
@@ -37,7 +37,7 @@ public class NantukoShade extends mage.sets.magic2011.NantukoShade {
 
     public NantukoShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/PayNoHeed.java b/Mage.Sets/src/mage/sets/torment/PayNoHeed.java
index 0d40d1cd9d..215cffaaab 100644
--- a/Mage.Sets/src/mage/sets/torment/PayNoHeed.java
+++ b/Mage.Sets/src/mage/sets/torment/PayNoHeed.java
@@ -37,7 +37,7 @@ public class PayNoHeed extends mage.sets.magic2014.PayNoHeed {
 
     public PayNoHeed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/Plagiarize.java b/Mage.Sets/src/mage/sets/torment/Plagiarize.java
index 5f2203f69b..09bfe4b031 100644
--- a/Mage.Sets/src/mage/sets/torment/Plagiarize.java
+++ b/Mage.Sets/src/mage/sets/torment/Plagiarize.java
@@ -37,7 +37,7 @@ public class Plagiarize extends mage.sets.ninthedition.Plagiarize {
 
     public Plagiarize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/SengirVampire.java b/Mage.Sets/src/mage/sets/torment/SengirVampire.java
index e5d28ccfe3..41fb7020c0 100644
--- a/Mage.Sets/src/mage/sets/torment/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/torment/SengirVampire.java
@@ -37,7 +37,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/SickeningDreams.java b/Mage.Sets/src/mage/sets/torment/SickeningDreams.java
index 84c6861543..762c554b8f 100644
--- a/Mage.Sets/src/mage/sets/torment/SickeningDreams.java
+++ b/Mage.Sets/src/mage/sets/torment/SickeningDreams.java
@@ -37,7 +37,7 @@ public class SickeningDreams extends mage.sets.pdsgraveborn.SickeningDreams {
 
     public SickeningDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/TaintedIsle.java b/Mage.Sets/src/mage/sets/torment/TaintedIsle.java
index 74f2ef32fd..43e936d576 100644
--- a/Mage.Sets/src/mage/sets/torment/TaintedIsle.java
+++ b/Mage.Sets/src/mage/sets/torment/TaintedIsle.java
@@ -37,7 +37,7 @@ public class TaintedIsle extends mage.sets.planechase2012.TaintedIsle {
 
     public TaintedIsle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/TerohsFaithful.java b/Mage.Sets/src/mage/sets/torment/TerohsFaithful.java
index 539aed222b..d6ccb78bf5 100644
--- a/Mage.Sets/src/mage/sets/torment/TerohsFaithful.java
+++ b/Mage.Sets/src/mage/sets/torment/TerohsFaithful.java
@@ -37,7 +37,7 @@ public class TerohsFaithful extends mage.sets.vintagemasters.TerohsFaithful {
 
     public TerohsFaithful(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "TOR";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/AinokTracker.java b/Mage.Sets/src/mage/sets/uginsfate/AinokTracker.java
index 7b1a4c3e8b..0ec33da9f2 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/AinokTracker.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/AinokTracker.java
@@ -37,7 +37,7 @@ public class AinokTracker extends mage.sets.khansoftarkir.AinokTracker {
 
     public AinokTracker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/AltarOfTheBrood.java b/Mage.Sets/src/mage/sets/uginsfate/AltarOfTheBrood.java
index 711314e60c..24e90573fc 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/AltarOfTheBrood.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/AltarOfTheBrood.java
@@ -37,7 +37,7 @@ public class AltarOfTheBrood extends mage.sets.khansoftarkir.AltarOfTheBrood {
 
     public AltarOfTheBrood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/ArashinWarBeast.java b/Mage.Sets/src/mage/sets/uginsfate/ArashinWarBeast.java
index 47bb6e6d28..08c3ba3d90 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/ArashinWarBeast.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/ArashinWarBeast.java
@@ -37,7 +37,7 @@ public class ArashinWarBeast extends mage.sets.fatereforged.ArashinWarBeast {
 
     public ArashinWarBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/ArcLightning.java b/Mage.Sets/src/mage/sets/uginsfate/ArcLightning.java
index 71c10596dc..79e6c23067 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/ArcLightning.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/ArcLightning.java
@@ -38,7 +38,7 @@ public class ArcLightning extends mage.sets.urzassaga.ArcLightning {
 
     public ArcLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "UGIN";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/uginsfate/BribersPurse.java b/Mage.Sets/src/mage/sets/uginsfate/BribersPurse.java
index d1b043da92..3f089ede5c 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/BribersPurse.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/BribersPurse.java
@@ -37,7 +37,7 @@ public class BribersPurse extends mage.sets.khansoftarkir.BribersPurse {
 
     public BribersPurse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/DebilitatingInjury.java b/Mage.Sets/src/mage/sets/uginsfate/DebilitatingInjury.java
index bd96e03c58..fe27bbdfc4 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/DebilitatingInjury.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/DebilitatingInjury.java
@@ -37,7 +37,7 @@ public class DebilitatingInjury extends mage.sets.khansoftarkir.DebilitatingInju
 
     public DebilitatingInjury(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/DragonscaleBoon.java b/Mage.Sets/src/mage/sets/uginsfate/DragonscaleBoon.java
index 95776623f6..2de75f0898 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/DragonscaleBoon.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/DragonscaleBoon.java
@@ -37,7 +37,7 @@ public class DragonscaleBoon extends mage.sets.khansoftarkir.DragonscaleBoon {
 
     public DragonscaleBoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/FierceInvocation.java b/Mage.Sets/src/mage/sets/uginsfate/FierceInvocation.java
index 4125c9e3c1..c9f9d3b232 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/FierceInvocation.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/FierceInvocation.java
@@ -37,7 +37,7 @@ public class FierceInvocation extends mage.sets.fatereforged.FierceInvocation {
 
     public FierceInvocation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/FormlessNurturing.java b/Mage.Sets/src/mage/sets/uginsfate/FormlessNurturing.java
index ba50a6fc06..96437af884 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/FormlessNurturing.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/FormlessNurturing.java
@@ -37,7 +37,7 @@ public class FormlessNurturing extends mage.sets.fatereforged.FormlessNurturing
 
     public FormlessNurturing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/GhostfireBlade.java b/Mage.Sets/src/mage/sets/uginsfate/GhostfireBlade.java
index 4245e1754c..a7e850eaa9 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/GhostfireBlade.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/GhostfireBlade.java
@@ -37,7 +37,7 @@ public class GhostfireBlade extends mage.sets.khansoftarkir.GhostfireBlade {
 
     public GhostfireBlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/GrimHaruspex.java b/Mage.Sets/src/mage/sets/uginsfate/GrimHaruspex.java
index eed27094b5..e609e8c396 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/GrimHaruspex.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/GrimHaruspex.java
@@ -37,7 +37,7 @@ public class GrimHaruspex extends mage.sets.khansoftarkir.GrimHaruspex {
 
     public GrimHaruspex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/HewedStoneRetainers.java b/Mage.Sets/src/mage/sets/uginsfate/HewedStoneRetainers.java
index 4c49ecaa24..bb1c9330fc 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/HewedStoneRetainers.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/HewedStoneRetainers.java
@@ -37,7 +37,7 @@ public class HewedStoneRetainers extends mage.sets.fatereforged.HewedStoneRetain
 
     public HewedStoneRetainers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/JeeringInstigator.java b/Mage.Sets/src/mage/sets/uginsfate/JeeringInstigator.java
index c8239f2bf0..3bf7fec9af 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/JeeringInstigator.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/JeeringInstigator.java
@@ -37,7 +37,7 @@ public class JeeringInstigator extends mage.sets.khansoftarkir.JeeringInstigator
 
     public JeeringInstigator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/JeskaiInfiltrator.java b/Mage.Sets/src/mage/sets/uginsfate/JeskaiInfiltrator.java
index 0752f22f4e..968f71d7d5 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/JeskaiInfiltrator.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/JeskaiInfiltrator.java
@@ -37,7 +37,7 @@ public class JeskaiInfiltrator extends mage.sets.fatereforged.JeskaiInfiltrator
 
     public JeskaiInfiltrator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/MasteryOfTheUnseen.java b/Mage.Sets/src/mage/sets/uginsfate/MasteryOfTheUnseen.java
index a855a83c8b..891488d9e9 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/MasteryOfTheUnseen.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/MasteryOfTheUnseen.java
@@ -37,7 +37,7 @@ public class MasteryOfTheUnseen extends mage.sets.fatereforged.MasteryOfTheUnsee
 
     public MasteryOfTheUnseen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/MysticOfTheHiddenWay.java b/Mage.Sets/src/mage/sets/uginsfate/MysticOfTheHiddenWay.java
index 1629614025..772db81b33 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/MysticOfTheHiddenWay.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/MysticOfTheHiddenWay.java
@@ -37,7 +37,7 @@ public class MysticOfTheHiddenWay extends mage.sets.khansoftarkir.MysticOfTheHid
 
     public MysticOfTheHiddenWay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/RealityShift.java b/Mage.Sets/src/mage/sets/uginsfate/RealityShift.java
index a8d406146f..8154a85ed9 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/RealityShift.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/RealityShift.java
@@ -37,7 +37,7 @@ public class RealityShift extends mage.sets.fatereforged.RealityShift {
 
     public RealityShift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/RuthlessRipper.java b/Mage.Sets/src/mage/sets/uginsfate/RuthlessRipper.java
index f7c0be08b1..380e86146b 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/RuthlessRipper.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/RuthlessRipper.java
@@ -37,7 +37,7 @@ public class RuthlessRipper extends mage.sets.khansoftarkir.RuthlessRipper {
 
     public RuthlessRipper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/uginsfate/SmiteTheMonstrous.java
index bd022cc682..ab75290e64 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/SmiteTheMonstrous.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/SmiteTheMonstrous.java
@@ -37,7 +37,7 @@ public class SmiteTheMonstrous extends mage.sets.innistrad.SmiteTheMonstrous {
 
     public SmiteTheMonstrous(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/SoulSummons.java b/Mage.Sets/src/mage/sets/uginsfate/SoulSummons.java
index 2ed2f1d57b..cbd7d17611 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/SoulSummons.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/SoulSummons.java
@@ -37,7 +37,7 @@ public class SoulSummons extends mage.sets.fatereforged.SoulSummons {
 
     public SoulSummons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/SultaiEmissary.java b/Mage.Sets/src/mage/sets/uginsfate/SultaiEmissary.java
index a7351689a8..89180056b7 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/SultaiEmissary.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/SultaiEmissary.java
@@ -37,7 +37,7 @@ public class SultaiEmissary extends mage.sets.fatereforged.SultaiEmissary {
 
     public SultaiEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/UginTheSpiritDragon.java b/Mage.Sets/src/mage/sets/uginsfate/UginTheSpiritDragon.java
index 115fe3b22c..61345567d1 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/UginTheSpiritDragon.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/UginTheSpiritDragon.java
@@ -37,7 +37,7 @@ public class UginTheSpiritDragon extends mage.sets.fatereforged.UginTheSpiritDra
 
     public UginTheSpiritDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/UginsConstruct.java b/Mage.Sets/src/mage/sets/uginsfate/UginsConstruct.java
index 06a37bd92a..2ed5fd588d 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/UginsConstruct.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/UginsConstruct.java
@@ -37,7 +37,7 @@ public class UginsConstruct extends mage.sets.fatereforged.UginsConstruct {
 
     public UginsConstruct(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/WatcherOfTheRoost.java b/Mage.Sets/src/mage/sets/uginsfate/WatcherOfTheRoost.java
index 2b6239ddc7..f6b3066abd 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/WatcherOfTheRoost.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/WatcherOfTheRoost.java
@@ -37,7 +37,7 @@ public class WatcherOfTheRoost extends mage.sets.khansoftarkir.WatcherOfTheRoost
 
     public WatcherOfTheRoost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/Wildcall.java b/Mage.Sets/src/mage/sets/uginsfate/Wildcall.java
index e65b6aef50..e0afbe5946 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/Wildcall.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/Wildcall.java
@@ -37,7 +37,7 @@ public class Wildcall extends mage.sets.fatereforged.Wildcall {
 
     public Wildcall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/uginsfate/WriteIntoBeing.java b/Mage.Sets/src/mage/sets/uginsfate/WriteIntoBeing.java
index 30bac9b67e..2ac73f4966 100644
--- a/Mage.Sets/src/mage/sets/uginsfate/WriteIntoBeing.java
+++ b/Mage.Sets/src/mage/sets/uginsfate/WriteIntoBeing.java
@@ -37,7 +37,7 @@ public class WriteIntoBeing extends mage.sets.fatereforged.WriteIntoBeing {
 
     public WriteIntoBeing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "UGIN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/AirElemental.java b/Mage.Sets/src/mage/sets/unlimitededition/AirElemental.java
index c8f16b5774..5869c134db 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/AirElemental.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/AirElemental.java
@@ -37,7 +37,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental {
 
     public AirElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/AncestralRecall.java b/Mage.Sets/src/mage/sets/unlimitededition/AncestralRecall.java
index 337afcf884..0d1f7b6f83 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/AncestralRecall.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/AncestralRecall.java
@@ -37,7 +37,7 @@ public class AncestralRecall extends mage.sets.limitedalpha.AncestralRecall {
 
     public AncestralRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/AnimateDead.java b/Mage.Sets/src/mage/sets/unlimitededition/AnimateDead.java
index aa2cb37ccb..e9c21ce4a4 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/AnimateWall.java b/Mage.Sets/src/mage/sets/unlimitededition/AnimateWall.java
index dec176f2d1..582d91697f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/AnimateWall.java
@@ -37,7 +37,7 @@ public class AnimateWall extends mage.sets.limitedalpha.AnimateWall {
 
     public AnimateWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/unlimitededition/AnkhOfMishra.java
index bdcd6dffb3..048beaa75f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/AnkhOfMishra.java
@@ -38,7 +38,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Armageddon.java b/Mage.Sets/src/mage/sets/unlimitededition/Armageddon.java
index 71c7f48d4d..3c0fa1d404 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Armageddon.java
@@ -37,7 +37,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/AspectOfWolf.java b/Mage.Sets/src/mage/sets/unlimitededition/AspectOfWolf.java
index 573a26ac7a..f1d05d4c31 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/AspectOfWolf.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/AspectOfWolf.java
@@ -38,7 +38,7 @@ public class AspectOfWolf extends mage.sets.limitedalpha.AspectOfWolf {
 
     public AspectOfWolf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 93;
+        this.cardNumber = "93";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BadMoon.java b/Mage.Sets/src/mage/sets/unlimitededition/BadMoon.java
index 8ef0fdf847..dee88596ff 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BadMoon.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BadMoon.java
@@ -37,7 +37,7 @@ public class BadMoon extends mage.sets.fifthedition.BadMoon {
 
     public BadMoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Badlands.java b/Mage.Sets/src/mage/sets/unlimitededition/Badlands.java
index 4ad0d954d1..38b222682a 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Badlands.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Badlands.java
@@ -37,7 +37,7 @@ public class Badlands extends mage.sets.limitedalpha.Badlands {
 
     public Badlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Balance.java b/Mage.Sets/src/mage/sets/unlimitededition/Balance.java
index 42e2ba5f34..4205b2fd7c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Balance.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Balance.java
@@ -37,7 +37,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BasaltMonolith.java b/Mage.Sets/src/mage/sets/unlimitededition/BasaltMonolith.java
index b492412da4..337b0af58d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BasaltMonolith.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BasaltMonolith.java
@@ -37,7 +37,7 @@ public class BasaltMonolith extends mage.sets.limitedalpha.BasaltMonolith {
 
     public BasaltMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Bayou.java b/Mage.Sets/src/mage/sets/unlimitededition/Bayou.java
index f86203dd1c..e1acd75b30 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Bayou.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Bayou.java
@@ -37,7 +37,7 @@ public class Bayou extends mage.sets.limitedalpha.Bayou {
 
     public Bayou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Berserk.java b/Mage.Sets/src/mage/sets/unlimitededition/Berserk.java
index a4e12e76d5..677d277887 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Berserk.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Berserk.java
@@ -37,7 +37,7 @@ public class Berserk extends mage.sets.limitedalpha.Berserk {
 
     public Berserk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/unlimitededition/BirdsOfParadise.java
index 96663888ca..aaa35323e8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BirdsOfParadise.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BirdsOfParadise.java
@@ -37,7 +37,7 @@ public class BirdsOfParadise extends mage.sets.tenthedition.BirdsOfParadise {
 
     public BirdsOfParadise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BlackKnight.java b/Mage.Sets/src/mage/sets/unlimitededition/BlackKnight.java
index 550eb4e0f4..d7655d68bc 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BlackKnight.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BlackKnight.java
@@ -37,7 +37,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight {
 
     public BlackKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BlackLotus.java b/Mage.Sets/src/mage/sets/unlimitededition/BlackLotus.java
index 50b6b3282c..18034a8e44 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BlackLotus.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BlackLotus.java
@@ -37,7 +37,7 @@ public class BlackLotus extends mage.sets.limitedalpha.BlackLotus {
 
     public BlackLotus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BlackVise.java b/Mage.Sets/src/mage/sets/unlimitededition/BlackVise.java
index 963bb0f46b..1547dc2d59 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BlackVise.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BlackVise.java
@@ -37,7 +37,7 @@ public class BlackVise extends mage.sets.limitedalpha.BlackVise {
 
     public BlackVise(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BlackWard.java b/Mage.Sets/src/mage/sets/unlimitededition/BlackWard.java
index 831c8a480b..fb58f13ba1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BlackWard.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BlackWard.java
@@ -37,7 +37,7 @@ public class BlackWard extends mage.sets.revisededition.BlackWard {
 
     public BlackWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Blessing.java b/Mage.Sets/src/mage/sets/unlimitededition/Blessing.java
index ae4e94a0dd..4114a5fd11 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Blessing.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Blessing.java
@@ -37,7 +37,7 @@ public class Blessing extends mage.sets.fourthedition.Blessing {
 
     public Blessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/unlimitededition/BlueElementalBlast.java
index ca6c114102..0ec17d336b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BlueElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BlueElementalBlast.java
@@ -37,7 +37,7 @@ public class BlueElementalBlast extends mage.sets.limitedalpha.BlueElementalBlas
 
     public BlueElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/BogWraith.java b/Mage.Sets/src/mage/sets/unlimitededition/BogWraith.java
index 2909478ab7..9bb1d69986 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/BogWraith.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/BogWraith.java
@@ -37,7 +37,7 @@ public class BogWraith extends mage.sets.magic2010.BogWraith {
 
     public BogWraith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Braingeyser.java b/Mage.Sets/src/mage/sets/unlimitededition/Braingeyser.java
index 24e2fb6074..0083269aa2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Braingeyser.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Braingeyser.java
@@ -38,7 +38,7 @@ public class Braingeyser extends mage.sets.limitedalpha.Braingeyser {
 
     public Braingeyser(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Burrowing.java b/Mage.Sets/src/mage/sets/unlimitededition/Burrowing.java
index 0b997bd8d8..0dd5fa9c49 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Burrowing.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Burrowing.java
@@ -38,7 +38,7 @@ public class Burrowing extends mage.sets.limitedalpha.Burrowing {
 
     public Burrowing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Castle.java b/Mage.Sets/src/mage/sets/unlimitededition/Castle.java
index a66dc10c23..32ee581472 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Castle.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Castle.java
@@ -38,7 +38,7 @@ public class Castle extends mage.sets.limitedalpha.Castle {
 
     public Castle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CelestialPrism.java b/Mage.Sets/src/mage/sets/unlimitededition/CelestialPrism.java
index 711af60e1a..e81a96a8ba 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CelestialPrism.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CelestialPrism.java
@@ -37,7 +37,7 @@ public class CelestialPrism extends mage.sets.limitedalpha.CelestialPrism {
 
     public CelestialPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Channel.java b/Mage.Sets/src/mage/sets/unlimitededition/Channel.java
index 570e7c942c..0249fd81d4 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Channel.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Channel.java
@@ -37,7 +37,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Chaoslace.java b/Mage.Sets/src/mage/sets/unlimitededition/Chaoslace.java
index b42abd03c4..be0fac38c5 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Chaoslace.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Chaoslace.java
@@ -37,7 +37,7 @@ public class Chaoslace extends mage.sets.fourthedition.Chaoslace {
 
     public Chaoslace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlack.java
index 23d2a2c9ae..29be249b70 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlack.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlack.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlack extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionBlack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlue.java
index 0e6eab4a07..6375dec962 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlue.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionBlue.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionBlue extends mage.sets.iceage.CircleOfProtectionB
 
     public CircleOfProtectionBlue(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionGreen.java
index 6d0e62f8f0..30344db5ea 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionGreen.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionGreen.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionGreen extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionGreen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionRed.java
index e0387e4823..d544a72f41 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionRed.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionRed.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionRed extends mage.sets.iceage.CircleOfProtectionRe
 
     public CircleOfProtectionRed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionWhite.java
index e184a296d4..9a60bb79a9 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionWhite.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CircleOfProtectionWhite.java
@@ -37,7 +37,7 @@ public class CircleOfProtectionWhite extends mage.sets.iceage.CircleOfProtection
 
     public CircleOfProtectionWhite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ClockworkBeast.java b/Mage.Sets/src/mage/sets/unlimitededition/ClockworkBeast.java
index 29b7727707..6876bf3801 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ClockworkBeast.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ClockworkBeast.java
@@ -37,7 +37,7 @@ public class ClockworkBeast extends mage.sets.limitedalpha.ClockworkBeast {
 
     public ClockworkBeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Clone.java b/Mage.Sets/src/mage/sets/unlimitededition/Clone.java
index d90c30a6f0..b64a1c30ef 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Clone.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Clone.java
@@ -38,7 +38,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Cockatrice.java b/Mage.Sets/src/mage/sets/unlimitededition/Cockatrice.java
index c01fb7d5e6..9271df37bb 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Cockatrice.java
@@ -37,7 +37,7 @@ public class Cockatrice extends mage.sets.limitedalpha.Cockatrice {
 
     public Cockatrice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Conservator.java b/Mage.Sets/src/mage/sets/unlimitededition/Conservator.java
index b2a5fb4f06..91987d15f7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Conservator.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Conservator.java
@@ -38,7 +38,7 @@ public class Conservator extends mage.sets.limitedalpha.Conservator {
 
     public Conservator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ControlMagic.java b/Mage.Sets/src/mage/sets/unlimitededition/ControlMagic.java
index 57e598bfaf..b753177463 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Conversion.java b/Mage.Sets/src/mage/sets/unlimitededition/Conversion.java
index 4764f8f241..505f09cae6 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Conversion.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Conversion.java
@@ -37,7 +37,7 @@ public class Conversion extends mage.sets.limitedalpha.Conversion {
 
     public Conversion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CopperTablet.java b/Mage.Sets/src/mage/sets/unlimitededition/CopperTablet.java
index 6d226a5f50..f733efa2ce 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CopperTablet.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CopperTablet.java
@@ -38,7 +38,7 @@ public class CopperTablet extends mage.sets.limitedalpha.CopperTablet {
 
     public CopperTablet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CopyArtifact.java b/Mage.Sets/src/mage/sets/unlimitededition/CopyArtifact.java
index 41f7d7db46..b17d4b5819 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CopyArtifact.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CopyArtifact.java
@@ -38,7 +38,7 @@ public class CopyArtifact extends mage.sets.limitedalpha.CopyArtifact {
 
     public CopyArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java b/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java
index 9398e1a18e..f7a54dfdc3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java
@@ -38,7 +38,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CrawWurm.java b/Mage.Sets/src/mage/sets/unlimitededition/CrawWurm.java
index 23cf812d15..8975145f7d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CrawWurm.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CrawWurm.java
@@ -37,7 +37,7 @@ public class CrawWurm extends mage.sets.tenthedition.CrawWurm {
 
     public CrawWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Crusade.java b/Mage.Sets/src/mage/sets/unlimitededition/Crusade.java
index 51617b1533..5b4335722f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Crusade.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Crusade.java
@@ -37,7 +37,7 @@ public class Crusade extends mage.sets.elspethvstezzeret.Crusade {
 
     public Crusade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 201;
+        this.cardNumber = "201";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CrystalRod.java b/Mage.Sets/src/mage/sets/unlimitededition/CrystalRod.java
index ee672c4d36..c875350497 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CrystalRod.java
@@ -38,7 +38,7 @@ public class CrystalRod extends mage.sets.limitedalpha.CrystalRod {
 
     public CrystalRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/CursedLand.java b/Mage.Sets/src/mage/sets/unlimitededition/CursedLand.java
index f0f9a37f86..88d9bb4445 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/CursedLand.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/CursedLand.java
@@ -37,7 +37,7 @@ public class CursedLand extends mage.sets.fourthedition.CursedLand {
 
     public CursedLand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DarkRitual.java b/Mage.Sets/src/mage/sets/unlimitededition/DarkRitual.java
index c65bc12f79..8486f8d9eb 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DeathWard.java b/Mage.Sets/src/mage/sets/unlimitededition/DeathWard.java
index 9de0c35798..3658b34366 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DeathWard.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DeathWard.java
@@ -38,7 +38,7 @@ public class DeathWard extends mage.sets.limitedalpha.DeathWard {
 
     public DeathWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Deathgrip.java b/Mage.Sets/src/mage/sets/unlimitededition/Deathgrip.java
index e1c2830df7..4beb6edb5e 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Deathgrip.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Deathgrip.java
@@ -37,7 +37,7 @@ public class Deathgrip extends mage.sets.limitedbeta.Deathgrip {
 
     public Deathgrip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Deathlace.java b/Mage.Sets/src/mage/sets/unlimitededition/Deathlace.java
index 6dd2d54e01..4e90aaa4cf 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Deathlace.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Deathlace.java
@@ -37,7 +37,7 @@ public class Deathlace extends mage.sets.limitedbeta.Deathlace {
 
     public Deathlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DemonicHordes.java b/Mage.Sets/src/mage/sets/unlimitededition/DemonicHordes.java
index b9789b0110..65ed3eb03b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DemonicHordes.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DemonicHordes.java
@@ -37,7 +37,7 @@ public class DemonicHordes extends mage.sets.limitedalpha.DemonicHordes {
 
     public DemonicHordes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DemonicTutor.java b/Mage.Sets/src/mage/sets/unlimitededition/DemonicTutor.java
index 3f6bf6de71..d79d3c4494 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DemonicTutor.java
@@ -38,7 +38,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DingusEgg.java b/Mage.Sets/src/mage/sets/unlimitededition/DingusEgg.java
index 4eaa3c696a..875ced9d28 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DingusEgg.java
@@ -37,7 +37,7 @@ public class DingusEgg extends mage.sets.limitedalpha.DingusEgg {
 
     public DingusEgg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Disenchant.java b/Mage.Sets/src/mage/sets/unlimitededition/Disenchant.java
index a91d902fb0..bc30b4be58 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Disenchant.java
@@ -37,7 +37,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Disintegrate.java b/Mage.Sets/src/mage/sets/unlimitededition/Disintegrate.java
index 30510f6f50..5d5c0316a1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Disintegrate.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Disintegrate.java
@@ -37,7 +37,7 @@ public class Disintegrate extends mage.sets.limitedalpha.Disintegrate {
 
     public Disintegrate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/unlimitededition/DisruptingScepter.java
index 3d65f2b216..51b769de66 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DisruptingScepter.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DisruptingScepter.java
@@ -37,7 +37,7 @@ public class DisruptingScepter extends mage.sets.seventhedition.DisruptingScepte
 
     public DisruptingScepter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DragonWhelp.java b/Mage.Sets/src/mage/sets/unlimitededition/DragonWhelp.java
index 1b02da7eb4..27cbe27868 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DragonWhelp.java
@@ -37,7 +37,7 @@ public class DragonWhelp extends mage.sets.magic2010.DragonWhelp {
 
     public DragonWhelp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DrainLife.java b/Mage.Sets/src/mage/sets/unlimitededition/DrainLife.java
index 51259a9a7c..62cb940501 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DrainLife.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DrainLife.java
@@ -38,7 +38,7 @@ public class DrainLife extends mage.sets.limitedalpha.DrainLife {
 
     public DrainLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/unlimitededition/DrudgeSkeletons.java
index 90d222305e..e4a2a907b8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DrudgeSkeletons.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DrudgeSkeletons.java
@@ -37,7 +37,7 @@ public class DrudgeSkeletons extends mage.sets.magic2010.DrudgeSkeletons {
 
     public DrudgeSkeletons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/sets/unlimitededition/DwarvenDemolitionTeam.java
index 781e53d2f6..3b187a19b2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DwarvenDemolitionTeam.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DwarvenDemolitionTeam.java
@@ -37,7 +37,7 @@ public class DwarvenDemolitionTeam extends mage.sets.eighthedition.DwarvenDemoli
 
     public DwarvenDemolitionTeam(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/DwarvenWarriors.java b/Mage.Sets/src/mage/sets/unlimitededition/DwarvenWarriors.java
index 07b65d9487..00df5d0db2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/DwarvenWarriors.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/DwarvenWarriors.java
@@ -37,7 +37,7 @@ public class DwarvenWarriors extends mage.sets.revisededition.DwarvenWarriors {
 
     public DwarvenWarriors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/EarthElemental.java b/Mage.Sets/src/mage/sets/unlimitededition/EarthElemental.java
index e723c56c8b..3e6087a8ee 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/EarthElemental.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/EarthElemental.java
@@ -37,7 +37,7 @@ public class EarthElemental extends mage.sets.tenthedition.EarthElemental {
 
     public EarthElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Earthbind.java b/Mage.Sets/src/mage/sets/unlimitededition/Earthbind.java
index 2fcc8ef65f..79432dc7b3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Earthbind.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Earthbind.java
@@ -37,7 +37,7 @@ public class Earthbind extends mage.sets.limitedbeta.Earthbind {
 
     public Earthbind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Earthquake.java b/Mage.Sets/src/mage/sets/unlimitededition/Earthquake.java
index a527a4e1dc..decbeeb43c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Earthquake.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Earthquake.java
@@ -37,7 +37,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake {
 
     public Earthquake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 147;
+        this.cardNumber = "147";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ElvishArchers.java b/Mage.Sets/src/mage/sets/unlimitededition/ElvishArchers.java
index 3756f9f5e6..0f5d3c5de8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ElvishArchers.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ElvishArchers.java
@@ -37,7 +37,7 @@ public class ElvishArchers extends mage.sets.fifthedition.ElvishArchers {
 
     public ElvishArchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java b/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java
index 4d6ddd8113..f71c9fd694 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java
@@ -38,7 +38,7 @@ public class EvilPresence extends mage.sets.newphyrexia.EvilPresence {
 
     public EvilPresence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fastbond.java b/Mage.Sets/src/mage/sets/unlimitededition/Fastbond.java
index 0db9b605cd..9818f00b27 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Fastbond.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Fastbond.java
@@ -37,7 +37,7 @@ public class Fastbond extends mage.sets.limitedalpha.Fastbond {
 
     public Fastbond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fear.java b/Mage.Sets/src/mage/sets/unlimitededition/Fear.java
index 2e3a4f34e7..2e489993f4 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Fear.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Fear.java
@@ -37,7 +37,7 @@ public class Fear extends mage.sets.tenthedition.Fear {
 
     public Fear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Feedback.java b/Mage.Sets/src/mage/sets/unlimitededition/Feedback.java
index 7b60a151ea..d6e713db31 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Feedback.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Feedback.java
@@ -37,7 +37,7 @@ public class Feedback extends mage.sets.limitedalpha.Feedback {
 
     public Feedback(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java b/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java
index 6168b21a65..b7a2f1ab6a 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java
@@ -38,7 +38,7 @@ public class FireElemental extends mage.sets.magic2013.FireElemental {
 
     public FireElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java b/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java
index 71638251a6..19f2748215 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java
@@ -38,7 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball {
 
     public Fireball(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Firebreathing.java b/Mage.Sets/src/mage/sets/unlimitededition/Firebreathing.java
index d11f662f64..98c6257632 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Firebreathing.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Firebreathing.java
@@ -37,7 +37,7 @@ public class Firebreathing extends mage.sets.magic2012.Firebreathing {
 
     public Firebreathing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Flashfires.java b/Mage.Sets/src/mage/sets/unlimitededition/Flashfires.java
index 630c859c29..930999defa 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Flashfires.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Flashfires.java
@@ -37,7 +37,7 @@ public class Flashfires extends mage.sets.fifthedition.Flashfires {
 
     public Flashfires(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Flight.java b/Mage.Sets/src/mage/sets/unlimitededition/Flight.java
index 2d3b4ec70a..a464e8b2e4 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Flight.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Flight.java
@@ -37,7 +37,7 @@ public class Flight extends mage.sets.magic2012.Flight {
 
     public Flight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fog.java b/Mage.Sets/src/mage/sets/unlimitededition/Fog.java
index d100c30cf5..1bd46e3168 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Fog.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Fog.java
@@ -37,7 +37,7 @@ public class Fog extends mage.sets.magic2010.Fog {
 
     public Fog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ForceOfNature.java b/Mage.Sets/src/mage/sets/unlimitededition/ForceOfNature.java
index 885d396022..643f7fd2ff 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ForceOfNature.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ForceOfNature.java
@@ -37,7 +37,7 @@ public class ForceOfNature extends mage.sets.fourthedition.ForceOfNature {
 
     public ForceOfNature(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 103;
+        this.cardNumber = "103";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Forcefield.java b/Mage.Sets/src/mage/sets/unlimitededition/Forcefield.java
index f91d69dfe0..8db1b153ca 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Forcefield.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Forcefield.java
@@ -37,7 +37,7 @@ public class Forcefield extends mage.sets.mastersedition.Forcefield {
 
     public Forcefield(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fork.java b/Mage.Sets/src/mage/sets/unlimitededition/Fork.java
index 9e5a7d922a..28edf1ff53 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Fork.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Fork.java
@@ -37,7 +37,7 @@ public class Fork extends mage.sets.limitedbeta.Fork {
 
     public Fork(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/FrozenShade.java b/Mage.Sets/src/mage/sets/unlimitededition/FrozenShade.java
index c03e6c38c8..6e54f06387 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/FrozenShade.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/FrozenShade.java
@@ -38,7 +38,7 @@ public class FrozenShade extends mage.sets.limitedalpha.FrozenShade {
 
     public FrozenShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fungusaur.java b/Mage.Sets/src/mage/sets/unlimitededition/Fungusaur.java
index 024ec18684..ea45dad8fd 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Fungusaur.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Fungusaur.java
@@ -37,7 +37,7 @@ public class Fungusaur extends mage.sets.limitedalpha.Fungusaur {
 
     public Fungusaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GauntletOfMight.java b/Mage.Sets/src/mage/sets/unlimitededition/GauntletOfMight.java
index 5928dd4891..3fc011171b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GauntletOfMight.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GauntletOfMight.java
@@ -37,7 +37,7 @@ public class GauntletOfMight extends mage.sets.limitedalpha.GauntletOfMight {
 
     public GauntletOfMight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GiantGrowth.java b/Mage.Sets/src/mage/sets/unlimitededition/GiantGrowth.java
index 4af930f8b4..bb67e05ba2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GiantGrowth.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GiantGrowth.java
@@ -37,7 +37,7 @@ public class GiantGrowth extends mage.sets.tenthedition.GiantGrowth {
 
     public GiantGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GiantSpider.java b/Mage.Sets/src/mage/sets/unlimitededition/GiantSpider.java
index 67bcd0575a..8a3dd2221c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GiantSpider.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GiantSpider.java
@@ -37,7 +37,7 @@ public class GiantSpider extends mage.sets.tenthedition.GiantSpider {
 
     public GiantSpider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/unlimitededition/GlassesOfUrza.java
index da4c28463e..51ab4a0b85 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GlassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GlassesOfUrza.java
@@ -37,7 +37,7 @@ public class GlassesOfUrza extends mage.sets.limitedalpha.GlassesOfUrza {
 
     public GlassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 246;
+        this.cardNumber = "246";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Gloom.java b/Mage.Sets/src/mage/sets/unlimitededition/Gloom.java
index 72019addea..be6b732531 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Gloom.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Gloom.java
@@ -37,7 +37,7 @@ public class Gloom extends mage.sets.limitedalpha.Gloom {
 
     public Gloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java
index aab0cb266f..5c56b47809 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java
@@ -38,7 +38,7 @@ public class GoblinBalloonBrigade extends mage.sets.magic2011.GoblinBalloonBriga
 
     public GoblinBalloonBrigade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GoblinKing.java b/Mage.Sets/src/mage/sets/unlimitededition/GoblinKing.java
index 3e62d6c01a..c3790f2016 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GoblinKing.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GoblinKing.java
@@ -37,7 +37,7 @@ public class GoblinKing extends mage.sets.tenthedition.GoblinKing {
 
     public GoblinKing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GraniteGargoyle.java b/Mage.Sets/src/mage/sets/unlimitededition/GraniteGargoyle.java
index 93f2032201..259ed42fd0 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GraniteGargoyle.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GraniteGargoyle.java
@@ -37,7 +37,7 @@ public class GraniteGargoyle extends mage.sets.revisededition.GraniteGargoyle {
 
     public GraniteGargoyle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GrayOgre.java b/Mage.Sets/src/mage/sets/unlimitededition/GrayOgre.java
index cd0beacfcb..271bac0103 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GrayOgre.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GrayOgre.java
@@ -37,7 +37,7 @@ public class GrayOgre extends mage.sets.fourthedition.GrayOgre {
 
     public GrayOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/unlimitededition/GrizzlyBears.java
index 3ccd6f9e5e..9bcd393917 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/GrizzlyBears.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/GrizzlyBears.java
@@ -37,7 +37,7 @@ public class GrizzlyBears extends mage.sets.tenthedition.GrizzlyBears {
 
     public GrizzlyBears(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 108;
+        this.cardNumber = "108";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HealingSalve.java b/Mage.Sets/src/mage/sets/unlimitededition/HealingSalve.java
index c6a254fbb0..fd69c8532f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HillGiant.java b/Mage.Sets/src/mage/sets/unlimitededition/HillGiant.java
index 894472cc21..129db1ac65 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HillGiant.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HillGiant.java
@@ -37,7 +37,7 @@ public class HillGiant extends mage.sets.tenthedition.HillGiant {
 
     public HillGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HolyArmor.java b/Mage.Sets/src/mage/sets/unlimitededition/HolyArmor.java
index 3bd8fe8736..40a63ac8e3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HolyArmor.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HolyArmor.java
@@ -37,7 +37,7 @@ public class HolyArmor extends mage.sets.fourthedition.HolyArmor {
 
     public HolyArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 208;
+        this.cardNumber = "208";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HolyStrength.java b/Mage.Sets/src/mage/sets/unlimitededition/HolyStrength.java
index 7258e252cb..fe96bb5235 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HolyStrength.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HolyStrength.java
@@ -37,7 +37,7 @@ public class HolyStrength extends mage.sets.tenthedition.HolyStrength {
 
     public HolyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/unlimitededition/HowlFromBeyond.java
index e90b3c0d26..a7aa8ca1b2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HowlFromBeyond.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HowlFromBeyond.java
@@ -38,7 +38,7 @@ public class HowlFromBeyond extends mage.sets.limitedalpha.HowlFromBeyond {
 
     public HowlFromBeyond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HowlingMine.java b/Mage.Sets/src/mage/sets/unlimitededition/HowlingMine.java
index 012af7d205..b7a9920cee 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HowlingMine.java
@@ -37,7 +37,7 @@ public class HowlingMine extends mage.sets.magic2010.HowlingMine {
 
     public HowlingMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 248;
+        this.cardNumber = "248";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/unlimitededition/HurloonMinotaur.java
index d2483d7c9f..9b92a161d7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HurloonMinotaur.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HurloonMinotaur.java
@@ -37,7 +37,7 @@ public class HurloonMinotaur extends mage.sets.fifthedition.HurloonMinotaur {
 
     public HurloonMinotaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Hurricane.java b/Mage.Sets/src/mage/sets/unlimitededition/Hurricane.java
index 59a1d95734..33e1566eba 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Hurricane.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Hurricane.java
@@ -37,7 +37,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane {
 
     public Hurricane(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java
index 0e883fbaf4..3fd3a62873 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java
@@ -38,7 +38,7 @@ public class HypnoticSpecter extends mage.sets.magic2010.HypnoticSpecter {
 
     public HypnoticSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IceStorm.java b/Mage.Sets/src/mage/sets/unlimitededition/IceStorm.java
index bdef575a73..3fec50abfc 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IceStorm.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IceStorm.java
@@ -37,7 +37,7 @@ public class IceStorm extends mage.sets.limitedalpha.IceStorm {
 
     public IceStorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IcyManipulator.java b/Mage.Sets/src/mage/sets/unlimitededition/IcyManipulator.java
index 332cdf0d62..5e871911e1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IcyManipulator.java
@@ -37,7 +37,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
 
     public IcyManipulator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/InstillEnergy.java b/Mage.Sets/src/mage/sets/unlimitededition/InstillEnergy.java
index bc4265aae0..8158800dd2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/InstillEnergy.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/InstillEnergy.java
@@ -37,7 +37,7 @@ public class InstillEnergy extends mage.sets.fifthedition.InstillEnergy {
 
     public InstillEnergy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 111;
+        this.cardNumber = "111";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Invisibility.java b/Mage.Sets/src/mage/sets/unlimitededition/Invisibility.java
index d770f0d30c..b821f2b27b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Invisibility.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Invisibility.java
@@ -37,7 +37,7 @@ public class Invisibility extends mage.sets.limitedalpha.Invisibility {
 
     public Invisibility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IronStar.java b/Mage.Sets/src/mage/sets/unlimitededition/IronStar.java
index ef79c81a5c..4787a4debd 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IronStar.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IronStar.java
@@ -38,7 +38,7 @@ public class IronStar extends mage.sets.limitedalpha.IronStar {
 
     public IronStar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IronclawOrcs.java b/Mage.Sets/src/mage/sets/unlimitededition/IronclawOrcs.java
index 55363dde10..24184c2f6f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IronclawOrcs.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IronclawOrcs.java
@@ -37,7 +37,7 @@ public class IronclawOrcs extends mage.sets.limitedalpha.IronclawOrcs {
 
     public IronclawOrcs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/unlimitededition/IronrootTreefolk.java
index 1ba8fd12f0..43b08773b3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IronrootTreefolk.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IronrootTreefolk.java
@@ -37,7 +37,7 @@ public class IronrootTreefolk extends mage.sets.fifthedition.IronrootTreefolk {
 
     public IronrootTreefolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IslandSanctuary.java b/Mage.Sets/src/mage/sets/unlimitededition/IslandSanctuary.java
index fee8ca453f..2b27a8ba74 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IslandSanctuary.java
@@ -37,7 +37,7 @@ public class IslandSanctuary extends mage.sets.limitedalpha.IslandSanctuary {
 
     public IslandSanctuary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/IvoryCup.java b/Mage.Sets/src/mage/sets/unlimitededition/IvoryCup.java
index cf1482bb89..22e9db029d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/IvoryCup.java
@@ -38,7 +38,7 @@ public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
 
     public IvoryCup(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/JadeMonolith.java b/Mage.Sets/src/mage/sets/unlimitededition/JadeMonolith.java
index 21ecba3a42..3ec4c2b100 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/JadeMonolith.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/JadeMonolith.java
@@ -37,7 +37,7 @@ public class JadeMonolith extends mage.sets.limitedalpha.JadeMonolith {
 
     public JadeMonolith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/unlimitededition/JayemdaeTome.java
index 01536aba88..f0e8c290f9 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/JayemdaeTome.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/JayemdaeTome.java
@@ -37,7 +37,7 @@ public class JayemdaeTome extends mage.sets.tenthedition.JayemdaeTome {
 
     public JayemdaeTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Juggernaut.java b/Mage.Sets/src/mage/sets/unlimitededition/Juggernaut.java
index 0bee554b18..5f86d0db2c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Juggernaut.java
@@ -37,7 +37,7 @@ public class Juggernaut extends mage.sets.tenthedition.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 256;
+        this.cardNumber = "256";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Jump.java b/Mage.Sets/src/mage/sets/unlimitededition/Jump.java
index e9ebde6394..6466c395ef 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Jump.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Jump.java
@@ -37,7 +37,7 @@ public class Jump extends mage.sets.magic2010.Jump {
 
     public Jump(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Karma.java b/Mage.Sets/src/mage/sets/unlimitededition/Karma.java
index ba53aa8bab..3ce420216a 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Karma.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Karma.java
@@ -37,7 +37,7 @@ public class Karma extends mage.sets.fifthedition.Karma {
 
     public Karma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/KormusBell.java b/Mage.Sets/src/mage/sets/unlimitededition/KormusBell.java
index 40910569d7..7c92caaa4f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/KormusBell.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/KormusBell.java
@@ -38,7 +38,7 @@ public class KormusBell extends mage.sets.limitedalpha.KormusBell {
 
     public KormusBell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lance.java b/Mage.Sets/src/mage/sets/unlimitededition/Lance.java
index da6cf8e812..11b7a6d3b7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Lance.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Lance.java
@@ -37,7 +37,7 @@ public class Lance extends mage.sets.limitedalpha.Lance {
 
     public Lance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LeyDruid.java b/Mage.Sets/src/mage/sets/unlimitededition/LeyDruid.java
index 60427ea7e4..733e9113e9 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LeyDruid.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LeyDruid.java
@@ -38,7 +38,7 @@ public class LeyDruid extends mage.sets.limitedalpha.LeyDruid {
 
     public LeyDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LibraryOfLeng.java b/Mage.Sets/src/mage/sets/unlimitededition/LibraryOfLeng.java
index c975657aab..1766d62138 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LibraryOfLeng.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LibraryOfLeng.java
@@ -37,7 +37,7 @@ public class LibraryOfLeng extends mage.sets.limitedbeta.LibraryOfLeng {
 
     public LibraryOfLeng(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 258;
+        this.cardNumber = "258";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lich.java b/Mage.Sets/src/mage/sets/unlimitededition/Lich.java
index 078e6c2eca..e8c6740f52 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Lich.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Lich.java
@@ -37,7 +37,7 @@ public class Lich extends mage.sets.masterseditioniv.Lich {
 
     public Lich(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lifeforce.java b/Mage.Sets/src/mage/sets/unlimitededition/Lifeforce.java
index 8c6e7d9a27..1423fd516f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Lifeforce.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Lifeforce.java
@@ -38,7 +38,7 @@ public class Lifeforce extends mage.sets.masterseditioniv.Lifeforce {
 
     public Lifeforce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lifelace.java b/Mage.Sets/src/mage/sets/unlimitededition/Lifelace.java
index d96ebdbe10..c3bb70d065 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Lifelace.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Lifelace.java
@@ -37,7 +37,7 @@ public class Lifelace extends mage.sets.limitedalpha.Lifelace {
 
     public Lifelace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lifetap.java b/Mage.Sets/src/mage/sets/unlimitededition/Lifetap.java
index 208729b20f..1edc402158 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Lifetap.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Lifetap.java
@@ -37,7 +37,7 @@ public class Lifetap extends mage.sets.fifthedition.Lifetap {
 
     public Lifetap(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LightningBolt.java b/Mage.Sets/src/mage/sets/unlimitededition/LightningBolt.java
index dec6d51281..7eea5271f8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LightningBolt.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LightningBolt.java
@@ -37,7 +37,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt {
 
     public LightningBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LivingArtifact.java b/Mage.Sets/src/mage/sets/unlimitededition/LivingArtifact.java
index 9a86e87f43..eb3b9c4739 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LivingArtifact.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LivingArtifact.java
@@ -37,7 +37,7 @@ public class LivingArtifact extends mage.sets.fifthedition.LivingArtifact {
 
     public LivingArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LivingLands.java b/Mage.Sets/src/mage/sets/unlimitededition/LivingLands.java
index 12c04c6c3f..e19722ad19 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LivingLands.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LivingLands.java
@@ -37,7 +37,7 @@ public class LivingLands extends mage.sets.limitedalpha.LivingLands {
 
     public LivingLands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LlanowarElves.java b/Mage.Sets/src/mage/sets/unlimitededition/LlanowarElves.java
index 31749160a7..0e3058b835 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LlanowarElves.java
@@ -37,7 +37,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/unlimitededition/LordOfAtlantis.java
index f1737385d7..126e4d6885 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LordOfAtlantis.java
@@ -37,7 +37,7 @@ public class LordOfAtlantis extends mage.sets.fifthedition.LordOfAtlantis {
 
     public LordOfAtlantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/LordOfThePit.java b/Mage.Sets/src/mage/sets/unlimitededition/LordOfThePit.java
index 5cbb31cdda..d89b695bf7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/LordOfThePit.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/LordOfThePit.java
@@ -38,7 +38,7 @@ public class LordOfThePit extends mage.sets.divinevsdemonic.LordOfThePit {
 
     public LordOfThePit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lure.java b/Mage.Sets/src/mage/sets/unlimitededition/Lure.java
index 1d59aa23f3..db8aeb20d7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Lure.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Lure.java
@@ -37,7 +37,7 @@ public class Lure extends mage.sets.championsofkamigawa.Lure {
 
     public Lure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/unlimitededition/MahamotiDjinn.java
index 10d7f3c93f..f92194ab07 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MahamotiDjinn.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MahamotiDjinn.java
@@ -37,7 +37,7 @@ public class MahamotiDjinn extends mage.sets.tenthedition.MahamotiDjinn {
 
     public MahamotiDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ManaFlare.java b/Mage.Sets/src/mage/sets/unlimitededition/ManaFlare.java
index 19bd7ac421..c4a7357630 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ManaFlare.java
@@ -37,7 +37,7 @@ public class ManaFlare extends mage.sets.fourthedition.ManaFlare {
 
     public ManaFlare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ManaShort.java b/Mage.Sets/src/mage/sets/unlimitededition/ManaShort.java
index 128c3b9346..291ef31e34 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ManaShort.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ManaShort.java
@@ -37,7 +37,7 @@ public class ManaShort extends mage.sets.limitedalpha.ManaShort {
 
     public ManaShort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ManaVault.java b/Mage.Sets/src/mage/sets/unlimitededition/ManaVault.java
index b05af7b24f..25524a863b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 260;
+        this.cardNumber = "260";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Manabarbs.java b/Mage.Sets/src/mage/sets/unlimitededition/Manabarbs.java
index 3c2d16212b..e0ccd77e35 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Manabarbs.java
@@ -37,7 +37,7 @@ public class Manabarbs extends mage.sets.tenthedition.Manabarbs {
 
     public Manabarbs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Meekstone.java b/Mage.Sets/src/mage/sets/unlimitededition/Meekstone.java
index 947fb3c77f..9d5f9182cd 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Meekstone.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Meekstone.java
@@ -37,7 +37,7 @@ public class Meekstone extends mage.sets.limitedalpha.Meekstone {
 
     public Meekstone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 261;
+        this.cardNumber = "261";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/unlimitededition/MerfolkOfThePearlTrident.java
index f0dfdbf026..fea7e85bf3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MerfolkOfThePearlTrident.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MerfolkOfThePearlTrident.java
@@ -37,7 +37,7 @@ public class MerfolkOfThePearlTrident extends mage.sets.fifthedition.MerfolkOfTh
 
     public MerfolkOfThePearlTrident(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MindTwist.java b/Mage.Sets/src/mage/sets/unlimitededition/MindTwist.java
index 8bb1c169a7..ff33ec6b56 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MindTwist.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MindTwist.java
@@ -37,7 +37,7 @@ public class MindTwist extends mage.sets.limitedalpha.MindTwist {
 
     public MindTwist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/unlimitededition/MonssGoblinRaiders.java
index 7b8f6db28b..a4ee4442f9 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MonssGoblinRaiders.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MonssGoblinRaiders.java
@@ -37,7 +37,7 @@ public class MonssGoblinRaiders extends mage.sets.fifthedition.MonssGoblinRaider
 
     public MonssGoblinRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MoxEmerald.java b/Mage.Sets/src/mage/sets/unlimitededition/MoxEmerald.java
index 9b36cf813c..4390d5aa84 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MoxEmerald.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MoxEmerald.java
@@ -37,7 +37,7 @@ public class MoxEmerald extends mage.sets.limitedalpha.MoxEmerald {
 
     public MoxEmerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MoxJet.java b/Mage.Sets/src/mage/sets/unlimitededition/MoxJet.java
index f51acb5378..601bdc7e74 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MoxJet.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MoxJet.java
@@ -37,7 +37,7 @@ public class MoxJet extends mage.sets.limitedalpha.MoxJet {
 
     public MoxJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MoxPearl.java b/Mage.Sets/src/mage/sets/unlimitededition/MoxPearl.java
index 4f7fe9f2da..c9f644aef8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MoxPearl.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MoxPearl.java
@@ -37,7 +37,7 @@ public class MoxPearl extends mage.sets.limitedalpha.MoxPearl {
 
     public MoxPearl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MoxRuby.java b/Mage.Sets/src/mage/sets/unlimitededition/MoxRuby.java
index 409d7b3183..9033517805 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MoxRuby.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MoxRuby.java
@@ -37,7 +37,7 @@ public class MoxRuby extends mage.sets.limitedalpha.MoxRuby {
 
     public MoxRuby(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 265;
+        this.cardNumber = "265";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/MoxSapphire.java b/Mage.Sets/src/mage/sets/unlimitededition/MoxSapphire.java
index 2c008da2e7..92ae7a23e7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/MoxSapphire.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/MoxSapphire.java
@@ -37,7 +37,7 @@ public class MoxSapphire extends mage.sets.limitedalpha.MoxSapphire {
 
     public MoxSapphire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java b/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java
index 1e2eb7f50a..3a28a49485 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java
@@ -38,7 +38,7 @@ public class NaturalSelection extends mage.sets.limitedalpha.NaturalSelection {
 
     public NaturalSelection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/NetherShadow.java b/Mage.Sets/src/mage/sets/unlimitededition/NetherShadow.java
index 8ce2044c29..5084cfb57d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/NetherShadow.java
@@ -37,7 +37,7 @@ public class NetherShadow extends mage.sets.limitedalpha.NetherShadow {
 
     public NetherShadow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/unlimitededition/NevinyrralsDisk.java
index 4016ee612e..c1e9504a33 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Nightmare.java b/Mage.Sets/src/mage/sets/unlimitededition/Nightmare.java
index 315a034987..bfd07dada0 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/NorthernPaladin.java b/Mage.Sets/src/mage/sets/unlimitededition/NorthernPaladin.java
index f14834adcf..68e2bf931f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/NorthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/NorthernPaladin.java
@@ -37,7 +37,7 @@ public class NorthernPaladin extends mage.sets.limitedalpha.NorthernPaladin {
 
     public NorthernPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java
index 6f34894bf5..c34a040407 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java
@@ -37,7 +37,7 @@ public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem {
 
     public ObsianusGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 268;
+        this.cardNumber = "268";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/unlimitededition/OrcishArtillery.java
index 24cf7e9c2b..0827df64d0 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/OrcishArtillery.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/OrcishArtillery.java
@@ -37,7 +37,7 @@ public class OrcishArtillery extends mage.sets.seventhedition.OrcishArtillery {
 
     public OrcishArtillery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/unlimitededition/OrcishOriflamme.java
index 54b64ad665..7ab3e01014 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/OrcishOriflamme.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/OrcishOriflamme.java
@@ -37,7 +37,7 @@ public class OrcishOriflamme extends mage.sets.limitedalpha.OrcishOriflamme {
 
     public OrcishOriflamme(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Paralyze.java b/Mage.Sets/src/mage/sets/unlimitededition/Paralyze.java
index ee4ace3bf1..87427e421f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PearledUnicorn.java b/Mage.Sets/src/mage/sets/unlimitededition/PearledUnicorn.java
index 3daf7ffe3e..7a0ba229e2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PearledUnicorn.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PearledUnicorn.java
@@ -37,7 +37,7 @@ public class PearledUnicorn extends mage.sets.fifthedition.PearledUnicorn {
 
     public PearledUnicorn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Pestilence.java b/Mage.Sets/src/mage/sets/unlimitededition/Pestilence.java
index c467a7c93f..842fae2dfe 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Pestilence.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Pestilence.java
@@ -37,7 +37,7 @@ public class Pestilence extends mage.sets.urzassaga.Pestilence {
 
     public Pestilence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java
index 61e5a4482d..392e14b610 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java
@@ -37,7 +37,7 @@ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
 
     public PhantasmalForces(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalTerrain.java
index 41a7a5b996..8ec19e7874 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalTerrain.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalTerrain.java
@@ -37,7 +37,7 @@ public class PhantasmalTerrain extends mage.sets.limitedalpha.PhantasmalTerrain
 
     public PhantasmalTerrain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PhantomMonster.java b/Mage.Sets/src/mage/sets/unlimitededition/PhantomMonster.java
index 26e84a6b44..64231fe1c5 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PhantomMonster.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PhantomMonster.java
@@ -37,7 +37,7 @@ public class PhantomMonster extends mage.sets.fifthedition.PhantomMonster {
 
     public PhantomMonster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PirateShip.java b/Mage.Sets/src/mage/sets/unlimitededition/PirateShip.java
index b0a628aeb5..501446ee09 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PirateShip.java
@@ -38,7 +38,7 @@ public class PirateShip extends mage.sets.limitedalpha.PirateShip {
 
     public PirateShip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Plateau.java b/Mage.Sets/src/mage/sets/unlimitededition/Plateau.java
index af95b1aea0..c6d4f59b39 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Plateau.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Plateau.java
@@ -37,7 +37,7 @@ public class Plateau extends mage.sets.limitedalpha.Plateau {
 
     public Plateau(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PowerSink.java b/Mage.Sets/src/mage/sets/unlimitededition/PowerSink.java
index 8f9505eed4..9d4932c4c0 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java
index 899da3e074..f9013ed1e6 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java
@@ -38,7 +38,7 @@ public class ProdigalSorcerer extends mage.sets.timeshifted.ProdigalSorcerer {
 
     public ProdigalSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java b/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java
index 430bc212d3..d9f8c4d3c0 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java
@@ -38,7 +38,7 @@ public class PsionicBlast extends mage.sets.timeshifted.PsionicBlast {
 
     public PsionicBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PsychicVenom.java b/Mage.Sets/src/mage/sets/unlimitededition/PsychicVenom.java
index 5115f6be1a..08cab502e6 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PsychicVenom.java
@@ -38,7 +38,7 @@ public class PsychicVenom extends mage.sets.limitedalpha.PsychicVenom {
 
     public PsychicVenom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/RaiseDead.java b/Mage.Sets/src/mage/sets/unlimitededition/RaiseDead.java
index 3a3a52d294..33b3ee34e0 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/RaiseDead.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/RaiseDead.java
@@ -37,7 +37,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead {
 
     public RaiseDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/RedElementalBlast.java b/Mage.Sets/src/mage/sets/unlimitededition/RedElementalBlast.java
index ed610a62c0..12a3726451 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/RedElementalBlast.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/RedElementalBlast.java
@@ -37,7 +37,7 @@ public class RedElementalBlast extends mage.sets.limitedalpha.RedElementalBlast
 
     public RedElementalBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/RedWard.java b/Mage.Sets/src/mage/sets/unlimitededition/RedWard.java
index d78b8c56e4..73e13fa109 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/RedWard.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/RedWard.java
@@ -37,7 +37,7 @@ public class RedWard extends mage.sets.revisededition.RedWard {
 
     public RedWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Regeneration.java b/Mage.Sets/src/mage/sets/unlimitededition/Regeneration.java
index c6e6a54080..9cc0b48c49 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Regeneration.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Regeneration.java
@@ -37,7 +37,7 @@ public class Regeneration extends mage.sets.iceage.Regeneration {
 
     public Regeneration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java b/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java
index 1ef6dbe38f..095fb0b894 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java
@@ -38,7 +38,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Resurrection.java b/Mage.Sets/src/mage/sets/unlimitededition/Resurrection.java
index d36e237c0c..75fe1ca3e3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Resurrection.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Resurrection.java
@@ -38,7 +38,7 @@ public class Resurrection extends mage.sets.limitedalpha.Resurrection {
 
     public Resurrection(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 219;
+        this.cardNumber = "219";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ReverseDamage.java b/Mage.Sets/src/mage/sets/unlimitededition/ReverseDamage.java
index ff94c4e5dc..5184fe14a9 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ReverseDamage.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ReverseDamage.java
@@ -37,7 +37,7 @@ public class ReverseDamage extends mage.sets.limitedalpha.ReverseDamage {
 
     public ReverseDamage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Righteousness.java b/Mage.Sets/src/mage/sets/unlimitededition/Righteousness.java
index 879c396730..964eee8e3f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Righteousness.java
@@ -37,7 +37,7 @@ public class Righteousness extends mage.sets.tenthedition.Righteousness {
 
     public Righteousness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/RocOfKherRidges.java b/Mage.Sets/src/mage/sets/unlimitededition/RocOfKherRidges.java
index 12f726b463..1ae6f429b1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/RocOfKherRidges.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/RocOfKherRidges.java
@@ -37,7 +37,7 @@ public class RocOfKherRidges extends mage.sets.limitedalpha.RocOfKherRidges {
 
     public RocOfKherRidges(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/RodOfRuin.java b/Mage.Sets/src/mage/sets/unlimitededition/RodOfRuin.java
index 45f58cf193..8fa50dc1ea 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/RodOfRuin.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/RodOfRuin.java
@@ -37,7 +37,7 @@ public class RodOfRuin extends mage.sets.tenthedition.RodOfRuin {
 
     public RodOfRuin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/RoyalAssassin.java b/Mage.Sets/src/mage/sets/unlimitededition/RoyalAssassin.java
index 40540c213e..a2f7cd581c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/RoyalAssassin.java
@@ -37,7 +37,7 @@ public class RoyalAssassin extends mage.sets.tenthedition.RoyalAssassin {
 
     public RoyalAssassin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SamiteHealer.java b/Mage.Sets/src/mage/sets/unlimitededition/SamiteHealer.java
index 1d300b1281..0d95e47162 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SamiteHealer.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SamiteHealer.java
@@ -37,7 +37,7 @@ public class SamiteHealer extends mage.sets.tenthedition.SamiteHealer {
 
     public SamiteHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Savannah.java b/Mage.Sets/src/mage/sets/unlimitededition/Savannah.java
index b22fa3b2f5..a6f85fa94e 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Savannah.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Savannah.java
@@ -37,7 +37,7 @@ public class Savannah extends mage.sets.limitedalpha.Savannah {
 
     public Savannah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SavannahLions.java b/Mage.Sets/src/mage/sets/unlimitededition/SavannahLions.java
index da6833d57c..f5b1ce47e1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SavannahLions.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SavannahLions.java
@@ -37,7 +37,7 @@ public class SavannahLions extends mage.sets.eighthedition.SavannahLions {
 
     public SavannahLions(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ScatheZombies.java b/Mage.Sets/src/mage/sets/unlimitededition/ScatheZombies.java
index 14a970b5cb..6c9aa97c30 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ScatheZombies.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ScatheZombies.java
@@ -37,7 +37,7 @@ public class ScatheZombies extends mage.sets.tenthedition.ScatheZombies {
 
     public ScatheZombies(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ScavengingGhoul.java b/Mage.Sets/src/mage/sets/unlimitededition/ScavengingGhoul.java
index ba08c96c04..d1f3d6b397 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ScavengingGhoul.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ScavengingGhoul.java
@@ -37,7 +37,7 @@ public class ScavengingGhoul extends mage.sets.limitedalpha.ScavengingGhoul {
 
     public ScavengingGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Scrubland.java b/Mage.Sets/src/mage/sets/unlimitededition/Scrubland.java
index 88a260d97e..58d2c58686 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Scrubland.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Scrubland.java
@@ -37,7 +37,7 @@ public class Scrubland extends mage.sets.limitedalpha.Scrubland {
 
     public Scrubland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ScrybSprites.java b/Mage.Sets/src/mage/sets/unlimitededition/ScrybSprites.java
index b9820ce611..dbc75e367f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ScrybSprites.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ScrybSprites.java
@@ -37,7 +37,7 @@ public class ScrybSprites extends mage.sets.fifthedition.ScrybSprites {
 
     public ScrybSprites(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SeaSerpent.java b/Mage.Sets/src/mage/sets/unlimitededition/SeaSerpent.java
index 150f44c081..c2990e1fd4 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SeaSerpent.java
@@ -38,7 +38,7 @@ public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
 
     public SeaSerpent(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java b/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java
index 455725de13..d66a291077 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java
@@ -37,7 +37,7 @@ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
 
     public SedgeTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java b/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java
index a8b6463fad..b06fc67f49 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java b/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java
index a885dfcca3..7e4b5ec6d2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java
@@ -38,7 +38,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/unlimitededition/ShanodinDryads.java
index 202e98e1b4..9221ad9394 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ShanodinDryads.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ShanodinDryads.java
@@ -37,7 +37,7 @@ public class ShanodinDryads extends mage.sets.fifthedition.ShanodinDryads {
 
     public ShanodinDryads(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Shatter.java b/Mage.Sets/src/mage/sets/unlimitededition/Shatter.java
index e71087a642..5dd899d21d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Shatter.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Shatter.java
@@ -37,7 +37,7 @@ public class Shatter extends mage.sets.mirrodin.Shatter {
 
     public Shatter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 174;
+        this.cardNumber = "174";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ShivanDragon.java b/Mage.Sets/src/mage/sets/unlimitededition/ShivanDragon.java
index 86e585409c..8a0a797d10 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 175;
+        this.cardNumber = "175";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Sinkhole.java b/Mage.Sets/src/mage/sets/unlimitededition/Sinkhole.java
index 0d2a31862e..9ce8c69581 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Sinkhole.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Sinkhole.java
@@ -37,7 +37,7 @@ public class Sinkhole extends mage.sets.limitedalpha.Sinkhole {
 
     public Sinkhole(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SirensCall.java b/Mage.Sets/src/mage/sets/unlimitededition/SirensCall.java
index 3a5e26c312..0bdf5b6615 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SirensCall.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SirensCall.java
@@ -37,7 +37,7 @@ public class SirensCall extends mage.sets.fourthedition.SirensCall {
 
     public SirensCall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java b/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java
index a346c3924e..43db83e4fe 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java
@@ -38,7 +38,7 @@ public class Smoke extends mage.sets.limitedalpha.Smoke {
 
     public Smoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SolRing.java b/Mage.Sets/src/mage/sets/unlimitededition/SolRing.java
index 6b643ef25c..a92243e077 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SolRing.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SolRing.java
@@ -37,7 +37,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SoulNet.java b/Mage.Sets/src/mage/sets/unlimitededition/SoulNet.java
index bbf4a3d707..f507c406f7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SoulNet.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SoulNet.java
@@ -37,7 +37,7 @@ public class SoulNet extends mage.sets.limitedalpha.SoulNet {
 
     public SoulNet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SpellBlast.java b/Mage.Sets/src/mage/sets/unlimitededition/SpellBlast.java
index f6935d132f..4869ada7ca 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SpellBlast.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SpellBlast.java
@@ -37,7 +37,7 @@ public class SpellBlast extends mage.sets.limitedalpha.SpellBlast {
 
     public SpellBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Stasis.java b/Mage.Sets/src/mage/sets/unlimitededition/Stasis.java
index 9bf387c77c..8d8480abf1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Stasis.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Stasis.java
@@ -37,7 +37,7 @@ public class Stasis extends mage.sets.fifthedition.Stasis {
 
     public Stasis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/StealArtifact.java b/Mage.Sets/src/mage/sets/unlimitededition/StealArtifact.java
index 4a3e7132d2..e12ab98db1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/StealArtifact.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/StealArtifact.java
@@ -37,7 +37,7 @@ public class StealArtifact extends mage.sets.seventhedition.StealArtifact {
 
     public StealArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/StoneGiant.java b/Mage.Sets/src/mage/sets/unlimitededition/StoneGiant.java
index 6ec33d9724..dfd276424a 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 177;
+        this.cardNumber = "177";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/StoneRain.java b/Mage.Sets/src/mage/sets/unlimitededition/StoneRain.java
index 3fd80c5ae6..7089f84082 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/StoneRain.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/StoneRain.java
@@ -37,7 +37,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain {
 
     public StoneRain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/StreamOfLife.java b/Mage.Sets/src/mage/sets/unlimitededition/StreamOfLife.java
index f48d80921a..ce5c047813 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/StreamOfLife.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/StreamOfLife.java
@@ -37,7 +37,7 @@ public class StreamOfLife extends mage.sets.seventhedition.StreamOfLife {
 
     public StreamOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SunglassesOfUrza.java b/Mage.Sets/src/mage/sets/unlimitededition/SunglassesOfUrza.java
index 122f95543f..fa588abcdd 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SunglassesOfUrza.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SunglassesOfUrza.java
@@ -37,7 +37,7 @@ public class SunglassesOfUrza extends mage.sets.limitedalpha.SunglassesOfUrza {
 
     public SunglassesOfUrza(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 272;
+        this.cardNumber = "272";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/unlimitededition/SwordsToPlowshares.java
index 393c59e386..8a14631933 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Taiga.java b/Mage.Sets/src/mage/sets/unlimitededition/Taiga.java
index c5456f0c60..c469f6f8c1 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Taiga.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Taiga.java
@@ -37,7 +37,7 @@ public class Taiga extends mage.sets.limitedalpha.Taiga {
 
     public Taiga(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Terror.java b/Mage.Sets/src/mage/sets/unlimitededition/Terror.java
index 03b0007529..a5c6ad29a8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Terror.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Terror.java
@@ -37,7 +37,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
 
     public Terror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/TheHive.java b/Mage.Sets/src/mage/sets/unlimitededition/TheHive.java
index 316909189e..1dd50f8f76 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/TheHive.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/TheHive.java
@@ -37,7 +37,7 @@ public class TheHive extends mage.sets.tenthedition.TheHive {
 
     public TheHive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/unlimitededition/ThicketBasilisk.java
index 3457f59fca..943ae30249 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ThicketBasilisk.java
@@ -37,7 +37,7 @@ public class ThicketBasilisk extends mage.sets.limitedalpha.ThicketBasilisk {
 
     public ThicketBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Thoughtlace.java b/Mage.Sets/src/mage/sets/unlimitededition/Thoughtlace.java
index e7fb6d3908..2206907221 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Thoughtlace.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Thoughtlace.java
@@ -37,7 +37,7 @@ public class Thoughtlace extends mage.sets.limitedbeta.Thoughtlace {
 
     public Thoughtlace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/unlimitededition/ThroneOfBone.java
index f5f3bbf050..75c708ec94 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ThroneOfBone.java
@@ -38,7 +38,7 @@ public class ThroneOfBone extends mage.sets.limitedalpha.ThroneOfBone {
 
     public ThroneOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/TimeWalk.java b/Mage.Sets/src/mage/sets/unlimitededition/TimeWalk.java
index 1cbb65bfd2..d521b4114f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/TimeWalk.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/TimeWalk.java
@@ -37,7 +37,7 @@ public class TimeWalk extends mage.sets.limitedalpha.TimeWalk {
 
     public TimeWalk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Timetwister.java b/Mage.Sets/src/mage/sets/unlimitededition/Timetwister.java
index 8642d263a1..6b1abe2d7c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Timetwister.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Timetwister.java
@@ -37,7 +37,7 @@ public class Timetwister extends mage.sets.limitedalpha.Timetwister {
 
     public Timetwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 85;
+        this.cardNumber = "85";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Tranquility.java b/Mage.Sets/src/mage/sets/unlimitededition/Tranquility.java
index 2444942af1..7af91cc7d8 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Tranquility.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Tranquility.java
@@ -37,7 +37,7 @@ public class Tranquility extends mage.sets.tempest.Tranquility {
 
     public Tranquility(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/TropicalIsland.java b/Mage.Sets/src/mage/sets/unlimitededition/TropicalIsland.java
index e6cec95cd8..547e2e591e 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/TropicalIsland.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/TropicalIsland.java
@@ -37,7 +37,7 @@ public class TropicalIsland extends mage.sets.limitedalpha.TropicalIsland {
 
     public TropicalIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Tsunami.java b/Mage.Sets/src/mage/sets/unlimitededition/Tsunami.java
index d64580b953..db447e0c2c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Tsunami.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Tsunami.java
@@ -37,7 +37,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
 
     public Tsunami(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Tundra.java b/Mage.Sets/src/mage/sets/unlimitededition/Tundra.java
index 53e8f7ea4f..82048625d3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Tundra.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Tundra.java
@@ -37,7 +37,7 @@ public class Tundra extends mage.sets.limitedalpha.Tundra {
 
     public Tundra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Tunnel.java b/Mage.Sets/src/mage/sets/unlimitededition/Tunnel.java
index 474610b1cc..8acefa3e0f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Tunnel.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Tunnel.java
@@ -37,7 +37,7 @@ public class Tunnel extends mage.sets.revisededition.Tunnel {
 
     public Tunnel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/TwoHeadedGiantOfForiys.java b/Mage.Sets/src/mage/sets/unlimitededition/TwoHeadedGiantOfForiys.java
index fa35cea106..c4c2c87ad3 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/TwoHeadedGiantOfForiys.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/TwoHeadedGiantOfForiys.java
@@ -38,7 +38,7 @@ public class TwoHeadedGiantOfForiys extends mage.sets.masterseditioniv.TwoHeaded
 
     public TwoHeadedGiantOfForiys(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 180;
+        this.cardNumber = "180";
         this.expansionSetCode = "2ED";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/UndergroundSea.java b/Mage.Sets/src/mage/sets/unlimitededition/UndergroundSea.java
index e892fa6c06..864c46a005 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/UndergroundSea.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/UndergroundSea.java
@@ -37,7 +37,7 @@ public class UndergroundSea extends mage.sets.limitedalpha.UndergroundSea {
 
     public UndergroundSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 301;
+        this.cardNumber = "301";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/UnholyStrength.java b/Mage.Sets/src/mage/sets/unlimitededition/UnholyStrength.java
index 66b93a6106..d1e3251dbb 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/UnholyStrength.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/UnholyStrength.java
@@ -37,7 +37,7 @@ public class UnholyStrength extends mage.sets.tenthedition.UnholyStrength {
 
     public UnholyStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Unsummon.java b/Mage.Sets/src/mage/sets/unlimitededition/Unsummon.java
index 7123fd32eb..2c0d1edd15 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Unsummon.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Unsummon.java
@@ -37,7 +37,7 @@ public class Unsummon extends mage.sets.tenthedition.Unsummon {
 
     public Unsummon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/UthdenTroll.java b/Mage.Sets/src/mage/sets/unlimitededition/UthdenTroll.java
index dec203f3f6..01f117340d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/UthdenTroll.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/UthdenTroll.java
@@ -37,7 +37,7 @@ public class UthdenTroll extends mage.sets.limitedalpha.UthdenTroll {
 
     public UthdenTroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/unlimitededition/VerduranEnchantress.java
index c75740f09c..071c4fed20 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/VerduranEnchantress.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/VerduranEnchantress.java
@@ -37,7 +37,7 @@ public class VerduranEnchantress extends mage.sets.seventhedition.VerduranEnchan
 
     public VerduranEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfAir.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfAir.java
index 209f5d0722..6161af3cea 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfAir.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfAir.java
@@ -37,7 +37,7 @@ public class WallOfAir extends mage.sets.tenthedition.WallOfAir {
 
     public WallOfAir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfBone.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfBone.java
index ec5f5a90a6..3593d37fe7 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfBone.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfBone.java
@@ -37,7 +37,7 @@ public class WallOfBone extends mage.sets.magic2010.WallOfBone {
 
     public WallOfBone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfBrambles.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfBrambles.java
index f95ef684a8..535a165080 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfBrambles.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfBrambles.java
@@ -37,7 +37,7 @@ public class WallOfBrambles extends mage.sets.limitedalpha.WallOfBrambles {
 
     public WallOfBrambles(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfFire.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfFire.java
index e771ef0f47..956367219b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfFire.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfFire.java
@@ -37,7 +37,7 @@ public class WallOfFire extends mage.sets.tenthedition.WallOfFire {
 
     public WallOfFire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfIce.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfIce.java
index 64338d71b7..1e5b78bc74 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfIce.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfIce.java
@@ -37,7 +37,7 @@ public class WallOfIce extends mage.sets.fourthedition.WallOfIce {
 
     public WallOfIce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfStone.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfStone.java
index 468df83959..ffa2af3558 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfStone.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfStone.java
@@ -37,7 +37,7 @@ public class WallOfStone extends mage.sets.fifthedition.WallOfStone {
 
     public WallOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfSwords.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfSwords.java
index b4a350cd0d..eeded10dcf 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfSwords.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfSwords.java
@@ -37,7 +37,7 @@ public class WallOfSwords extends mage.sets.tenthedition.WallOfSwords {
 
     public WallOfSwords(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java
index 0533eee0f4..9901b3e724 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java
@@ -38,7 +38,7 @@ public class WallOfWater extends mage.sets.limitedalpha.WallOfWater {
 
     public WallOfWater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfWood.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfWood.java
index 1248b99ad2..97efd9fbfd 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WallOfWood.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfWood.java
@@ -37,7 +37,7 @@ public class WallOfWood extends mage.sets.tenthedition.WallOfWood {
 
     public WallOfWood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 134;
+        this.cardNumber = "134";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WarMammoth.java b/Mage.Sets/src/mage/sets/unlimitededition/WarMammoth.java
index fed8551dec..582b4845dd 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WarMammoth.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WarMammoth.java
@@ -37,7 +37,7 @@ public class WarMammoth extends mage.sets.fifthedition.WarMammoth {
 
     public WarMammoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WarpArtifact.java b/Mage.Sets/src/mage/sets/unlimitededition/WarpArtifact.java
index d8c3fb0b6c..e1b261a671 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WarpArtifact.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WarpArtifact.java
@@ -37,7 +37,7 @@ public class WarpArtifact extends mage.sets.fifthedition.WarpArtifact {
 
     public WarpArtifact(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WaterElemental.java b/Mage.Sets/src/mage/sets/unlimitededition/WaterElemental.java
index 984de3316e..1e587b194b 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WaterElemental.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WaterElemental.java
@@ -37,7 +37,7 @@ public class WaterElemental extends mage.sets.fourthedition.WaterElemental {
 
     public WaterElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Weakness.java b/Mage.Sets/src/mage/sets/unlimitededition/Weakness.java
index 7e0b21e927..c4d52b5eef 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Weakness.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Weakness.java
@@ -37,7 +37,7 @@ public class Weakness extends mage.sets.magic2010.Weakness {
 
     public Weakness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Web.java b/Mage.Sets/src/mage/sets/unlimitededition/Web.java
index e8e9e8039c..dbccc98c38 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/Web.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/Web.java
@@ -38,7 +38,7 @@ public class Web extends mage.sets.limitedalpha.Web {
 
     public Web(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WheelOfFortune.java b/Mage.Sets/src/mage/sets/unlimitededition/WheelOfFortune.java
index 9cd49a2515..61c2130e1f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WheelOfFortune.java
@@ -36,7 +36,7 @@ public class WheelOfFortune extends mage.sets.limitedalpha.WheelOfFortune {
 
     public WheelOfFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 184;
+        this.cardNumber = "184";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WhiteKnight.java b/Mage.Sets/src/mage/sets/unlimitededition/WhiteKnight.java
index 55d8822d2e..1b63c781a6 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WhiteKnight.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WhiteKnight.java
@@ -37,7 +37,7 @@ public class WhiteKnight extends mage.sets.magic2010.WhiteKnight {
 
     public WhiteKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WhiteWard.java b/Mage.Sets/src/mage/sets/unlimitededition/WhiteWard.java
index 994e049d5b..8d3fdbf50c 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WhiteWard.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WhiteWard.java
@@ -37,7 +37,7 @@ public class WhiteWard extends mage.sets.limitedbeta.WhiteWard {
 
     public WhiteWard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WildGrowth.java b/Mage.Sets/src/mage/sets/unlimitededition/WildGrowth.java
index ef9ef658fd..a4f9ea5321 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WildGrowth.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WildGrowth.java
@@ -37,7 +37,7 @@ public class WildGrowth extends mage.sets.iceage.WildGrowth {
 
     public WildGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WillOTheWisp.java b/Mage.Sets/src/mage/sets/unlimitededition/WillOTheWisp.java
index 729fd2c775..f0af585ae2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WillOTheWisp.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WillOTheWisp.java
@@ -37,7 +37,7 @@ public class WillOTheWisp extends mage.sets.limitedalpha.WillOTheWisp {
 
     public WillOTheWisp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WinterOrb.java b/Mage.Sets/src/mage/sets/unlimitededition/WinterOrb.java
index 83fa17f9e0..b155c1cc7d 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WinterOrb.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WinterOrb.java
@@ -37,7 +37,7 @@ public class WinterOrb extends mage.sets.limitedalpha.WinterOrb {
 
     public WinterOrb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WoodenSphere.java b/Mage.Sets/src/mage/sets/unlimitededition/WoodenSphere.java
index 6b3fd04239..6dd629499f 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WoodenSphere.java
@@ -38,7 +38,7 @@ public class WoodenSphere extends mage.sets.limitedalpha.WoodenSphere {
 
     public WoodenSphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WrathOfGod.java b/Mage.Sets/src/mage/sets/unlimitededition/WrathOfGod.java
index 89bf75bf5f..dcc7509ce2 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/WrathOfGod.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/WrathOfGod.java
@@ -37,7 +37,7 @@ public class WrathOfGod extends mage.sets.tenthedition.WrathOfGod {
 
     public WrathOfGod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 230;
+        this.cardNumber = "230";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ZombieMaster.java b/Mage.Sets/src/mage/sets/unlimitededition/ZombieMaster.java
index 60b38bfbb8..977c5adb82 100644
--- a/Mage.Sets/src/mage/sets/unlimitededition/ZombieMaster.java
+++ b/Mage.Sets/src/mage/sets/unlimitededition/ZombieMaster.java
@@ -38,7 +38,7 @@ public class ZombieMaster extends mage.sets.limitedalpha.ZombieMaster {
 
     public ZombieMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "2ED";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Compost.java b/Mage.Sets/src/mage/sets/urzasdestiny/Compost.java
index 3f91d413f3..a5870b00a5 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Compost.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Compost.java
@@ -37,7 +37,7 @@ public class Compost extends mage.sets.seventhedition.Compost {
 
     public Compost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ElvishPiper.java b/Mage.Sets/src/mage/sets/urzasdestiny/ElvishPiper.java
index 748cade218..411ece2094 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/ElvishPiper.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/ElvishPiper.java
@@ -37,7 +37,7 @@ public class ElvishPiper extends mage.sets.magic2010.ElvishPiper {
 
     public ElvishPiper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/EmperorCrocodile.java b/Mage.Sets/src/mage/sets/urzasdestiny/EmperorCrocodile.java
index 4536677945..d4d3d56926 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/EmperorCrocodile.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/EmperorCrocodile.java
@@ -37,7 +37,7 @@ public class EmperorCrocodile extends mage.sets.ninthedition.EmperorCrocodile {
 
     public EmperorCrocodile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Eradicate.java b/Mage.Sets/src/mage/sets/urzasdestiny/Eradicate.java
index 480ea0181d..1da464d6c5 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Eradicate.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Eradicate.java
@@ -37,7 +37,7 @@ public class Eradicate extends mage.sets.betrayersofkamigawa.Eradicate {
 
     public Eradicate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/HulkingOgre.java b/Mage.Sets/src/mage/sets/urzasdestiny/HulkingOgre.java
index dc0fd2e7c0..6120006197 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/HulkingOgre.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/HulkingOgre.java
@@ -38,7 +38,7 @@ public class HulkingOgre extends mage.sets.starter1999.HulkingOgre {
 
     public HulkingOgre(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 87;
+        this.cardNumber = "87";
         this.expansionSetCode = "UDS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Impatience.java b/Mage.Sets/src/mage/sets/urzasdestiny/Impatience.java
index 75aee18aa9..c193d79e0e 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Impatience.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Impatience.java
@@ -38,7 +38,7 @@ public class Impatience extends mage.sets.seventhedition.Impatience {
 
     public Impatience(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/JunkDiver.java b/Mage.Sets/src/mage/sets/urzasdestiny/JunkDiver.java
index a8ba54b597..d3a7baee3a 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/JunkDiver.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/JunkDiver.java
@@ -37,7 +37,7 @@ public class JunkDiver extends mage.sets.commander2014.JunkDiver {
 
     public JunkDiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonChampion.java b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonChampion.java
index 41a8c1bead..221b4ef709 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonChampion.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonChampion.java
@@ -37,7 +37,7 @@ public class KeldonChampion extends mage.sets.planechase.KeldonChampion {
 
     public KeldonChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/MantisEngine.java b/Mage.Sets/src/mage/sets/urzasdestiny/MantisEngine.java
index 10ffd91da8..6ae7550bad 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/MantisEngine.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/MantisEngine.java
@@ -37,7 +37,7 @@ public class MantisEngine extends mage.sets.tenthedition.MantisEngine {
 
     public MantisEngine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/MasterHealer.java b/Mage.Sets/src/mage/sets/urzasdestiny/MasterHealer.java
index 0e89a5b541..a04eb02085 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/MasterHealer.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/MasterHealer.java
@@ -37,7 +37,7 @@ public class MasterHealer extends mage.sets.ninthedition.MasterHealer {
 
     public MasterHealer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Opposition.java b/Mage.Sets/src/mage/sets/urzasdestiny/Opposition.java
index 5fa427818e..2ff328709f 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Opposition.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Opposition.java
@@ -37,7 +37,7 @@ public class Opposition extends mage.sets.seventhedition.Opposition {
 
     public Opposition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PowderKeg.java b/Mage.Sets/src/mage/sets/urzasdestiny/PowderKeg.java
index 3443453062..45ea6f7267 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/PowderKeg.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/PowderKeg.java
@@ -38,7 +38,7 @@ public class PowderKeg extends mage.sets.magicplayerrewards.PowderKeg {
 
     public PowderKeg(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "UDS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Quash.java b/Mage.Sets/src/mage/sets/urzasdestiny/Quash.java
index b34aadb504..75400623f5 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Quash.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Quash.java
@@ -37,7 +37,7 @@ public class Quash extends mage.sets.betrayersofkamigawa.Quash {
 
     public Quash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/RavenousRats.java b/Mage.Sets/src/mage/sets/urzasdestiny/RavenousRats.java
index fbcecc3eb2..7879611f58 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/RavenousRats.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/RavenousRats.java
@@ -37,7 +37,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats {
 
     public RavenousRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/RecklessAbandon.java b/Mage.Sets/src/mage/sets/urzasdestiny/RecklessAbandon.java
index b615d1db3d..9abf7b067d 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/RecklessAbandon.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/RecklessAbandon.java
@@ -37,7 +37,7 @@ public class RecklessAbandon extends mage.sets.speedvscunning.RecklessAbandon {
 
     public RecklessAbandon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Sanctimony.java b/Mage.Sets/src/mage/sets/urzasdestiny/Sanctimony.java
index 8e852c5c31..8ca94640a2 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Sanctimony.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Sanctimony.java
@@ -37,7 +37,7 @@ public class Sanctimony extends mage.sets.seventhedition.Sanctimony {
 
     public Sanctimony(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Scour.java b/Mage.Sets/src/mage/sets/urzasdestiny/Scour.java
index eeff72c260..d02335e1b0 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Scour.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Scour.java
@@ -37,7 +37,7 @@ public class Scour extends mage.sets.betrayersofkamigawa.Scour {
 
     public Scour(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SoulFeast.java b/Mage.Sets/src/mage/sets/urzasdestiny/SoulFeast.java
index f1e7cd876e..f36160401f 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/SoulFeast.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/SoulFeast.java
@@ -37,7 +37,7 @@ public class SoulFeast extends mage.sets.tenthedition.SoulFeast {
 
     public SoulFeast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SowingSalt.java b/Mage.Sets/src/mage/sets/urzasdestiny/SowingSalt.java
index eb94984ec1..39eca46118 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/SowingSalt.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/SowingSalt.java
@@ -37,7 +37,7 @@ public class SowingSalt extends mage.sets.betrayersofkamigawa.SowingSalt {
 
     public SowingSalt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Splinter.java b/Mage.Sets/src/mage/sets/urzasdestiny/Splinter.java
index 0d1b310f0f..ccaebdc58f 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Splinter.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Splinter.java
@@ -37,7 +37,7 @@ public class Splinter extends mage.sets.betrayersofkamigawa.Splinter {
 
     public Splinter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/StorageMatrix.java b/Mage.Sets/src/mage/sets/urzasdestiny/StorageMatrix.java
index f0de07324c..cf8dfc33f9 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/StorageMatrix.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/StorageMatrix.java
@@ -37,7 +37,7 @@ public class StorageMatrix extends mage.sets.ninthedition.StorageMatrix {
 
     public StorageMatrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 138;
+        this.cardNumber = "138";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/TauntingElf.java b/Mage.Sets/src/mage/sets/urzasdestiny/TauntingElf.java
index a4dcd45380..b1fb3e0a8f 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/TauntingElf.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/TauntingElf.java
@@ -37,7 +37,7 @@ public class TauntingElf extends mage.sets.onslaught.TauntingElf {
 
     public TauntingElf(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/TemporalAdept.java b/Mage.Sets/src/mage/sets/urzasdestiny/TemporalAdept.java
index 91e021d174..21568be80a 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/TemporalAdept.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/TemporalAdept.java
@@ -37,7 +37,7 @@ public class TemporalAdept extends mage.sets.ninthedition.TemporalAdept {
 
     public TemporalAdept(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ThievingMagpie.java b/Mage.Sets/src/mage/sets/urzasdestiny/ThievingMagpie.java
index cd202d5668..b184413f4d 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/ThievingMagpie.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/ThievingMagpie.java
@@ -37,7 +37,7 @@ public class ThievingMagpie extends mage.sets.ninthedition.ThievingMagpie {
 
     public ThievingMagpie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java b/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java
index d954c72ca1..ea6ca329e3 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java
@@ -38,7 +38,7 @@ public class ThranGolem extends mage.sets.magic2012.ThranGolem {
 
     public ThranGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "UDS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/TrumpetBlast.java b/Mage.Sets/src/mage/sets/urzasdestiny/TrumpetBlast.java
index eef928ec80..7c4666fecb 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/TrumpetBlast.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/TrumpetBlast.java
@@ -37,7 +37,7 @@ public class TrumpetBlast extends mage.sets.magic2010.TrumpetBlast {
 
     public TrumpetBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaElder.java b/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaElder.java
index efae467be5..a2e1cf068b 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaElder.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaElder.java
@@ -37,7 +37,7 @@ public class YavimayaElder extends mage.sets.commander.YavimayaElder {
 
     public YavimayaElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaEnchantress.java
index ff4a045a80..cdefe83f6f 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaEnchantress.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaEnchantress.java
@@ -37,7 +37,7 @@ public class YavimayaEnchantress extends mage.sets.tenthedition.YavimayaEnchantr
 
     public YavimayaEnchantress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "UDS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/YawgmothsBargain.java b/Mage.Sets/src/mage/sets/urzasdestiny/YawgmothsBargain.java
index 92b9f9c513..c468ba0884 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/YawgmothsBargain.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/YawgmothsBargain.java
@@ -38,7 +38,7 @@ public class YawgmothsBargain extends mage.sets.vintagemasters.YawgmothsBargain
 
     public YawgmothsBargain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "UDS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BeastOfBurden.java b/Mage.Sets/src/mage/sets/urzaslegacy/BeastOfBurden.java
index 23cba177d9..24a32843b0 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/BeastOfBurden.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/BeastOfBurden.java
@@ -37,7 +37,7 @@ public class BeastOfBurden extends mage.sets.ninthedition.BeastOfBurden {
 
     public BeastOfBurden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Crawlspace.java b/Mage.Sets/src/mage/sets/urzaslegacy/Crawlspace.java
index 2e526ded3c..acd3b394dd 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Crawlspace.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Crawlspace.java
@@ -37,7 +37,7 @@ public class Crawlspace extends mage.sets.commander2013.Crawlspace {
 
     public Crawlspace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenseGrid.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenseGrid.java
index 169f585cb2..bf2f3dc29c 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenseGrid.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenseGrid.java
@@ -37,7 +37,7 @@ public class DefenseGrid extends mage.sets.ninthedition.DefenseGrid {
 
     public DefenseGrid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/FaerieConclave.java b/Mage.Sets/src/mage/sets/urzaslegacy/FaerieConclave.java
index add0007392..3a626198f3 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/FaerieConclave.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/FaerieConclave.java
@@ -36,7 +36,7 @@ public class FaerieConclave extends mage.sets.tenthedition.FaerieConclave {
 
     public FaerieConclave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/FleetingImage.java b/Mage.Sets/src/mage/sets/urzaslegacy/FleetingImage.java
index f97a6cf3a8..d392668fe2 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/FleetingImage.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/FleetingImage.java
@@ -37,7 +37,7 @@ public class FleetingImage extends mage.sets.ninthedition.FleetingImage {
 
     public FleetingImage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ForbiddingWatchtower.java b/Mage.Sets/src/mage/sets/urzaslegacy/ForbiddingWatchtower.java
index ee45bfc74b..9726ced107 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/ForbiddingWatchtower.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/ForbiddingWatchtower.java
@@ -36,7 +36,7 @@ public class ForbiddingWatchtower extends mage.sets.tenthedition.ForbiddingWatch
 
     public ForbiddingWatchtower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituEncampment.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituEncampment.java
index a0c21c6302..df0bccfd00 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituEncampment.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituEncampment.java
@@ -36,7 +36,7 @@ public class GhituEncampment extends mage.sets.tenthedition.GhituEncampment {
 
     public GhituEncampment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituFireEater.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituFireEater.java
index 5339115fe9..16335910b4 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituFireEater.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituFireEater.java
@@ -38,7 +38,7 @@ public class GhituFireEater extends mage.sets.seventhedition.GhituFireEater {
 
     public GhituFireEater(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GiantCockroach.java b/Mage.Sets/src/mage/sets/urzaslegacy/GiantCockroach.java
index 84d255fc6f..c238435d87 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/GiantCockroach.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/GiantCockroach.java
@@ -36,7 +36,7 @@ public class GiantCockroach extends mage.sets.ninthedition.GiantCockroach {
 
     public GiantCockroach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/LavaAxe.java b/Mage.Sets/src/mage/sets/urzaslegacy/LavaAxe.java
index 63c22a4ad5..b2f9863ad6 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/LavaAxe.java
@@ -36,7 +36,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Levitation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Levitation.java
index 3e613c74b1..ffd7c0d0e1 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Levitation.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Levitation.java
@@ -36,7 +36,7 @@ public class Levitation extends mage.sets.magic2012.Levitation {
 
     public Levitation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MightOfOaks.java b/Mage.Sets/src/mage/sets/urzaslegacy/MightOfOaks.java
index 93c7638467..6c4f9d74b1 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/MightOfOaks.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/MightOfOaks.java
@@ -36,7 +36,7 @@ public class MightOfOaks extends mage.sets.magic2010.MightOfOaks {
 
     public MightOfOaks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PlagueBeetle.java b/Mage.Sets/src/mage/sets/urzaslegacy/PlagueBeetle.java
index 1997e29c31..47a55ce55d 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/PlagueBeetle.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/PlagueBeetle.java
@@ -36,7 +36,7 @@ public class PlagueBeetle extends mage.sets.tenthedition.PlagueBeetle {
 
     public PlagueBeetle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/QuicksilverAmulet.java b/Mage.Sets/src/mage/sets/urzaslegacy/QuicksilverAmulet.java
index cc71e6f0e2..a620cc1ea3 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/QuicksilverAmulet.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/QuicksilverAmulet.java
@@ -36,7 +36,7 @@ public class QuicksilverAmulet extends mage.sets.magic2012.QuicksilverAmulet {
 
     public QuicksilverAmulet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SpawningPool.java b/Mage.Sets/src/mage/sets/urzaslegacy/SpawningPool.java
index 8b5731c3e5..94e68fac89 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/SpawningPool.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/SpawningPool.java
@@ -36,7 +36,7 @@ public class SpawningPool extends mage.sets.tenthedition.SpawningPool {
 
     public SpawningPool(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Swat.java b/Mage.Sets/src/mage/sets/urzaslegacy/Swat.java
index 7d1ebca07f..cedefb3f54 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Swat.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Swat.java
@@ -37,7 +37,7 @@ public class Swat extends mage.sets.onslaught.Swat {
 
     public Swat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TreetopVillage.java b/Mage.Sets/src/mage/sets/urzaslegacy/TreetopVillage.java
index e9abcfbd52..b73a21541e 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/TreetopVillage.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/TreetopVillage.java
@@ -36,7 +36,7 @@ public class TreetopVillage extends mage.sets.tenthedition.TreetopVillage {
 
     public TreetopVillage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaWurm.java b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaWurm.java
index b021f200a0..558a5042df 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaWurm.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaWurm.java
@@ -36,7 +36,7 @@ public class YavimayaWurm extends mage.sets.magic2011.YavimayaWurm {
 
     public YavimayaWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "ULG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Abundance.java b/Mage.Sets/src/mage/sets/urzassaga/Abundance.java
index c63d5ce72b..e554777fc6 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Abundance.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Abundance.java
@@ -37,7 +37,7 @@ public class Abundance extends mage.sets.tenthedition.Abundance {
 
     public Abundance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/AcademyResearchers.java b/Mage.Sets/src/mage/sets/urzassaga/AcademyResearchers.java
index 96a3b225f7..d8f81f2537 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/AcademyResearchers.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/AcademyResearchers.java
@@ -37,7 +37,7 @@ public class AcademyResearchers extends mage.sets.tenthedition.AcademyResearcher
 
     public AcademyResearchers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Annul.java b/Mage.Sets/src/mage/sets/urzassaga/Annul.java
index d50e827913..b9e869f342 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Annul.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Annul.java
@@ -37,7 +37,7 @@ public class Annul extends mage.sets.mirrodin.Annul {
 
     public Annul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Befoul.java b/Mage.Sets/src/mage/sets/urzassaga/Befoul.java
index 87c50ed0bd..1311107fa0 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Befoul.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Befoul.java
@@ -37,7 +37,7 @@ public class Befoul extends mage.sets.championsofkamigawa.Befoul {
 
     public Befoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodArmor.java
index eeb48b031c..f2d581e479 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodArmor.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodArmor.java
@@ -37,7 +37,7 @@ public class BlanchwoodArmor extends mage.sets.tenthedition.BlanchwoodArmor {
 
     public BlanchwoodArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/BogRaiders.java b/Mage.Sets/src/mage/sets/urzassaga/BogRaiders.java
index 333c1a2eb2..9d588d6966 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/BogRaiders.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/BogRaiders.java
@@ -38,7 +38,7 @@ public class BogRaiders extends mage.sets.magic2011.BogRaiders {
 
     public BogRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Cathodion.java b/Mage.Sets/src/mage/sets/urzassaga/Cathodion.java
index 773a2956f1..a7b8fa4a54 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Cathodion.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Cathodion.java
@@ -38,7 +38,7 @@ public class Cathodion extends mage.sets.mirrodin.Cathodion {
 
     public Cathodion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/CoralMerfolk.java b/Mage.Sets/src/mage/sets/urzassaga/CoralMerfolk.java
index b36972f8e8..353c7d8caf 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/CoralMerfolk.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/CoralMerfolk.java
@@ -37,7 +37,7 @@ public class CoralMerfolk extends mage.sets.magic2010.CoralMerfolk {
 
     public CoralMerfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java b/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java
index 8d8dd3bba7..4dd74a3f4a 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java
@@ -38,7 +38,7 @@ public class Corrupt extends mage.sets.magic2011.Corrupt {
 
     public Corrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "USG";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/urzassaga/CrystalChimes.java b/Mage.Sets/src/mage/sets/urzassaga/CrystalChimes.java
index 7f46543994..8753eabd8e 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/CrystalChimes.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/CrystalChimes.java
@@ -37,7 +37,7 @@ public class CrystalChimes extends mage.sets.commander2015.CrystalChimes {
 
     public CrystalChimes(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/DarkRitual.java b/Mage.Sets/src/mage/sets/urzassaga/DarkRitual.java
index 5f5903561e..fb0be42c58 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/DarkestHour.java b/Mage.Sets/src/mage/sets/urzassaga/DarkestHour.java
index c94572a418..a272583086 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/DarkestHour.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/DarkestHour.java
@@ -37,7 +37,7 @@ public class DarkestHour extends mage.sets.seventhedition.DarkestHour {
 
     public DarkestHour(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java b/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java
index 558029fcb4..fb5934b6d7 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java
@@ -39,7 +39,7 @@ public class Disenchant extends mage.sets.tempest.Disenchant {
 
     public Disenchant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "USG";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Disorder.java b/Mage.Sets/src/mage/sets/urzassaga/Disorder.java
index 5102a79db0..fed76fc339 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Disorder.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Disorder.java
@@ -38,7 +38,7 @@ public class Disorder extends mage.sets.seventhedition.Disorder {
 
     public Disorder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/DragonBlood.java b/Mage.Sets/src/mage/sets/urzassaga/DragonBlood.java
index c3e6a5d056..a3e4126d86 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/DragonBlood.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/DragonBlood.java
@@ -38,7 +38,7 @@ public class DragonBlood extends mage.sets.mirrodin.DragonBlood {
 
     public DragonBlood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Duress.java b/Mage.Sets/src/mage/sets/urzassaga/Duress.java
index f561a0ac66..427bc51f1a 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Duress.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Duress.java
@@ -37,7 +37,7 @@ public class Duress extends mage.sets.magic2010.Duress {
 
     public Duress(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Exhaustion.java b/Mage.Sets/src/mage/sets/urzassaga/Exhaustion.java
index c39b595d6e..2a9cf3bdd9 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Exhaustion.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Exhaustion.java
@@ -38,7 +38,7 @@ public class Exhaustion extends mage.sets.portalthreekingdoms.Exhaustion {
 
     public Exhaustion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "USG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/urzassaga/GloriousAnthem.java b/Mage.Sets/src/mage/sets/urzassaga/GloriousAnthem.java
index ca64649657..4152f0feac 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/GloriousAnthem.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/GloriousAnthem.java
@@ -37,7 +37,7 @@ public class GloriousAnthem extends mage.sets.tenthedition.GloriousAnthem {
 
     public GloriousAnthem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinSpelunkers.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinSpelunkers.java
index 261df2efa3..4680b60635 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/GoblinSpelunkers.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinSpelunkers.java
@@ -38,7 +38,7 @@ public class GoblinSpelunkers extends mage.sets.ravnica.GoblinSpelunkers {
 
     public GoblinSpelunkers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/GreaterGood.java b/Mage.Sets/src/mage/sets/urzassaga/GreaterGood.java
index 70a43b2cfa..23dda5b079 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/GreaterGood.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/GreaterGood.java
@@ -37,7 +37,7 @@ public class GreaterGood extends mage.sets.ninthedition.GreaterGood {
 
     public GreaterGood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/HealingSalve.java b/Mage.Sets/src/mage/sets/urzassaga/HealingSalve.java
index 4c5a906d64..77fd54476e 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/HealingSalve.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/HealingSalve.java
@@ -37,7 +37,7 @@ public class HealingSalve extends mage.sets.seventhedition.HealingSalve {
 
     public HealingSalve(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/HeatRay.java b/Mage.Sets/src/mage/sets/urzassaga/HeatRay.java
index e65a8d1b8a..81605bc291 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/HeatRay.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/HeatRay.java
@@ -37,7 +37,7 @@ public class HeatRay extends mage.sets.riseoftheeldrazi.HeatRay {
 
     public HeatRay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/HorseshoeCrab.java b/Mage.Sets/src/mage/sets/urzassaga/HorseshoeCrab.java
index 1cfc784370..e170aceea2 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/HorseshoeCrab.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/HorseshoeCrab.java
@@ -37,7 +37,7 @@ public class HorseshoeCrab extends mage.sets.tenthedition.HorseshoeCrab {
 
     public HorseshoeCrab(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/LoomingShade.java b/Mage.Sets/src/mage/sets/urzassaga/LoomingShade.java
index dae052e1af..486d9eae26 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/LoomingShade.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/LoomingShade.java
@@ -37,7 +37,7 @@ public class LoomingShade extends mage.sets.magic2010.LoomingShade {
 
     public LoomingShade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Pacifism.java b/Mage.Sets/src/mage/sets/urzassaga/Pacifism.java
index e6debd2300..5b071bc5d3 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Pacifism.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Pacifism.java
@@ -37,7 +37,7 @@ public class Pacifism extends mage.sets.tenthedition.Pacifism {
 
     public Pacifism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianColossus.java b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianColossus.java
index bde02cc31d..edaa0369a5 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianColossus.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianColossus.java
@@ -37,7 +37,7 @@ public class PhyrexianColossus extends mage.sets.eighthedition.PhyrexianColossus
 
     public PhyrexianColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 305;
+        this.cardNumber = "305";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianGhoul.java b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianGhoul.java
index c62d28a108..47a8ef3fa9 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianGhoul.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianGhoul.java
@@ -37,7 +37,7 @@ public class PhyrexianGhoul extends mage.sets.planechase.PhyrexianGhoul {
 
     public PhyrexianGhoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/PowerSink.java b/Mage.Sets/src/mage/sets/urzassaga/PowerSink.java
index c83e02af34..3e49399562 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/PowerSink.java
@@ -37,7 +37,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/PresenceOfTheMaster.java b/Mage.Sets/src/mage/sets/urzassaga/PresenceOfTheMaster.java
index dd2cfa33e0..c7bcb683f7 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/PresenceOfTheMaster.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/PresenceOfTheMaster.java
@@ -37,7 +37,7 @@ public class PresenceOfTheMaster extends mage.sets.legends.PresenceOfTheMaster {
 
     public PresenceOfTheMaster(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Reprocess.java b/Mage.Sets/src/mage/sets/urzassaga/Reprocess.java
index 047d6ff1b2..23e788b417 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Reprocess.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Reprocess.java
@@ -38,7 +38,7 @@ public class Reprocess extends mage.sets.seventhedition.Reprocess {
 
     public Reprocess(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/SanctumGuardian.java b/Mage.Sets/src/mage/sets/urzassaga/SanctumGuardian.java
index 35d0257a6c..cfd828b523 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/SanctumGuardian.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/SanctumGuardian.java
@@ -37,7 +37,7 @@ public class SanctumGuardian extends mage.sets.ninthedition.SanctumGuardian {
 
     public SanctumGuardian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ScoriaWurm.java b/Mage.Sets/src/mage/sets/urzassaga/ScoriaWurm.java
index 4941f99d6e..671a5e87ae 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ScoriaWurm.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ScoriaWurm.java
@@ -37,7 +37,7 @@ public class ScoriaWurm extends mage.sets.tenthedition.ScoriaWurm {
 
     public ScoriaWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/urzassaga/SeasonedMarshal.java
index 64194b5bed..03819d9efb 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/SeasonedMarshal.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/SeasonedMarshal.java
@@ -37,7 +37,7 @@ public class SeasonedMarshal extends mage.sets.elspethvstezzeret.SeasonedMarshal
 
     public SeasonedMarshal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/SerrasEmbrace.java
index e7c5615270..dcd3e6835b 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/SerrasEmbrace.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/SerrasEmbrace.java
@@ -37,7 +37,7 @@ public class SerrasEmbrace extends mage.sets.tenthedition.SerrasEmbrace {
 
     public SerrasEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShivanHellkite.java b/Mage.Sets/src/mage/sets/urzassaga/ShivanHellkite.java
index 5094f65fc4..5ec3cd126d 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ShivanHellkite.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ShivanHellkite.java
@@ -37,7 +37,7 @@ public class ShivanHellkite extends mage.sets.tenthedition.ShivanHellkite {
 
     public ShivanHellkite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/ShivsEmbrace.java
index c5fd4e7cc4..86a0aeaaae 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ShivsEmbrace.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ShivsEmbrace.java
@@ -37,7 +37,7 @@ public class ShivsEmbrace extends mage.sets.magic2011.ShivsEmbrace {
 
     public ShivsEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShowerOfSparks.java b/Mage.Sets/src/mage/sets/urzassaga/ShowerOfSparks.java
index d0a42f0299..ee7d1e12db 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ShowerOfSparks.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ShowerOfSparks.java
@@ -37,7 +37,7 @@ public class ShowerOfSparks extends mage.sets.heroesvsmonsters.ShowerOfSparks {
 
     public ShowerOfSparks(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/SkirgeFamiliar.java b/Mage.Sets/src/mage/sets/urzassaga/SkirgeFamiliar.java
index 6b3a028fa0..1d259394d0 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/SkirgeFamiliar.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/SkirgeFamiliar.java
@@ -38,7 +38,7 @@ public class SkirgeFamiliar extends mage.sets.vintagemasters.SkirgeFamiliar {
 
     public SkirgeFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "USG";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ThunderingGiant.java b/Mage.Sets/src/mage/sets/urzassaga/ThunderingGiant.java
index e47747fae4..3682eef61c 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ThunderingGiant.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ThunderingGiant.java
@@ -37,7 +37,7 @@ public class ThunderingGiant extends mage.sets.tenthedition.ThunderingGiant {
 
     public ThunderingGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 221;
+        this.cardNumber = "221";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ViashinoRunner.java b/Mage.Sets/src/mage/sets/urzassaga/ViashinoRunner.java
index ac1d7ea92b..791a67efa2 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ViashinoRunner.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ViashinoRunner.java
@@ -37,7 +37,7 @@ public class ViashinoRunner extends mage.sets.tenthedition.ViashinoRunner {
 
     public ViashinoRunner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Victimize.java b/Mage.Sets/src/mage/sets/urzassaga/Victimize.java
index a4853adb42..4b71662316 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Victimize.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Victimize.java
@@ -37,7 +37,7 @@ public class Victimize extends mage.sets.conspiracy.Victimize {
 
     public Victimize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/VoltaicKey.java b/Mage.Sets/src/mage/sets/urzassaga/VoltaicKey.java
index 010e6dceb4..0edb179693 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/VoltaicKey.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/VoltaicKey.java
@@ -37,7 +37,7 @@ public class VoltaicKey extends mage.sets.magic2011.VoltaicKey {
 
     public VoltaicKey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Whirlwind.java b/Mage.Sets/src/mage/sets/urzassaga/Whirlwind.java
index 2bd4e722d4..8d2c9feb46 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Whirlwind.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Whirlwind.java
@@ -37,7 +37,7 @@ public class Whirlwind extends mage.sets.commander2014.Whirlwind {
 
     public Whirlwind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "USG";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/Anger.java b/Mage.Sets/src/mage/sets/venservskoth/Anger.java
index d84c69a508..b5a4344d93 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/Anger.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/Anger.java
@@ -37,7 +37,7 @@ public class Anger extends mage.sets.judgment.Anger {
 
     public Anger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/ArmillarySphere.java b/Mage.Sets/src/mage/sets/venservskoth/ArmillarySphere.java
index ee46af6e7d..be749aa4d9 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/ArmillarySphere.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/ArmillarySphere.java
@@ -37,7 +37,7 @@ public class ArmillarySphere extends mage.sets.conflux.ArmillarySphere {
 
     public ArmillarySphere(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/AuguryOwl.java b/Mage.Sets/src/mage/sets/venservskoth/AuguryOwl.java
index 1200b797b2..30ca5454c4 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/AuguryOwl.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/AuguryOwl.java
@@ -37,7 +37,7 @@ public class AuguryOwl extends mage.sets.magic2011.AuguryOwl {
 
     public AuguryOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/AzoriusChancery.java b/Mage.Sets/src/mage/sets/venservskoth/AzoriusChancery.java
index da36670e38..0e6d6054f1 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/AzoriusChancery.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/AzoriusChancery.java
@@ -37,7 +37,7 @@ public class AzoriusChancery extends mage.sets.dissension.AzoriusChancery {
 
     public AzoriusChancery(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/BloodfireColossus.java b/Mage.Sets/src/mage/sets/venservskoth/BloodfireColossus.java
index 68fc4a5947..4b5b2f3f1d 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/BloodfireColossus.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/BloodfireColossus.java
@@ -37,7 +37,7 @@ public class BloodfireColossus extends mage.sets.apocalypse.BloodfireColossus {
 
     public BloodfireColossus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/BloodfireKavu.java b/Mage.Sets/src/mage/sets/venservskoth/BloodfireKavu.java
index f33e6d303c..a4311d44f3 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/BloodfireKavu.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/BloodfireKavu.java
@@ -37,7 +37,7 @@ public class BloodfireKavu extends mage.sets.apocalypse.BloodfireKavu {
 
     public BloodfireKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/CacheRaiders.java b/Mage.Sets/src/mage/sets/venservskoth/CacheRaiders.java
index fadbc1d829..98c5ff2d95 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/CacheRaiders.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/CacheRaiders.java
@@ -37,7 +37,7 @@ public class CacheRaiders extends mage.sets.eventide.CacheRaiders {
 
     public CacheRaiders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/ChartoothCougar.java b/Mage.Sets/src/mage/sets/venservskoth/ChartoothCougar.java
index 0a19b9c0ef..b183518e5c 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/ChartoothCougar.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/ChartoothCougar.java
@@ -37,7 +37,7 @@ public class ChartoothCougar extends mage.sets.scourge.ChartoothCougar {
 
     public ChartoothCougar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/Clone.java b/Mage.Sets/src/mage/sets/venservskoth/Clone.java
index 427323b617..1062dae17f 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/Clone.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/Clone.java
@@ -37,7 +37,7 @@ public class Clone extends mage.sets.tenthedition.Clone {
 
     public Clone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/CosisRavager.java b/Mage.Sets/src/mage/sets/venservskoth/CosisRavager.java
index a5cdbd0be3..b91c8e427a 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/CosisRavager.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/CosisRavager.java
@@ -37,7 +37,7 @@ public class CosisRavager extends mage.sets.worldwake.CosisRavager {
 
     public CosisRavager(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/CrypticAnnelid.java b/Mage.Sets/src/mage/sets/venservskoth/CrypticAnnelid.java
index a4d4235368..26835cf9ee 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/CrypticAnnelid.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/CrypticAnnelid.java
@@ -37,7 +37,7 @@ public class CrypticAnnelid extends mage.sets.futuresight.CrypticAnnelid {
 
     public CrypticAnnelid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/DownhillCharge.java b/Mage.Sets/src/mage/sets/venservskoth/DownhillCharge.java
index 62849c9d8f..186c3f3b1f 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/DownhillCharge.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/DownhillCharge.java
@@ -37,7 +37,7 @@ public class DownhillCharge extends mage.sets.nemesis.DownhillCharge {
 
     public DownhillCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/EarthServant.java b/Mage.Sets/src/mage/sets/venservskoth/EarthServant.java
index 5dd5a8891f..cb2461519e 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/EarthServant.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/EarthServant.java
@@ -37,7 +37,7 @@ public class EarthServant extends mage.sets.magic2011.EarthServant {
 
     public EarthServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/FieryHellhound.java b/Mage.Sets/src/mage/sets/venservskoth/FieryHellhound.java
index a51041803b..1c1cfc14bf 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/FieryHellhound.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/FieryHellhound.java
@@ -37,7 +37,7 @@ public class FieryHellhound extends mage.sets.magic2010.FieryHellhound {
 
     public FieryHellhound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/GeyserGlider.java b/Mage.Sets/src/mage/sets/venservskoth/GeyserGlider.java
index 4ba2faa504..890ec61c1b 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/GeyserGlider.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/GeyserGlider.java
@@ -37,7 +37,7 @@ public class GeyserGlider extends mage.sets.zendikar.GeyserGlider {
 
     public GeyserGlider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/JawsOfStone.java b/Mage.Sets/src/mage/sets/venservskoth/JawsOfStone.java
index 75ca0e6b6c..6ab6983366 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/JawsOfStone.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/JawsOfStone.java
@@ -37,7 +37,7 @@ public class JawsOfStone extends mage.sets.shadowmoor.JawsOfStone {
 
     public JawsOfStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/JeditsDragoons.java b/Mage.Sets/src/mage/sets/venservskoth/JeditsDragoons.java
index 8213d24c45..6f2dc42959 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/JeditsDragoons.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/JeditsDragoons.java
@@ -37,7 +37,7 @@ public class JeditsDragoons extends mage.sets.timespiral.JeditsDragoons {
 
     public JeditsDragoons(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/JourneyersKite.java b/Mage.Sets/src/mage/sets/venservskoth/JourneyersKite.java
index d0dae85ef5..ed2214ee09 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/JourneyersKite.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/JourneyersKite.java
@@ -37,7 +37,7 @@ public class JourneyersKite extends mage.sets.championsofkamigawa.JourneyersKite
 
     public JourneyersKite(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/KorCartographer.java b/Mage.Sets/src/mage/sets/venservskoth/KorCartographer.java
index eee09443e6..a1bf57fcb3 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/KorCartographer.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/KorCartographer.java
@@ -37,7 +37,7 @@ public class KorCartographer extends mage.sets.zendikar.KorCartographer {
 
     public KorCartographer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/KothOfTheHammer.java b/Mage.Sets/src/mage/sets/venservskoth/KothOfTheHammer.java
index 9b7ff1044b..7aa92b71ca 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/KothOfTheHammer.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/KothOfTheHammer.java
@@ -37,7 +37,7 @@ public class KothOfTheHammer extends mage.sets.scarsofmirrodin.KothOfTheHammer {
 
     public KothOfTheHammer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/Lithophage.java b/Mage.Sets/src/mage/sets/venservskoth/Lithophage.java
index d7c256cbec..c4a2601d6b 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/Lithophage.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/Lithophage.java
@@ -37,7 +37,7 @@ public class Lithophage extends mage.sets.mercadianmasques.Lithophage {
 
     public Lithophage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/MinamoSightbender.java b/Mage.Sets/src/mage/sets/venservskoth/MinamoSightbender.java
index 898ad0e3ed..8e3c412ad1 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/MinamoSightbender.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/MinamoSightbender.java
@@ -37,7 +37,7 @@ public class MinamoSightbender extends mage.sets.betrayersofkamigawa.MinamoSight
 
     public MinamoSightbender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/MistmeadowWitch.java b/Mage.Sets/src/mage/sets/venservskoth/MistmeadowWitch.java
index 08b5d1d1fb..f7d6e68fb7 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/MistmeadowWitch.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/MistmeadowWitch.java
@@ -37,7 +37,7 @@ public class MistmeadowWitch extends mage.sets.shadowmoor.MistmeadowWitch {
 
     public MistmeadowWitch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/NeurokInvisimancer.java b/Mage.Sets/src/mage/sets/venservskoth/NeurokInvisimancer.java
index 330ea3af21..b1fe9472d0 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/NeurokInvisimancer.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/NeurokInvisimancer.java
@@ -37,7 +37,7 @@ public class NeurokInvisimancer extends mage.sets.scarsofmirrodin.NeurokInvisima
 
     public NeurokInvisimancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/NewBenalia.java b/Mage.Sets/src/mage/sets/venservskoth/NewBenalia.java
index 8e1e10375c..0ba66b47a8 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/NewBenalia.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/NewBenalia.java
@@ -37,7 +37,7 @@ public class NewBenalia extends mage.sets.futuresight.NewBenalia {
 
     public NewBenalia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/OblivionRing.java b/Mage.Sets/src/mage/sets/venservskoth/OblivionRing.java
index 3a66ba89d4..b60dbe655e 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/OblivionRing.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/OblivionRing.java
@@ -38,7 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing {
 
     public OblivionRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/venservskoth/PathToExile.java b/Mage.Sets/src/mage/sets/venservskoth/PathToExile.java
index 9f2e0ecf89..f356b7e33b 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/PathToExile.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/PathToExile.java
@@ -37,7 +37,7 @@ public class PathToExile extends mage.sets.conflux.PathToExile {
 
     public PathToExile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/PilgrimsEye.java b/Mage.Sets/src/mage/sets/venservskoth/PilgrimsEye.java
index 1306734d79..7eac5fe064 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/PilgrimsEye.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/PilgrimsEye.java
@@ -37,7 +37,7 @@ public class PilgrimsEye extends mage.sets.worldwake.PilgrimsEye {
 
     public PilgrimsEye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/PlatedGeopede.java b/Mage.Sets/src/mage/sets/venservskoth/PlatedGeopede.java
index 3296995d2d..369262ce3a 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/PlatedGeopede.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/PlatedGeopede.java
@@ -37,7 +37,7 @@ public class PlatedGeopede extends mage.sets.zendikar.PlatedGeopede {
 
     public PlatedGeopede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/Preordain.java b/Mage.Sets/src/mage/sets/venservskoth/Preordain.java
index 468fef00ba..bd4b5f43e6 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/Preordain.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/Preordain.java
@@ -37,7 +37,7 @@ public class Preordain extends mage.sets.magic2011.Preordain {
 
     public Preordain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/PrimalPlasma.java b/Mage.Sets/src/mage/sets/venservskoth/PrimalPlasma.java
index 8eb09d5f79..86b77a61cc 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/PrimalPlasma.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/PrimalPlasma.java
@@ -37,7 +37,7 @@ public class PrimalPlasma extends mage.sets.planechase2012.PrimalPlasma {
 
     public PrimalPlasma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/PygmyPyrosaur.java b/Mage.Sets/src/mage/sets/venservskoth/PygmyPyrosaur.java
index 4b9a68cb93..a171994e30 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/PygmyPyrosaur.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/PygmyPyrosaur.java
@@ -37,7 +37,7 @@ public class PygmyPyrosaur extends mage.sets.urzaslegacy.PygmyPyrosaur {
 
     public PygmyPyrosaur(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/RevokeExistence.java b/Mage.Sets/src/mage/sets/venservskoth/RevokeExistence.java
index 2eca64ece9..65d640ed19 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/RevokeExistence.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/RevokeExistence.java
@@ -37,7 +37,7 @@ public class RevokeExistence extends mage.sets.scarsofmirrodin.RevokeExistence {
 
     public RevokeExistence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SafePassage.java b/Mage.Sets/src/mage/sets/venservskoth/SafePassage.java
index 1ac25bb9f4..244590b1c6 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SafePassage.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SafePassage.java
@@ -37,7 +37,7 @@ public class SafePassage extends mage.sets.magic2010.SafePassage {
 
     public SafePassage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/ScrollThief.java b/Mage.Sets/src/mage/sets/venservskoth/ScrollThief.java
index dfe407582a..511a78a7ec 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/ScrollThief.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/ScrollThief.java
@@ -37,7 +37,7 @@ public class ScrollThief extends mage.sets.magic2011.ScrollThief {
 
     public ScrollThief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SearingBlaze.java b/Mage.Sets/src/mage/sets/venservskoth/SearingBlaze.java
index d59003d749..503f47953b 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SearingBlaze.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SearingBlaze.java
@@ -37,7 +37,7 @@ public class SearingBlaze extends mage.sets.worldwake.SearingBlaze {
 
     public SearingBlaze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SeismicStrike.java b/Mage.Sets/src/mage/sets/venservskoth/SeismicStrike.java
index 772e1b4675..8a2fd33af8 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SeismicStrike.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SeismicStrike.java
@@ -37,7 +37,7 @@ public class SeismicStrike extends mage.sets.magic2010.SeismicStrike {
 
     public SeismicStrike(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SejiriRefuge.java b/Mage.Sets/src/mage/sets/venservskoth/SejiriRefuge.java
index ddc76402c0..d05639e361 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SejiriRefuge.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SejiriRefuge.java
@@ -37,7 +37,7 @@ public class SejiriRefuge extends mage.sets.zendikar.SejiriRefuge {
 
     public SejiriRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SigilOfSleep.java b/Mage.Sets/src/mage/sets/venservskoth/SigilOfSleep.java
index 5661cb1cc2..f3d2f672b5 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SigilOfSleep.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SigilOfSleep.java
@@ -37,7 +37,7 @@ public class SigilOfSleep extends mage.sets.urzasdestiny.SigilOfSleep {
 
     public SigilOfSleep(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SkySpirit.java b/Mage.Sets/src/mage/sets/venservskoth/SkySpirit.java
index 1396e96a21..2792ff0223 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SkySpirit.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SkySpirit.java
@@ -37,7 +37,7 @@ public class SkySpirit extends mage.sets.tempest.SkySpirit {
 
     public SkySpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SlithStrider.java b/Mage.Sets/src/mage/sets/venservskoth/SlithStrider.java
index 0e627f3275..4aa8a0731d 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SlithStrider.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SlithStrider.java
@@ -37,7 +37,7 @@ public class SlithStrider extends mage.sets.mirrodin.SlithStrider {
 
     public SlithStrider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SoaringSeacliff.java b/Mage.Sets/src/mage/sets/venservskoth/SoaringSeacliff.java
index 524e7bc551..e552ad21d8 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SoaringSeacliff.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SoaringSeacliff.java
@@ -37,7 +37,7 @@ public class SoaringSeacliff extends mage.sets.zendikar.SoaringSeacliff {
 
     public SoaringSeacliff(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SphinxOfUthuun.java b/Mage.Sets/src/mage/sets/venservskoth/SphinxOfUthuun.java
index 35823cde0c..7a7abbc692 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SphinxOfUthuun.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SphinxOfUthuun.java
@@ -37,7 +37,7 @@ public class SphinxOfUthuun extends mage.sets.magic2012.SphinxOfUthuun {
 
     public SphinxOfUthuun(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SpireBarrage.java b/Mage.Sets/src/mage/sets/venservskoth/SpireBarrage.java
index f92e0481f6..00a32b165c 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SpireBarrage.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SpireBarrage.java
@@ -37,7 +37,7 @@ public class SpireBarrage extends mage.sets.zendikar.SpireBarrage {
 
     public SpireBarrage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SteelOfTheGodhead.java b/Mage.Sets/src/mage/sets/venservskoth/SteelOfTheGodhead.java
index 1e036667c1..96dc80c921 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SteelOfTheGodhead.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SteelOfTheGodhead.java
@@ -37,7 +37,7 @@ public class SteelOfTheGodhead extends mage.sets.shadowmoor.SteelOfTheGodhead {
 
     public SteelOfTheGodhead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/StoneGiant.java b/Mage.Sets/src/mage/sets/venservskoth/StoneGiant.java
index 56f1ea6e88..2f64adb5e1 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/StoneGiant.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/StoneGiant.java
@@ -37,7 +37,7 @@ public class StoneGiant extends mage.sets.magic2010.StoneGiant {
 
     public StoneGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/SunblastAngel.java b/Mage.Sets/src/mage/sets/venservskoth/SunblastAngel.java
index 35cfe14d54..883671058d 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/SunblastAngel.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/SunblastAngel.java
@@ -37,7 +37,7 @@ public class SunblastAngel extends mage.sets.scarsofmirrodin.SunblastAngel {
 
     public SunblastAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/VenserTheSojourner.java b/Mage.Sets/src/mage/sets/venservskoth/VenserTheSojourner.java
index eed6d5fc90..cf2379cc72 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/VenserTheSojourner.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/VenserTheSojourner.java
@@ -37,7 +37,7 @@ public class VenserTheSojourner extends mage.sets.scarsofmirrodin.VenserTheSojou
 
     public VenserTheSojourner(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/VolleyOfBoulders.java b/Mage.Sets/src/mage/sets/venservskoth/VolleyOfBoulders.java
index ad44065cb9..b693e1d204 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/VolleyOfBoulders.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/VolleyOfBoulders.java
@@ -37,7 +37,7 @@ public class VolleyOfBoulders extends mage.sets.odyssey.VolleyOfBoulders {
 
     public VolleyOfBoulders(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/VulshokBattlegear.java b/Mage.Sets/src/mage/sets/venservskoth/VulshokBattlegear.java
index f299acee5e..abfda643e9 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/VulshokBattlegear.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/VulshokBattlegear.java
@@ -37,7 +37,7 @@ public class VulshokBattlegear extends mage.sets.mirrodin.VulshokBattlegear {
 
     public VulshokBattlegear(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/VulshokBerserker.java b/Mage.Sets/src/mage/sets/venservskoth/VulshokBerserker.java
index 185af94661..4d2109e92e 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/VulshokBerserker.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/VulshokBerserker.java
@@ -37,7 +37,7 @@ public class VulshokBerserker extends mage.sets.magic2011.VulshokBerserker {
 
     public VulshokBerserker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/VulshokMorningstar.java b/Mage.Sets/src/mage/sets/venservskoth/VulshokMorningstar.java
index b743204cd5..872ad03960 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/VulshokMorningstar.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/VulshokMorningstar.java
@@ -38,7 +38,7 @@ public class VulshokMorningstar extends mage.sets.darksteel.VulshokMorningstar {
 
     public VulshokMorningstar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDI";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/venservskoth/VulshokSorcerer.java b/Mage.Sets/src/mage/sets/venservskoth/VulshokSorcerer.java
index bf3e7db39e..8c73a10712 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/VulshokSorcerer.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/VulshokSorcerer.java
@@ -37,7 +37,7 @@ public class VulshokSorcerer extends mage.sets.fifthdawn.VulshokSorcerer {
 
     public VulshokSorcerer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/WallOfDenial.java b/Mage.Sets/src/mage/sets/venservskoth/WallOfDenial.java
index 843a87ba1a..2ede3b6832 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/WallOfDenial.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/WallOfDenial.java
@@ -37,7 +37,7 @@ public class WallOfDenial extends mage.sets.alarareborn.WallOfDenial {
 
     public WallOfDenial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/WayfarersBauble.java b/Mage.Sets/src/mage/sets/venservskoth/WayfarersBauble.java
index d08ea8e813..59f31d1c7b 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/WayfarersBauble.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/WayfarersBauble.java
@@ -37,7 +37,7 @@ public class WayfarersBauble extends mage.sets.commander2013.WayfarersBauble {
 
     public WayfarersBauble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/WhitemaneLion.java b/Mage.Sets/src/mage/sets/venservskoth/WhitemaneLion.java
index 173a9d002a..4e7590457b 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/WhitemaneLion.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/WhitemaneLion.java
@@ -37,7 +37,7 @@ public class WhitemaneLion extends mage.sets.commander2014.WhitemaneLion {
 
     public WhitemaneLion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/venservskoth/Windreaver.java b/Mage.Sets/src/mage/sets/venservskoth/Windreaver.java
index 6bc2dee715..c85fc3af9c 100644
--- a/Mage.Sets/src/mage/sets/venservskoth/Windreaver.java
+++ b/Mage.Sets/src/mage/sets/venservskoth/Windreaver.java
@@ -37,7 +37,7 @@ public class Windreaver extends mage.sets.dissension.Windreaver {
 
     public Windreaver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDI";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java b/Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java
index 8d5940c869..408e781624 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java
@@ -37,7 +37,7 @@ public class AEtherMutation extends mage.sets.apocalypse.AEtherMutation {
 
     public AEtherMutation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 241;
+        this.cardNumber = "241";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Afterlife.java b/Mage.Sets/src/mage/sets/vintagemasters/Afterlife.java
index 5f8b361fec..82fb2506f3 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Afterlife.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Afterlife.java
@@ -38,7 +38,7 @@ public class Afterlife extends mage.sets.mirage.Afterlife {
 
     public Afterlife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Aftershock.java b/Mage.Sets/src/mage/sets/vintagemasters/Aftershock.java
index 35657a549b..8648a7358a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Aftershock.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Aftershock.java
@@ -37,7 +37,7 @@ public class Aftershock extends mage.sets.tempest.Aftershock {
 
     public Aftershock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 149;
+        this.cardNumber = "149";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AkromasBlessing.java b/Mage.Sets/src/mage/sets/vintagemasters/AkromasBlessing.java
index 084476df79..ef9d9e45f6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AkromasBlessing.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AkromasBlessing.java
@@ -37,7 +37,7 @@ public class AkromasBlessing extends mage.sets.onslaught.AkromasBlessing {
 
     public AkromasBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AncestralRecall.java b/Mage.Sets/src/mage/sets/vintagemasters/AncestralRecall.java
index 9d126d2750..c2e33758ae 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AncestralRecall.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AncestralRecall.java
@@ -38,7 +38,7 @@ public class AncestralRecall extends mage.sets.limitedalpha.AncestralRecall {
 
     public AncestralRecall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AncientTomb.java b/Mage.Sets/src/mage/sets/vintagemasters/AncientTomb.java
index ea53e185a3..a6c0472efd 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AncientTomb.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AncientTomb.java
@@ -38,7 +38,7 @@ public class AncientTomb extends mage.sets.tempest.AncientTomb {
 
     public AncientTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 289;
+        this.cardNumber = "289";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AnimateDead.java b/Mage.Sets/src/mage/sets/vintagemasters/AnimateDead.java
index 5c5479ce5e..adf0472b7a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AnimateDead.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AnimateDead.java
@@ -37,7 +37,7 @@ public class AnimateDead extends mage.sets.limitedalpha.AnimateDead {
 
     public AnimateDead(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 104;
+        this.cardNumber = "104";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/vintagemasters/AnkhOfMishra.java
index 6f7d755980..5f23ed763a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AnkhOfMishra.java
@@ -37,7 +37,7 @@ public class AnkhOfMishra extends mage.sets.limitedalpha.AnkhOfMishra {
 
     public AnkhOfMishra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 263;
+        this.cardNumber = "263";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Aquamoeba.java b/Mage.Sets/src/mage/sets/vintagemasters/Aquamoeba.java
index 22ab7eeb18..e3fe2ed691 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Aquamoeba.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Aquamoeba.java
@@ -37,7 +37,7 @@ public class Aquamoeba extends mage.sets.torment.Aquamoeba {
 
     public Aquamoeba(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/vintagemasters/ArmadilloCloak.java
index 2027c45b34..88c99d1015 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ArmadilloCloak.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ArmadilloCloak.java
@@ -38,7 +38,7 @@ public class ArmadilloCloak extends mage.sets.invasion.ArmadilloCloak {
 
     public ArmadilloCloak(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 242;
+        this.cardNumber = "242";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Armageddon.java b/Mage.Sets/src/mage/sets/vintagemasters/Armageddon.java
index 2335db7811..e15d290e8f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Armageddon.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Armageddon.java
@@ -38,7 +38,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon {
 
     public Armageddon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ArmorOfThorns.java b/Mage.Sets/src/mage/sets/vintagemasters/ArmorOfThorns.java
index e39afd7aca..570c1a45ab 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ArmorOfThorns.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ArmorOfThorns.java
@@ -37,7 +37,7 @@ public class ArmorOfThorns extends mage.sets.mirage.ArmorOfThorns {
 
     public ArmorOfThorns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 194;
+        this.cardNumber = "194";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ArrogantWurm.java b/Mage.Sets/src/mage/sets/vintagemasters/ArrogantWurm.java
index 1dcf0bfceb..908fe92d06 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ArrogantWurm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ArrogantWurm.java
@@ -38,7 +38,7 @@ public class ArrogantWurm extends mage.sets.torment.ArrogantWurm {
 
     public ArrogantWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 195;
+        this.cardNumber = "195";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AstralSlide.java b/Mage.Sets/src/mage/sets/vintagemasters/AstralSlide.java
index fe59220eb8..f5bbf9e9be 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/AstralSlide.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/AstralSlide.java
@@ -37,7 +37,7 @@ public class AstralSlide extends mage.sets.onslaught.AstralSlide {
 
     public AstralSlide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BadRiver.java b/Mage.Sets/src/mage/sets/vintagemasters/BadRiver.java
index 23931ed955..d277ed2ba7 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BadRiver.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BadRiver.java
@@ -37,7 +37,7 @@ public class BadRiver extends mage.sets.mirage.BadRiver {
 
     public BadRiver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 290;
+        this.cardNumber = "290";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Badlands.java b/Mage.Sets/src/mage/sets/vintagemasters/Badlands.java
index ce28454537..6df733fa06 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Badlands.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Badlands.java
@@ -37,7 +37,7 @@ public class Badlands extends mage.sets.limitedalpha.Badlands {
 
     public Badlands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 291;
+        this.cardNumber = "291";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Balance.java b/Mage.Sets/src/mage/sets/vintagemasters/Balance.java
index dc45c60869..d696527be7 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Balance.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Balance.java
@@ -38,7 +38,7 @@ public class Balance extends mage.sets.limitedbeta.Balance {
 
     public Balance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BalefulForce.java b/Mage.Sets/src/mage/sets/vintagemasters/BalefulForce.java
index 9da54e21f4..638e1538ed 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BalefulForce.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BalefulForce.java
@@ -37,7 +37,7 @@ public class BalefulForce extends mage.sets.commander2013.BalefulForce {
 
     public BalefulForce(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 105;
+        this.cardNumber = "105";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BalefulStrix.java b/Mage.Sets/src/mage/sets/vintagemasters/BalefulStrix.java
index 4396715d45..36ffb87598 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BalefulStrix.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BalefulStrix.java
@@ -38,7 +38,7 @@ public class BalefulStrix extends mage.sets.planechase2012.BalefulStrix {
 
     public BalefulStrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 243;
+        this.cardNumber = "243";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BarrenMoor.java b/Mage.Sets/src/mage/sets/vintagemasters/BarrenMoor.java
index 5b92bf244a..c577a5ff36 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BarrenMoor.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BarrenMoor.java
@@ -37,7 +37,7 @@ public class BarrenMoor extends mage.sets.onslaught.BarrenMoor {
 
     public BarrenMoor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 292;
+        this.cardNumber = "292";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BasandraBattleSeraph.java b/Mage.Sets/src/mage/sets/vintagemasters/BasandraBattleSeraph.java
index 2190d58e53..24818836fe 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BasandraBattleSeraph.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BasandraBattleSeraph.java
@@ -37,7 +37,7 @@ public class BasandraBattleSeraph extends mage.sets.commander.BasandraBattleSera
 
     public BasandraBattleSeraph(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 244;
+        this.cardNumber = "244";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BaskingRootwalla.java b/Mage.Sets/src/mage/sets/vintagemasters/BaskingRootwalla.java
index 76bb032924..b8f1a8998a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BaskingRootwalla.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BaskingRootwalla.java
@@ -37,7 +37,7 @@ public class BaskingRootwalla extends mage.sets.torment.BaskingRootwalla {
 
     public BaskingRootwalla(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 196;
+        this.cardNumber = "196";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BattleScreech.java b/Mage.Sets/src/mage/sets/vintagemasters/BattleScreech.java
index ab33efd86b..7203e4f350 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BattleScreech.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BattleScreech.java
@@ -38,7 +38,7 @@ public class BattleScreech extends mage.sets.judgment.BattleScreech {
 
     public BattleScreech(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Bayou.java b/Mage.Sets/src/mage/sets/vintagemasters/Bayou.java
index c335b8b4d4..7dd27005af 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Bayou.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Bayou.java
@@ -37,7 +37,7 @@ public class Bayou extends mage.sets.limitedalpha.Bayou {
 
     public Bayou(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 293;
+        this.cardNumber = "293";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BazaarOfBaghdad.java b/Mage.Sets/src/mage/sets/vintagemasters/BazaarOfBaghdad.java
index fa61871ee3..a28f92e07a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BazaarOfBaghdad.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BazaarOfBaghdad.java
@@ -38,7 +38,7 @@ public class BazaarOfBaghdad extends mage.sets.arabiannights.BazaarOfBaghdad {
 
     public BazaarOfBaghdad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 294;
+        this.cardNumber = "294";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BeetlebackChief.java b/Mage.Sets/src/mage/sets/vintagemasters/BeetlebackChief.java
index e5fc0d9760..2f408d6fe9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BeetlebackChief.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BeetlebackChief.java
@@ -38,7 +38,7 @@ public class BeetlebackChief extends mage.sets.planechase2012.BeetlebackChief {
 
     public BeetlebackChief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 150;
+        this.cardNumber = "150";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BenalishTrapper.java b/Mage.Sets/src/mage/sets/vintagemasters/BenalishTrapper.java
index b5812ae410..6b74f6129f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BenalishTrapper.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BenalishTrapper.java
@@ -37,7 +37,7 @@ public class BenalishTrapper extends mage.sets.invasion.BenalishTrapper {
 
     public BenalishTrapper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Berserk.java b/Mage.Sets/src/mage/sets/vintagemasters/Berserk.java
index 49cece7667..d3eb341f36 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Berserk.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Berserk.java
@@ -38,7 +38,7 @@ public class Berserk extends mage.sets.limitedalpha.Berserk {
 
     public Berserk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 197;
+        this.cardNumber = "197";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BlackLotus.java b/Mage.Sets/src/mage/sets/vintagemasters/BlackLotus.java
index e4519c900d..7a43fd4cdc 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BlackLotus.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BlackLotus.java
@@ -38,7 +38,7 @@ public class BlackLotus extends mage.sets.limitedalpha.BlackLotus {
 
     public BlackLotus(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Blastoderm.java b/Mage.Sets/src/mage/sets/vintagemasters/Blastoderm.java
index a0a8a2e510..19f0bf7f6f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Blastoderm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Blastoderm.java
@@ -38,7 +38,7 @@ public class Blastoderm extends mage.sets.nemesis.Blastoderm {
 
     public Blastoderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 198;
+        this.cardNumber = "198";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BlazingSpecter.java b/Mage.Sets/src/mage/sets/vintagemasters/BlazingSpecter.java
index 5719a747f7..f3273785ad 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BlazingSpecter.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BlazingSpecter.java
@@ -38,7 +38,7 @@ public class BlazingSpecter extends mage.sets.invasion.BlazingSpecter {
 
     public BlazingSpecter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 245;
+        this.cardNumber = "245";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BrainFreeze.java b/Mage.Sets/src/mage/sets/vintagemasters/BrainFreeze.java
index 8c7e8a4af2..463f65a4b3 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BrainFreeze.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BrainFreeze.java
@@ -37,7 +37,7 @@ public class BrainFreeze extends mage.sets.scourge.BrainFreeze {
 
     public BrainFreeze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Brainstorm.java b/Mage.Sets/src/mage/sets/vintagemasters/Brainstorm.java
index b71c28dc78..b941176361 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Brainstorm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Brainstorm.java
@@ -37,7 +37,7 @@ public class Brainstorm extends mage.sets.fifthedition.Brainstorm {
 
     public Brainstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BreathOfLife.java b/Mage.Sets/src/mage/sets/vintagemasters/BreathOfLife.java
index 7f78445575..1823fabe3a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BreathOfLife.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BreathOfLife.java
@@ -37,7 +37,7 @@ public class BreathOfLife extends mage.sets.starter2000.BreathOfLife {
 
     public BreathOfLife(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BrilliantHalo.java b/Mage.Sets/src/mage/sets/vintagemasters/BrilliantHalo.java
index 1494c77e2e..1ef4c4becb 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BrilliantHalo.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BrilliantHalo.java
@@ -37,7 +37,7 @@ public class BrilliantHalo extends mage.sets.urzassaga.BrilliantHalo {
 
     public BrilliantHalo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BrindleShoat.java b/Mage.Sets/src/mage/sets/vintagemasters/BrindleShoat.java
index 847ebd8c25..01569ed2af 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BrindleShoat.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BrindleShoat.java
@@ -38,7 +38,7 @@ public class BrindleShoat extends mage.sets.planechase2012.BrindleShoat {
 
     public BrindleShoat(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 199;
+        this.cardNumber = "199";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BurningOfXinye.java b/Mage.Sets/src/mage/sets/vintagemasters/BurningOfXinye.java
index 6b016c9b17..b9c3105dff 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BurningOfXinye.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BurningOfXinye.java
@@ -37,7 +37,7 @@ public class BurningOfXinye extends mage.sets.portalthreekingdoms.BurningOfXinye
 
     public BurningOfXinye(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 151;
+        this.cardNumber = "151";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/BurningWish.java b/Mage.Sets/src/mage/sets/vintagemasters/BurningWish.java
index 3ea03e6b8b..8b82047408 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/BurningWish.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/BurningWish.java
@@ -37,7 +37,7 @@ public class BurningWish extends mage.sets.judgment.BurningWish {
 
     public BurningWish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 152;
+        this.cardNumber = "152";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CabalRitual.java b/Mage.Sets/src/mage/sets/vintagemasters/CabalRitual.java
index cc5d9c8b14..eb79c370ee 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CabalRitual.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CabalRitual.java
@@ -38,7 +38,7 @@ public class CabalRitual extends mage.sets.torment.CabalRitual {
 
     public CabalRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 106;
+        this.cardNumber = "106";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CalderaLake.java b/Mage.Sets/src/mage/sets/vintagemasters/CalderaLake.java
index b387655b1e..8d0da1732c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CalderaLake.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CalderaLake.java
@@ -38,7 +38,7 @@ public class CalderaLake extends mage.sets.tempest.CalderaLake {
 
     public CalderaLake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 295;
+        this.cardNumber = "295";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Carnophage.java b/Mage.Sets/src/mage/sets/vintagemasters/Carnophage.java
index 5398b7973f..60cd9fcc40 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Carnophage.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Carnophage.java
@@ -37,7 +37,7 @@ public class Carnophage extends mage.sets.exodus.Carnophage {
 
     public Carnophage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 107;
+        this.cardNumber = "107";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChainLightning.java b/Mage.Sets/src/mage/sets/vintagemasters/ChainLightning.java
index 0904d3976e..51cc87775a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ChainLightning.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ChainLightning.java
@@ -37,7 +37,7 @@ public class ChainLightning extends mage.sets.legends.ChainLightning {
 
     public ChainLightning(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Channel.java b/Mage.Sets/src/mage/sets/vintagemasters/Channel.java
index bfa93d9a10..f64099d927 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Channel.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Channel.java
@@ -38,7 +38,7 @@ public class Channel extends mage.sets.revisededition.Channel {
 
     public Channel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 200;
+        this.cardNumber = "200";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChartoothCougar.java b/Mage.Sets/src/mage/sets/vintagemasters/ChartoothCougar.java
index 86ea1049ed..476d5c97b9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ChartoothCougar.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ChartoothCougar.java
@@ -37,7 +37,7 @@ public class ChartoothCougar extends mage.sets.scourge.ChartoothCougar {
 
     public ChartoothCougar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 155;
+        this.cardNumber = "155";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChimericIdol.java b/Mage.Sets/src/mage/sets/vintagemasters/ChimericIdol.java
index 587beef16d..d1c9967333 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ChimericIdol.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ChimericIdol.java
@@ -37,7 +37,7 @@ public class ChimericIdol extends mage.sets.prophecy.ChimericIdol {
 
     public ChimericIdol(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 264;
+        this.cardNumber = "264";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChokingTethers.java b/Mage.Sets/src/mage/sets/vintagemasters/ChokingTethers.java
index 8e28957e44..a8f8bc4c37 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ChokingTethers.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ChokingTethers.java
@@ -37,7 +37,7 @@ public class ChokingTethers extends mage.sets.onslaught.ChokingTethers {
 
     public ChokingTethers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CircularLogic.java b/Mage.Sets/src/mage/sets/vintagemasters/CircularLogic.java
index 1bc0d68386..22762635ac 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CircularLogic.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CircularLogic.java
@@ -38,7 +38,7 @@ public class CircularLogic extends mage.sets.torment.CircularLogic {
 
     public CircularLogic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Clickslither.java b/Mage.Sets/src/mage/sets/vintagemasters/Clickslither.java
index 39faae1772..8f978ba255 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Clickslither.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Clickslither.java
@@ -37,7 +37,7 @@ public class Clickslither extends mage.sets.elvesvsgoblins.Clickslither {
 
     public Clickslither(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CloudDjinn.java b/Mage.Sets/src/mage/sets/vintagemasters/CloudDjinn.java
index 8b4ee6b7ef..eddc8c508e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CloudDjinn.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CloudDjinn.java
@@ -37,7 +37,7 @@ public class CloudDjinn extends mage.sets.weatherlight.CloudDjinn {
 
     public CloudDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CloudOfFaeries.java b/Mage.Sets/src/mage/sets/vintagemasters/CloudOfFaeries.java
index 4c1f67c064..dc31eea4f6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CloudOfFaeries.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CloudOfFaeries.java
@@ -38,7 +38,7 @@ public class CloudOfFaeries extends mage.sets.urzaslegacy.CloudOfFaeries {
 
     public CloudOfFaeries(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CoercivePortal.java b/Mage.Sets/src/mage/sets/vintagemasters/CoercivePortal.java
index a89aaa3b05..423de68532 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CoercivePortal.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CoercivePortal.java
@@ -37,7 +37,7 @@ public class CoercivePortal extends mage.sets.conspiracy.CoercivePortal {
 
     public CoercivePortal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 266;
+        this.cardNumber = "266";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ControlMagic.java b/Mage.Sets/src/mage/sets/vintagemasters/ControlMagic.java
index 4a73ab6e3e..36d1a20804 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ControlMagic.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ControlMagic.java
@@ -38,7 +38,7 @@ public class ControlMagic extends mage.sets.limitedalpha.ControlMagic {
 
     public ControlMagic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Counterspell.java b/Mage.Sets/src/mage/sets/vintagemasters/Counterspell.java
index cbf3b0badf..22f317c8f7 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Counterspell.java
@@ -37,7 +37,7 @@ public class Counterspell extends mage.sets.tempest.Counterspell {
 
     public Counterspell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CrovaxTheCursed.java b/Mage.Sets/src/mage/sets/vintagemasters/CrovaxTheCursed.java
index 26c1a750c6..01d28749a1 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CrovaxTheCursed.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CrovaxTheCursed.java
@@ -37,7 +37,7 @@ public class CrovaxTheCursed extends mage.sets.stronghold.CrovaxTheCursed {
 
     public CrovaxTheCursed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 110;
+        this.cardNumber = "110";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CursedScroll.java b/Mage.Sets/src/mage/sets/vintagemasters/CursedScroll.java
index 26844cc5b9..a7922ab66d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/CursedScroll.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/CursedScroll.java
@@ -37,7 +37,7 @@ public class CursedScroll extends mage.sets.tempest.CursedScroll {
 
     public CursedScroll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 267;
+        this.cardNumber = "267";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DackFayden.java b/Mage.Sets/src/mage/sets/vintagemasters/DackFayden.java
index d6debbdc0e..138e24dd37 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DackFayden.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DackFayden.java
@@ -37,7 +37,7 @@ public class DackFayden extends mage.sets.conspiracy.DackFayden {
 
     public DackFayden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 247;
+        this.cardNumber = "247";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DarkHatchling.java b/Mage.Sets/src/mage/sets/vintagemasters/DarkHatchling.java
index f431b680b0..079cc629fa 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DarkHatchling.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DarkHatchling.java
@@ -38,7 +38,7 @@ public class DarkHatchling extends mage.sets.urzassaga.DarkHatchling {
 
     public DarkHatchling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DarkRitual.java b/Mage.Sets/src/mage/sets/vintagemasters/DarkRitual.java
index 769ada9ad8..b3469d3ae3 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DarkRitual.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DarkRitual.java
@@ -37,7 +37,7 @@ public class DarkRitual extends mage.sets.planechase.DarkRitual {
 
     public DarkRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 113;
+        this.cardNumber = "113";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DauthiMercenary.java b/Mage.Sets/src/mage/sets/vintagemasters/DauthiMercenary.java
index 6418c17ae8..7c32713845 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DauthiMercenary.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DauthiMercenary.java
@@ -38,7 +38,7 @@ public class DauthiMercenary extends mage.sets.tempest.DauthiMercenary {
 
     public DauthiMercenary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 114;
+        this.cardNumber = "114";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DeathGrasp.java b/Mage.Sets/src/mage/sets/vintagemasters/DeathGrasp.java
index 08b7e90cd5..47f1813f11 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DeathGrasp.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DeathGrasp.java
@@ -38,7 +38,7 @@ public class DeathGrasp extends mage.sets.apocalypse.DeathGrasp {
 
     public DeathGrasp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 249;
+        this.cardNumber = "249";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DeathreapRitual.java b/Mage.Sets/src/mage/sets/vintagemasters/DeathreapRitual.java
index b33db6c25b..6b7a7b9e61 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DeathreapRitual.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DeathreapRitual.java
@@ -37,7 +37,7 @@ public class DeathreapRitual extends mage.sets.conspiracy.DeathreapRitual {
 
     public DeathreapRitual(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 250;
+        this.cardNumber = "250";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DeathsHeadBuzzard.java b/Mage.Sets/src/mage/sets/vintagemasters/DeathsHeadBuzzard.java
index 1563509411..1d6dfd881b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DeathsHeadBuzzard.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DeathsHeadBuzzard.java
@@ -37,7 +37,7 @@ public class DeathsHeadBuzzard extends mage.sets.scourge.DeathsHeadBuzzard {
 
     public DeathsHeadBuzzard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DeepAnalysis.java b/Mage.Sets/src/mage/sets/vintagemasters/DeepAnalysis.java
index 429b5fa557..a35fa656a6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DeepAnalysis.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DeepAnalysis.java
@@ -37,7 +37,7 @@ public class DeepAnalysis extends mage.sets.torment.DeepAnalysis {
 
     public DeepAnalysis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DemonicTutor.java b/Mage.Sets/src/mage/sets/vintagemasters/DemonicTutor.java
index 5093c911ec..f216efee0c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DemonicTutor.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DemonicTutor.java
@@ -38,7 +38,7 @@ public class DemonicTutor extends mage.sets.limitedalpha.DemonicTutor {
 
     public DemonicTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DerangedHermit.java b/Mage.Sets/src/mage/sets/vintagemasters/DerangedHermit.java
index 24cb1a50a7..d73f661cc5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DerangedHermit.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DerangedHermit.java
@@ -37,7 +37,7 @@ public class DerangedHermit extends mage.sets.urzaslegacy.DerangedHermit {
 
     public DerangedHermit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 202;
+        this.cardNumber = "202";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DesertTwister.java b/Mage.Sets/src/mage/sets/vintagemasters/DesertTwister.java
index 3fad8bd554..f3a1ab42e9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DesertTwister.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DesertTwister.java
@@ -37,7 +37,7 @@ public class DesertTwister extends mage.sets.revisededition.DesertTwister {
 
     public DesertTwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 203;
+        this.cardNumber = "203";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DrakestownForgotten.java b/Mage.Sets/src/mage/sets/vintagemasters/DrakestownForgotten.java
index 7bdf6f1203..92b418922b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DrakestownForgotten.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DrakestownForgotten.java
@@ -37,7 +37,7 @@ public class DrakestownForgotten extends mage.sets.conspiracy.DrakestownForgotte
 
     public DrakestownForgotten(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 117;
+        this.cardNumber = "117";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/DreampodDruid.java b/Mage.Sets/src/mage/sets/vintagemasters/DreampodDruid.java
index 9e117f6d26..2526e048ff 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/DreampodDruid.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/DreampodDruid.java
@@ -37,7 +37,7 @@ public class DreampodDruid extends mage.sets.planechase2012.DreampodDruid {
 
     public DreampodDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 204;
+        this.cardNumber = "204";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/EdricSpymasterOfTrest.java b/Mage.Sets/src/mage/sets/vintagemasters/EdricSpymasterOfTrest.java
index 19f4976e13..a94c4ae117 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/EdricSpymasterOfTrest.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/EdricSpymasterOfTrest.java
@@ -37,7 +37,7 @@ public class EdricSpymasterOfTrest extends mage.sets.commander.EdricSpymasterOfT
 
     public EdricSpymasterOfTrest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 251;
+        this.cardNumber = "251";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ElephantGuide.java b/Mage.Sets/src/mage/sets/vintagemasters/ElephantGuide.java
index 46cb72443e..171d744ca8 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ElephantGuide.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ElephantGuide.java
@@ -38,7 +38,7 @@ public class ElephantGuide extends mage.sets.judgment.ElephantGuide {
 
     public ElephantGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 205;
+        this.cardNumber = "205";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ElvishAberration.java b/Mage.Sets/src/mage/sets/vintagemasters/ElvishAberration.java
index c03babc9d7..68fe035fb5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ElvishAberration.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ElvishAberration.java
@@ -38,7 +38,7 @@ public class ElvishAberration extends mage.sets.scourge.ElvishAberration {
 
     public ElvishAberration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 206;
+        this.cardNumber = "206";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Ephemeron.java b/Mage.Sets/src/mage/sets/vintagemasters/Ephemeron.java
index e794dd723b..2ea689e982 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Ephemeron.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Ephemeron.java
@@ -37,7 +37,7 @@ public class Ephemeron extends mage.sets.exodus.Ephemeron {
 
     public Ephemeron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ErhnamDjinn.java b/Mage.Sets/src/mage/sets/vintagemasters/ErhnamDjinn.java
index 920e8d9ad3..e14737ce39 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ErhnamDjinn.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ErhnamDjinn.java
@@ -38,7 +38,7 @@ public class ErhnamDjinn extends mage.sets.judgment.ErhnamDjinn {
 
     public ErhnamDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 207;
+        this.cardNumber = "207";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/EternalDragon.java b/Mage.Sets/src/mage/sets/vintagemasters/EternalDragon.java
index b990953fb8..a8aefe0e7a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/EternalDragon.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/EternalDragon.java
@@ -37,7 +37,7 @@ public class EternalDragon extends mage.sets.scourge.EternalDragon {
 
     public EternalDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Exile.java b/Mage.Sets/src/mage/sets/vintagemasters/Exile.java
index 66d4ab699c..04b77468e9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Exile.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Exile.java
@@ -38,7 +38,7 @@ public class Exile extends mage.sets.alliances.Exile {
 
     public Exile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Expunge.java b/Mage.Sets/src/mage/sets/vintagemasters/Expunge.java
index 7a16e9bc6b..e6bebfd8be 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Expunge.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Expunge.java
@@ -37,7 +37,7 @@ public class Expunge extends mage.sets.urzassaga.Expunge {
 
     public Expunge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FactOrFiction.java b/Mage.Sets/src/mage/sets/vintagemasters/FactOrFiction.java
index 363ec75363..bd6b1fbf16 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FactOrFiction.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FactOrFiction.java
@@ -37,7 +37,7 @@ public class FactOrFiction extends mage.sets.invasion.FactOrFiction {
 
     public FactOrFiction(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FallenAskari.java b/Mage.Sets/src/mage/sets/vintagemasters/FallenAskari.java
index a6e6d87e4d..d1730bc7e0 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FallenAskari.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FallenAskari.java
@@ -37,7 +37,7 @@ public class FallenAskari extends mage.sets.visions.FallenAskari {
 
     public FallenAskari(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 119;
+        this.cardNumber = "119";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Falter.java b/Mage.Sets/src/mage/sets/vintagemasters/Falter.java
index 9804f13cf5..e817fe9713 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Falter.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Falter.java
@@ -37,7 +37,7 @@ public class Falter extends mage.sets.urzassaga.Falter {
 
     public Falter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Famine.java b/Mage.Sets/src/mage/sets/vintagemasters/Famine.java
index d24ddc1b6b..d4919c7f45 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Famine.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Famine.java
@@ -37,7 +37,7 @@ public class Famine extends mage.sets.commander2013.Famine {
 
     public Famine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 120;
+        this.cardNumber = "120";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Fastbond.java b/Mage.Sets/src/mage/sets/vintagemasters/Fastbond.java
index d13d8ceee6..f56f7b93cb 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Fastbond.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Fastbond.java
@@ -38,7 +38,7 @@ public class Fastbond extends mage.sets.limitedalpha.Fastbond {
 
     public Fastbond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 209;
+        this.cardNumber = "209";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Fireblast.java b/Mage.Sets/src/mage/sets/vintagemasters/Fireblast.java
index 67a1ff3fba..662eac1338 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Fireblast.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Fireblast.java
@@ -38,7 +38,7 @@ public class Fireblast extends mage.sets.visions.Fireblast {
 
     public Fireblast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 159;
+        this.cardNumber = "159";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/vintagemasters/FiresOfYavimaya.java
index 51a68b901d..2653af6829 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FiresOfYavimaya.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FiresOfYavimaya.java
@@ -37,7 +37,7 @@ public class FiresOfYavimaya extends mage.sets.planechase.FiresOfYavimaya {
 
     public FiresOfYavimaya(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 252;
+        this.cardNumber = "252";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FlametongueKavu.java b/Mage.Sets/src/mage/sets/vintagemasters/FlametongueKavu.java
index 6ab32d5977..58a30fe4fa 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FlametongueKavu.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FlametongueKavu.java
@@ -37,7 +37,7 @@ public class FlametongueKavu extends mage.sets.planechase.FlametongueKavu {
 
     public FlametongueKavu(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FledglingDjinn.java b/Mage.Sets/src/mage/sets/vintagemasters/FledglingDjinn.java
index 5840c4949e..a3fde9e78a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FledglingDjinn.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FledglingDjinn.java
@@ -37,7 +37,7 @@ public class FledglingDjinn extends mage.sets.weatherlight.FledglingDjinn {
 
     public FledglingDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FloodPlain.java b/Mage.Sets/src/mage/sets/vintagemasters/FloodPlain.java
index 32d92f5fea..f030cfa6f6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FloodPlain.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FloodPlain.java
@@ -37,7 +37,7 @@ public class FloodPlain extends mage.sets.venservskoth.FloodPlain {
 
     public FloodPlain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 296;
+        this.cardNumber = "296";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FlowstoneHellion.java b/Mage.Sets/src/mage/sets/vintagemasters/FlowstoneHellion.java
index fabbefa9bc..87d6e2813d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FlowstoneHellion.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FlowstoneHellion.java
@@ -37,7 +37,7 @@ public class FlowstoneHellion extends mage.sets.stronghold.FlowstoneHellion {
 
     public FlowstoneHellion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Flusterstorm.java b/Mage.Sets/src/mage/sets/vintagemasters/Flusterstorm.java
index f4344ff1a0..fb36ee05d9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Flusterstorm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Flusterstorm.java
@@ -37,7 +37,7 @@ public class Flusterstorm extends mage.sets.commander.Flusterstorm {
 
     public Flusterstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ForceOfWill.java b/Mage.Sets/src/mage/sets/vintagemasters/ForceOfWill.java
index 13b551112b..821688dd53 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ForceOfWill.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ForceOfWill.java
@@ -38,7 +38,7 @@ public class ForceOfWill extends mage.sets.alliances.ForceOfWill {
 
     public ForceOfWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ForgottenCave.java b/Mage.Sets/src/mage/sets/vintagemasters/ForgottenCave.java
index 66da3b4e50..00a8e7e64c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ForgottenCave.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ForgottenCave.java
@@ -37,7 +37,7 @@ public class ForgottenCave extends mage.sets.onslaught.ForgottenCave {
 
     public ForgottenCave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 297;
+        this.cardNumber = "297";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FranticSearch.java b/Mage.Sets/src/mage/sets/vintagemasters/FranticSearch.java
index 5230abe3d7..a9ef66ddf2 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FranticSearch.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FranticSearch.java
@@ -37,7 +37,7 @@ public class FranticSearch extends mage.sets.urzaslegacy.FranticSearch {
 
     public FranticSearch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FutureSight.java b/Mage.Sets/src/mage/sets/vintagemasters/FutureSight.java
index 009b5964ad..a95078c842 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FutureSight.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FutureSight.java
@@ -37,7 +37,7 @@ public class FutureSight extends mage.sets.onslaught.FutureSight {
 
     public FutureSight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/FyndhornElves.java b/Mage.Sets/src/mage/sets/vintagemasters/FyndhornElves.java
index 412b93f74e..b8aca8160e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/FyndhornElves.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/FyndhornElves.java
@@ -37,7 +37,7 @@ public class FyndhornElves extends mage.sets.iceage.FyndhornElves {
 
     public FyndhornElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 210;
+        this.cardNumber = "210";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GaeasEmbrace.java b/Mage.Sets/src/mage/sets/vintagemasters/GaeasEmbrace.java
index 05be062542..580e613169 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GaeasEmbrace.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GaeasEmbrace.java
@@ -37,7 +37,7 @@ public class GaeasEmbrace extends mage.sets.urzassaga.GaeasEmbrace {
 
     public GaeasEmbrace(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 211;
+        this.cardNumber = "211";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Gamble.java b/Mage.Sets/src/mage/sets/vintagemasters/Gamble.java
index 49b26ca732..faf8dcc4f2 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Gamble.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Gamble.java
@@ -37,7 +37,7 @@ public class Gamble extends mage.sets.urzassaga.Gamble {
 
     public Gamble(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Genesis.java b/Mage.Sets/src/mage/sets/vintagemasters/Genesis.java
index a4533bb3b5..2feb2d1c31 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Genesis.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Genesis.java
@@ -37,7 +37,7 @@ public class Genesis extends mage.sets.judgment.Genesis {
 
     public Genesis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 212;
+        this.cardNumber = "212";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GerrardsBattleCry.java b/Mage.Sets/src/mage/sets/vintagemasters/GerrardsBattleCry.java
index 90d09fdf9a..567c507dd5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GerrardsBattleCry.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GerrardsBattleCry.java
@@ -37,7 +37,7 @@ public class GerrardsBattleCry extends mage.sets.tempest.GerrardsBattleCry {
 
     public GerrardsBattleCry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GiantMantis.java b/Mage.Sets/src/mage/sets/vintagemasters/GiantMantis.java
index c70238f060..cdcee2d9fd 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GiantMantis.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GiantMantis.java
@@ -37,7 +37,7 @@ public class GiantMantis extends mage.sets.mirage.GiantMantis {
 
     public GiantMantis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 213;
+        this.cardNumber = "213";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GiantStrength.java b/Mage.Sets/src/mage/sets/vintagemasters/GiantStrength.java
index 9128683e81..35cd5e988d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GiantStrength.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GiantStrength.java
@@ -37,7 +37,7 @@ public class GiantStrength extends mage.sets.tempest.GiantStrength {
 
     public GiantStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 163;
+        this.cardNumber = "163";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Gigapede.java b/Mage.Sets/src/mage/sets/vintagemasters/Gigapede.java
index aaa09917b4..cdd8c0cdac 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Gigapede.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Gigapede.java
@@ -37,7 +37,7 @@ public class Gigapede extends mage.sets.onslaught.Gigapede {
 
     public Gigapede(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 214;
+        this.cardNumber = "214";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinGoon.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinGoon.java
index da7bdd1d62..a0f41423fc 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinGoon.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinGoon.java
@@ -38,7 +38,7 @@ public class GoblinGoon extends mage.sets.legions.GoblinGoon {
 
     public GoblinGoon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinLackey.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinLackey.java
index 6cca4bc5d0..d8caf810dc 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinLackey.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinLackey.java
@@ -38,7 +38,7 @@ public class GoblinLackey extends mage.sets.urzassaga.GoblinLackey {
 
     public GoblinLackey(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 167;
+        this.cardNumber = "167";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinMatron.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinMatron.java
index bc93a9a7ab..fe3065b46e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinMatron.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinMatron.java
@@ -37,7 +37,7 @@ public class GoblinMatron extends mage.sets.urzassaga.GoblinMatron {
 
     public GoblinMatron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 168;
+        this.cardNumber = "168";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinPiledriver.java
index 0f212af7a3..711f6faa87 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinPiledriver.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinPiledriver.java
@@ -37,7 +37,7 @@ public class GoblinPiledriver extends mage.sets.onslaught.GoblinPiledriver {
 
     public GoblinPiledriver(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 170;
+        this.cardNumber = "170";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinRingleader.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinRingleader.java
index 3970bbe4cf..cb833d10f4 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinRingleader.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinRingleader.java
@@ -37,7 +37,7 @@ public class GoblinRingleader extends mage.sets.apocalypse.GoblinRingleader {
 
     public GoblinRingleader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 171;
+        this.cardNumber = "171";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinTrenches.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinTrenches.java
index 0db268db2d..d786c4bb69 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinTrenches.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinTrenches.java
@@ -38,7 +38,7 @@ public class GoblinTrenches extends mage.sets.apocalypse.GoblinTrenches {
 
     public GoblinTrenches(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 253;
+        this.cardNumber = "253";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GoblinWarchief.java b/Mage.Sets/src/mage/sets/vintagemasters/GoblinWarchief.java
index 03792710b0..4dbed1aec5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GoblinWarchief.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GoblinWarchief.java
@@ -37,7 +37,7 @@ public class GoblinWarchief extends mage.sets.scourge.GoblinWarchief {
 
     public GoblinWarchief(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 173;
+        this.cardNumber = "173";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GrandColiseum.java b/Mage.Sets/src/mage/sets/vintagemasters/GrandColiseum.java
index 81e366f7a9..3af44d4f00 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GrandColiseum.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GrandColiseum.java
@@ -37,7 +37,7 @@ public class GrandColiseum extends mage.sets.onslaught.GrandColiseum {
 
     public GrandColiseum(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 298;
+        this.cardNumber = "298";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Grasslands.java b/Mage.Sets/src/mage/sets/vintagemasters/Grasslands.java
index 9fc2a2ea41..b9df997ef0 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Grasslands.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Grasslands.java
@@ -37,7 +37,7 @@ public class Grasslands extends mage.sets.knightsvsdragons.Grasslands {
 
     public Grasslands(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 299;
+        this.cardNumber = "299";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GrenzoDungeonWarden.java b/Mage.Sets/src/mage/sets/vintagemasters/GrenzoDungeonWarden.java
index 53a9c694b2..1c0181fd7f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GrenzoDungeonWarden.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GrenzoDungeonWarden.java
@@ -37,7 +37,7 @@ public class GrenzoDungeonWarden extends mage.sets.conspiracy.GrenzoDungeonWarde
 
     public GrenzoDungeonWarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 254;
+        this.cardNumber = "254";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/GrizzlyFate.java b/Mage.Sets/src/mage/sets/vintagemasters/GrizzlyFate.java
index fb286cd049..780e9616dd 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/GrizzlyFate.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/GrizzlyFate.java
@@ -37,7 +37,7 @@ public class GrizzlyFate extends mage.sets.judgment.GrizzlyFate {
 
     public GrizzlyFate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 215;
+        this.cardNumber = "215";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Gush.java b/Mage.Sets/src/mage/sets/vintagemasters/Gush.java
index 7cbf3ba619..9617aad957 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Gush.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Gush.java
@@ -38,7 +38,7 @@ public class Gush extends mage.sets.jacevschandra.Gush {
 
     public Gush(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/HermitDruid.java b/Mage.Sets/src/mage/sets/vintagemasters/HermitDruid.java
index c64f4428da..94f5f93cd6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/HermitDruid.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/HermitDruid.java
@@ -37,7 +37,7 @@ public class HermitDruid extends mage.sets.stronghold.HermitDruid {
 
     public HermitDruid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 216;
+        this.cardNumber = "216";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/HighTide.java b/Mage.Sets/src/mage/sets/vintagemasters/HighTide.java
index ce7b98e920..85fad33053 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/HighTide.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/HighTide.java
@@ -38,7 +38,7 @@ public class HighTide extends mage.sets.fallenempires.HighTide1 {
 
     public HighTide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java b/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java
index 2b6f31cbc6..ded0a05fc4 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java
@@ -38,7 +38,7 @@ public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 122;
+        this.cardNumber = "122";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Ichorid.java b/Mage.Sets/src/mage/sets/vintagemasters/Ichorid.java
index 72e77faa3b..1205b813f4 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Ichorid.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Ichorid.java
@@ -37,7 +37,7 @@ public class Ichorid extends mage.sets.torment.Ichorid {
 
     public Ichorid(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 123;
+        this.cardNumber = "123";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java b/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java
index 76bfcf8a48..f27e19b3ae 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java
@@ -38,7 +38,7 @@ public class IvoryTower extends mage.sets.antiquities.IvoryTower {
 
     public IvoryTower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 269;
+        this.cardNumber = "269";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/vintagemasters/JaceTheMindSculptor.java
index 90eb821cab..2ab3bff7bd 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/JaceTheMindSculptor.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/JaceTheMindSculptor.java
@@ -37,7 +37,7 @@ public class JaceTheMindSculptor extends mage.sets.worldwake.JaceTheMindSculptor
 
     public JaceTheMindSculptor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/JarethLeonineTitan.java b/Mage.Sets/src/mage/sets/vintagemasters/JarethLeonineTitan.java
index e9695202c2..38c5c11118 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/JarethLeonineTitan.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/JarethLeonineTitan.java
@@ -37,7 +37,7 @@ public class JarethLeonineTitan extends mage.sets.onslaught.JarethLeonineTitan {
 
     public JarethLeonineTitan(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/JungleWurm.java b/Mage.Sets/src/mage/sets/vintagemasters/JungleWurm.java
index b664eefce7..cf8bf01a75 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/JungleWurm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/JungleWurm.java
@@ -37,7 +37,7 @@ public class JungleWurm extends mage.sets.mirage.JungleWurm {
 
     public JungleWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 217;
+        this.cardNumber = "217";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KarmicGuide.java b/Mage.Sets/src/mage/sets/vintagemasters/KarmicGuide.java
index 447e723f8e..35a8ac5e78 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KarmicGuide.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KarmicGuide.java
@@ -37,7 +37,7 @@ public class KarmicGuide extends mage.sets.urzaslegacy.KarmicGuide {
 
     public KarmicGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KarnSilverGolem.java b/Mage.Sets/src/mage/sets/vintagemasters/KarnSilverGolem.java
index 042c91fdfd..76bc2b65b0 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KarnSilverGolem.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KarnSilverGolem.java
@@ -37,7 +37,7 @@ public class KarnSilverGolem extends mage.sets.urzassaga.KarnSilverGolem {
 
     public KarnSilverGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 270;
+        this.cardNumber = "270";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KeeneyeAven.java b/Mage.Sets/src/mage/sets/vintagemasters/KeeneyeAven.java
index 6343f2e775..cc9381a827 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KeeneyeAven.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KeeneyeAven.java
@@ -37,7 +37,7 @@ public class KeeneyeAven extends mage.sets.legions.KeeneyeAven {
 
     public KeeneyeAven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 75;
+        this.cardNumber = "75";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KeldonNecropolis.java b/Mage.Sets/src/mage/sets/vintagemasters/KeldonNecropolis.java
index b381c00e7c..31104d1124 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KeldonNecropolis.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KeldonNecropolis.java
@@ -37,7 +37,7 @@ public class KeldonNecropolis extends mage.sets.invasion.KeldonNecropolis {
 
     public KeldonNecropolis(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 300;
+        this.cardNumber = "300";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Kezzerdrix.java b/Mage.Sets/src/mage/sets/vintagemasters/Kezzerdrix.java
index 3d02b023e8..64d01e785b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Kezzerdrix.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Kezzerdrix.java
@@ -38,7 +38,7 @@ public class Kezzerdrix extends mage.sets.tempest.Kezzerdrix {
 
     public Kezzerdrix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KillerWhale.java b/Mage.Sets/src/mage/sets/vintagemasters/KillerWhale.java
index de5c3264b6..d284c46cf9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KillerWhale.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KillerWhale.java
@@ -38,7 +38,7 @@ public class KillerWhale extends mage.sets.tempestremastered.KillerWhale {
 
     public KillerWhale(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Kindle.java b/Mage.Sets/src/mage/sets/vintagemasters/Kindle.java
index d6ad8ca1c9..88a3df13f2 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Kindle.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Kindle.java
@@ -37,7 +37,7 @@ public class Kindle extends mage.sets.tempest.Kindle {
 
     public Kindle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 176;
+        this.cardNumber = "176";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KongmingSleepingDragon.java b/Mage.Sets/src/mage/sets/vintagemasters/KongmingSleepingDragon.java
index 26d258bd54..224262a3b0 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KongmingSleepingDragon.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KongmingSleepingDragon.java
@@ -37,7 +37,7 @@ public class KongmingSleepingDragon extends mage.sets.commander2013.KongmingSlee
 
     public KongmingSleepingDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/KrosanTusker.java b/Mage.Sets/src/mage/sets/vintagemasters/KrosanTusker.java
index 40c54e4b16..245e5b5778 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/KrosanTusker.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/KrosanTusker.java
@@ -37,7 +37,7 @@ public class KrosanTusker extends mage.sets.heroesvsmonsters.KrosanTusker {
 
     public KrosanTusker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 218;
+        this.cardNumber = "218";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/LaquatussChampion.java b/Mage.Sets/src/mage/sets/vintagemasters/LaquatussChampion.java
index 69c42d4e3b..e5e8141193 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/LaquatussChampion.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/LaquatussChampion.java
@@ -37,7 +37,7 @@ public class LaquatussChampion extends mage.sets.torment.LaquatussChampion {
 
     public LaquatussChampion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/LightningRift.java b/Mage.Sets/src/mage/sets/vintagemasters/LightningRift.java
index 9cd731fdbd..de7274bd83 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/LightningRift.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/LightningRift.java
@@ -37,7 +37,7 @@ public class LightningRift extends mage.sets.onslaught.LightningRift {
 
     public LightningRift(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 178;
+        this.cardNumber = "178";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/LionsEyeDiamond.java b/Mage.Sets/src/mage/sets/vintagemasters/LionsEyeDiamond.java
index 1c8ad39b1a..a14353bae1 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/LionsEyeDiamond.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/LionsEyeDiamond.java
@@ -38,7 +38,7 @@ public class LionsEyeDiamond extends mage.sets.mirage.LionsEyeDiamond {
 
     public LionsEyeDiamond(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 271;
+        this.cardNumber = "271";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/LivingDeath.java b/Mage.Sets/src/mage/sets/vintagemasters/LivingDeath.java
index 4e4a6740ca..e768feda08 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/LivingDeath.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/LivingDeath.java
@@ -37,7 +37,7 @@ public class LivingDeath extends mage.sets.tempest.LivingDeath {
 
     public LivingDeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 126;
+        this.cardNumber = "126";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/LonelySandbar.java b/Mage.Sets/src/mage/sets/vintagemasters/LonelySandbar.java
index d2391ea111..40e56fe1f6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/LonelySandbar.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/LonelySandbar.java
@@ -37,7 +37,7 @@ public class LonelySandbar extends mage.sets.onslaught.LonelySandbar {
 
     public LonelySandbar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 304;
+        this.cardNumber = "304";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/LurkingEvil.java b/Mage.Sets/src/mage/sets/vintagemasters/LurkingEvil.java
index 5b773367ab..d8b59ba7ce 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/LurkingEvil.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/LurkingEvil.java
@@ -38,7 +38,7 @@ public class LurkingEvil extends mage.sets.urzassaga.LurkingEvil {
 
     public LurkingEvil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 127;
+        this.cardNumber = "127";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MagisterOfWorth.java b/Mage.Sets/src/mage/sets/vintagemasters/MagisterOfWorth.java
index 5242c1ab25..42e082aa00 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MagisterOfWorth.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MagisterOfWorth.java
@@ -38,7 +38,7 @@ public class MagisterOfWorth extends mage.sets.mediainserts.MagisterOfWorth {
 
     public MagisterOfWorth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 255;
+        this.cardNumber = "255";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ManOWar.java b/Mage.Sets/src/mage/sets/vintagemasters/ManOWar.java
index 521f354c47..9ee567cd2e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ManOWar.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ManOWar.java
@@ -37,7 +37,7 @@ public class ManOWar extends mage.sets.visions.ManOWar {
 
     public ManOWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ManaPrism.java b/Mage.Sets/src/mage/sets/vintagemasters/ManaPrism.java
index d09e09f218..d19e6deeff 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ManaPrism.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ManaPrism.java
@@ -38,7 +38,7 @@ public class ManaPrism extends mage.sets.mirage.ManaPrism {
 
     public ManaPrism(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 273;
+        this.cardNumber = "273";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ManaVault.java b/Mage.Sets/src/mage/sets/vintagemasters/ManaVault.java
index d186e61532..71842b3906 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ManaVault.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ManaVault.java
@@ -37,7 +37,7 @@ public class ManaVault extends mage.sets.limitedalpha.ManaVault {
 
     public ManaVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 274;
+        this.cardNumber = "274";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Masticore.java b/Mage.Sets/src/mage/sets/vintagemasters/Masticore.java
index 8725d4d3e1..5406bc5359 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Masticore.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Masticore.java
@@ -37,7 +37,7 @@ public class Masticore extends mage.sets.urzasdestiny.Masticore {
 
     public Masticore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 275;
+        this.cardNumber = "275";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MemoryJar.java b/Mage.Sets/src/mage/sets/vintagemasters/MemoryJar.java
index 9d2c5fc858..84825e7f34 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MemoryJar.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MemoryJar.java
@@ -38,7 +38,7 @@ public class MemoryJar extends mage.sets.urzaslegacy.MemoryJar {
 
     public MemoryJar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 276;
+        this.cardNumber = "276";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MesmericFiend.java b/Mage.Sets/src/mage/sets/vintagemasters/MesmericFiend.java
index 1926cd9c0b..568bbf1471 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MesmericFiend.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MesmericFiend.java
@@ -37,7 +37,7 @@ public class MesmericFiend extends mage.sets.torment.MesmericFiend {
 
     public MesmericFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 128;
+        this.cardNumber = "128";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Morphling.java b/Mage.Sets/src/mage/sets/vintagemasters/Morphling.java
index b996212280..b8e4388804 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Morphling.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Morphling.java
@@ -38,7 +38,7 @@ public class Morphling extends mage.sets.urzassaga.Morphling {
 
     public Morphling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MountainValley.java b/Mage.Sets/src/mage/sets/vintagemasters/MountainValley.java
index 435e870ac5..02788f99b6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MountainValley.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MountainValley.java
@@ -37,7 +37,7 @@ public class MountainValley extends mage.sets.mirage.MountainValley {
 
     public MountainValley(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 306;
+        this.cardNumber = "306";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MoxEmerald.java b/Mage.Sets/src/mage/sets/vintagemasters/MoxEmerald.java
index b9ae5b58e5..8dcd95eace 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MoxEmerald.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MoxEmerald.java
@@ -38,7 +38,7 @@ public class MoxEmerald extends mage.sets.limitedalpha.MoxEmerald {
 
     public MoxEmerald(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MoxJet.java b/Mage.Sets/src/mage/sets/vintagemasters/MoxJet.java
index 2b50d67659..dcf7244243 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MoxJet.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MoxJet.java
@@ -38,7 +38,7 @@ public class MoxJet extends mage.sets.limitedalpha.MoxJet {
 
     public MoxJet(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MoxPearl.java b/Mage.Sets/src/mage/sets/vintagemasters/MoxPearl.java
index 4c30b6ad07..d2eb638d41 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MoxPearl.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MoxPearl.java
@@ -38,7 +38,7 @@ public class MoxPearl extends mage.sets.limitedalpha.MoxPearl {
 
     public MoxPearl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MoxRuby.java b/Mage.Sets/src/mage/sets/vintagemasters/MoxRuby.java
index e0a2b777e2..1a3ab6854b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MoxRuby.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MoxRuby.java
@@ -38,7 +38,7 @@ public class MoxRuby extends mage.sets.limitedalpha.MoxRuby {
 
     public MoxRuby(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MoxSapphire.java b/Mage.Sets/src/mage/sets/vintagemasters/MoxSapphire.java
index a843accb31..112f32b9ab 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MoxSapphire.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MoxSapphire.java
@@ -38,7 +38,7 @@ public class MoxSapphire extends mage.sets.limitedalpha.MoxSapphire {
 
     public MoxSapphire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MuzzioVisionaryArchitect.java b/Mage.Sets/src/mage/sets/vintagemasters/MuzzioVisionaryArchitect.java
index 6af2163443..610ded851a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MuzzioVisionaryArchitect.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MuzzioVisionaryArchitect.java
@@ -37,7 +37,7 @@ public class MuzzioVisionaryArchitect extends mage.sets.conspiracy.MuzzioVisiona
 
     public MuzzioVisionaryArchitect(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MysticZealot.java b/Mage.Sets/src/mage/sets/vintagemasters/MysticZealot.java
index c1295311c1..e207fa8f72 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MysticZealot.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MysticZealot.java
@@ -38,7 +38,7 @@ public class MysticZealot extends mage.sets.odyssey.MysticZealot {
 
     public MysticZealot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NaturesLore.java b/Mage.Sets/src/mage/sets/vintagemasters/NaturesLore.java
index fa3b291e45..6be6ec0f55 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/NaturesLore.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/NaturesLore.java
@@ -38,7 +38,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore {
 
     public NaturesLore(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 220;
+        this.cardNumber = "220";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Necropotence.java b/Mage.Sets/src/mage/sets/vintagemasters/Necropotence.java
index dfe4831514..c697f8c03e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Necropotence.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Necropotence.java
@@ -37,7 +37,7 @@ public class Necropotence extends mage.sets.iceage.Necropotence {
 
     public Necropotence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 130;
+        this.cardNumber = "130";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/vintagemasters/NevinyrralsDisk.java
index 013bc0d642..034f6a76a3 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/NevinyrralsDisk.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/NevinyrralsDisk.java
@@ -37,7 +37,7 @@ public class NevinyrralsDisk extends mage.sets.fifthedition.NevinyrralsDisk {
 
     public NevinyrralsDisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 277;
+        this.cardNumber = "277";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NightscapeFamiliar.java b/Mage.Sets/src/mage/sets/vintagemasters/NightscapeFamiliar.java
index 1ff8d42e51..9d9ad0a582 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/NightscapeFamiliar.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/NightscapeFamiliar.java
@@ -37,7 +37,7 @@ public class NightscapeFamiliar extends mage.sets.planeshift.NightscapeFamiliar
 
     public NightscapeFamiliar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NobleTemplar.java b/Mage.Sets/src/mage/sets/vintagemasters/NobleTemplar.java
index b8c3bd7c35..e355b4525f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/NobleTemplar.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/NobleTemplar.java
@@ -37,7 +37,7 @@ public class NobleTemplar extends mage.sets.scourge.NobleTemplar {
 
     public NobleTemplar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NostalgicDreams.java b/Mage.Sets/src/mage/sets/vintagemasters/NostalgicDreams.java
index 3aadc9a6a8..5c2c5c19f5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/NostalgicDreams.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/NostalgicDreams.java
@@ -38,7 +38,7 @@ public class NostalgicDreams extends mage.sets.torment.NostalgicDreams {
 
     public NostalgicDreams(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 222;
+        this.cardNumber = "222";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/NullRod.java b/Mage.Sets/src/mage/sets/vintagemasters/NullRod.java
index 745a6e813e..e48f9088af 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/NullRod.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/NullRod.java
@@ -37,7 +37,7 @@ public class NullRod extends mage.sets.weatherlight.NullRod {
 
     public NullRod(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 278;
+        this.cardNumber = "278";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/OathOfDruids.java b/Mage.Sets/src/mage/sets/vintagemasters/OathOfDruids.java
index 4b49f3a65b..cae55d1aad 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/OathOfDruids.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/OathOfDruids.java
@@ -38,7 +38,7 @@ public class OathOfDruids extends mage.sets.exodus.OathOfDruids {
 
     public OathOfDruids(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 223;
+        this.cardNumber = "223";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ObsessiveSearch.java b/Mage.Sets/src/mage/sets/vintagemasters/ObsessiveSearch.java
index a11ad06406..5b428c549b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ObsessiveSearch.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ObsessiveSearch.java
@@ -37,7 +37,7 @@ public class ObsessiveSearch extends mage.sets.torment.ObsessiveSearch {
 
     public ObsessiveSearch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/OrcishLumberjack.java b/Mage.Sets/src/mage/sets/vintagemasters/OrcishLumberjack.java
index b60cfff334..dbb9be2a31 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/OrcishLumberjack.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/OrcishLumberjack.java
@@ -37,7 +37,7 @@ public class OrcishLumberjack extends mage.sets.heroesvsmonsters.OrcishLumberjac
 
     public OrcishLumberjack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 179;
+        this.cardNumber = "179";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Palinchron.java b/Mage.Sets/src/mage/sets/vintagemasters/Palinchron.java
index 470dd93f6a..103b5b8a0d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Palinchron.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Palinchron.java
@@ -37,7 +37,7 @@ public class Palinchron extends mage.sets.urzaslegacy.Palinchron {
 
     public Palinchron(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ParallaxWave.java b/Mage.Sets/src/mage/sets/vintagemasters/ParallaxWave.java
index d7657b28d6..0685245e41 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ParallaxWave.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ParallaxWave.java
@@ -37,7 +37,7 @@ public class ParallaxWave extends mage.sets.nemesis.ParallaxWave {
 
     public ParallaxWave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Paralyze.java b/Mage.Sets/src/mage/sets/vintagemasters/Paralyze.java
index e843908a2c..030cae1b7d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Paralyze.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Paralyze.java
@@ -37,7 +37,7 @@ public class Paralyze extends mage.sets.limitedalpha.Paralyze {
 
     public Paralyze(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 132;
+        this.cardNumber = "132";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PenumbraWurm.java b/Mage.Sets/src/mage/sets/vintagemasters/PenumbraWurm.java
index 1d80c625ca..9b708907f6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PenumbraWurm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PenumbraWurm.java
@@ -38,7 +38,7 @@ public class PenumbraWurm extends mage.sets.apocalypse.PenumbraWurm {
 
     public PenumbraWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 224;
+        this.cardNumber = "224";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PhantomNomad.java b/Mage.Sets/src/mage/sets/vintagemasters/PhantomNomad.java
index e0407c8277..11194608d2 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PhantomNomad.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PhantomNomad.java
@@ -37,7 +37,7 @@ public class PhantomNomad extends mage.sets.judgment.PhantomNomad {
 
     public PhantomNomad(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PhyrexianDefiler.java b/Mage.Sets/src/mage/sets/vintagemasters/PhyrexianDefiler.java
index 1e40a4f301..12fcc954a2 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PhyrexianDefiler.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PhyrexianDefiler.java
@@ -37,7 +37,7 @@ public class PhyrexianDefiler extends mage.sets.urzaslegacy.PhyrexianDefiler {
 
     public PhyrexianDefiler(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PiannaNomadCaptain.java b/Mage.Sets/src/mage/sets/vintagemasters/PiannaNomadCaptain.java
index 0df4ddbf28..1dd76e7d2d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PiannaNomadCaptain.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PiannaNomadCaptain.java
@@ -38,7 +38,7 @@ public class PiannaNomadCaptain extends mage.sets.odyssey.PiannaNomadCaptain {
 
     public PiannaNomadCaptain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PineBarrens.java b/Mage.Sets/src/mage/sets/vintagemasters/PineBarrens.java
index b950fc6393..9f22ea28a0 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PineBarrens.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PineBarrens.java
@@ -38,7 +38,7 @@ public class PineBarrens extends mage.sets.tempest.PineBarrens {
 
     public PineBarrens(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 307;
+        this.cardNumber = "307";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Plateau.java b/Mage.Sets/src/mage/sets/vintagemasters/Plateau.java
index a4377bac9a..22924a263e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Plateau.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Plateau.java
@@ -37,7 +37,7 @@ public class Plateau extends mage.sets.limitedalpha.Plateau {
 
     public Plateau(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 308;
+        this.cardNumber = "308";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PowerSink.java b/Mage.Sets/src/mage/sets/vintagemasters/PowerSink.java
index e729544018..9d10417572 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PowerSink.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PowerSink.java
@@ -38,7 +38,7 @@ public class PowerSink extends mage.sets.limitedalpha.PowerSink {
 
     public PowerSink(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PredatorFlagship.java b/Mage.Sets/src/mage/sets/vintagemasters/PredatorFlagship.java
index 4dd5edf8d9..4fe5e43d5f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PredatorFlagship.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PredatorFlagship.java
@@ -37,7 +37,7 @@ public class PredatorFlagship extends mage.sets.commander2014.PredatorFlagship {
 
     public PredatorFlagship(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 279;
+        this.cardNumber = "279";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PropheticBolt.java b/Mage.Sets/src/mage/sets/vintagemasters/PropheticBolt.java
index ff8d313f41..d54dbf71b6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PropheticBolt.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PropheticBolt.java
@@ -38,7 +38,7 @@ public class PropheticBolt extends mage.sets.commander.PropheticBolt {
 
     public PropheticBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 257;
+        this.cardNumber = "257";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Provoke.java b/Mage.Sets/src/mage/sets/vintagemasters/Provoke.java
index ba927b6ac6..750dd04bf5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Provoke.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Provoke.java
@@ -37,7 +37,7 @@ public class Provoke extends mage.sets.stronghold.Provoke {
 
     public Provoke(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 225;
+        this.cardNumber = "225";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/PutridImp.java b/Mage.Sets/src/mage/sets/vintagemasters/PutridImp.java
index c4f4bb98b0..6dd9ca0035 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/PutridImp.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/PutridImp.java
@@ -37,7 +37,7 @@ public class PutridImp extends mage.sets.torment.PutridImp {
 
     public PutridImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 135;
+        this.cardNumber = "135";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RadiantArchangel.java b/Mage.Sets/src/mage/sets/vintagemasters/RadiantArchangel.java
index 556a9351d6..ea7294ea72 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RadiantArchangel.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RadiantArchangel.java
@@ -38,7 +38,7 @@ public class RadiantArchangel extends mage.sets.urzaslegacy.RadiantArchangel {
 
     public RadiantArchangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RadiantsJudgment.java b/Mage.Sets/src/mage/sets/vintagemasters/RadiantsJudgment.java
index 3d334f3ce3..01a6c72b4d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RadiantsJudgment.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RadiantsJudgment.java
@@ -37,7 +37,7 @@ public class RadiantsJudgment extends mage.sets.urzaslegacy.RadiantsJudgment {
 
     public RadiantsJudgment(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RealmSeekers.java b/Mage.Sets/src/mage/sets/vintagemasters/RealmSeekers.java
index 0d3c0f1c62..e5f356d405 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RealmSeekers.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RealmSeekers.java
@@ -37,7 +37,7 @@ public class RealmSeekers extends mage.sets.conspiracy.RealmSeekers {
 
     public RealmSeekers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 226;
+        this.cardNumber = "226";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Reanimate.java b/Mage.Sets/src/mage/sets/vintagemasters/Reanimate.java
index 89fdbc3f39..49577ecd8c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Reanimate.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Reanimate.java
@@ -37,7 +37,7 @@ public class Reanimate extends mage.sets.tempest.Reanimate {
 
     public Reanimate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 136;
+        this.cardNumber = "136";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RecklessCharge.java b/Mage.Sets/src/mage/sets/vintagemasters/RecklessCharge.java
index e560f89ab8..3feb20526f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RecklessCharge.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RecklessCharge.java
@@ -37,7 +37,7 @@ public class RecklessCharge extends mage.sets.planechase.RecklessCharge {
 
     public RecklessCharge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 181;
+        this.cardNumber = "181";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RecurringNightmare.java b/Mage.Sets/src/mage/sets/vintagemasters/RecurringNightmare.java
index 15a987c23d..0c9bab6735 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RecurringNightmare.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RecurringNightmare.java
@@ -37,7 +37,7 @@ public class RecurringNightmare extends mage.sets.exodus.RecurringNightmare {
 
     public RecurringNightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Regrowth.java b/Mage.Sets/src/mage/sets/vintagemasters/Regrowth.java
index 32677dd39e..a1511d1b35 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Regrowth.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Regrowth.java
@@ -38,7 +38,7 @@ public class Regrowth extends mage.sets.limitedalpha.Regrowth {
 
     public Regrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 227;
+        this.cardNumber = "227";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RenewedFaith.java b/Mage.Sets/src/mage/sets/vintagemasters/RenewedFaith.java
index 0871cfe627..5e38026935 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RenewedFaith.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RenewedFaith.java
@@ -37,7 +37,7 @@ public class RenewedFaith extends mage.sets.onslaught.RenewedFaith {
 
     public RenewedFaith(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Repel.java b/Mage.Sets/src/mage/sets/vintagemasters/Repel.java
index 25d1ba56ac..3fe14028dd 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Repel.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Repel.java
@@ -37,7 +37,7 @@ public class Repel extends mage.sets.odyssey.Repel {
 
     public Repel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 89;
+        this.cardNumber = "89";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Rescind.java b/Mage.Sets/src/mage/sets/vintagemasters/Rescind.java
index 831f6955ba..e89024a760 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Rescind.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Rescind.java
@@ -37,7 +37,7 @@ public class Rescind extends mage.sets.urzassaga.Rescind {
 
     public Rescind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RevivingVapors.java b/Mage.Sets/src/mage/sets/vintagemasters/RevivingVapors.java
index fb3ca12810..49ba548b04 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RevivingVapors.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RevivingVapors.java
@@ -37,7 +37,7 @@ public class RevivingVapors extends mage.sets.invasion.RevivingVapors {
 
     public RevivingVapors(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 259;
+        this.cardNumber = "259";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RingOfGix.java b/Mage.Sets/src/mage/sets/vintagemasters/RingOfGix.java
index 00db904ed2..637fb18628 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RingOfGix.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RingOfGix.java
@@ -37,7 +37,7 @@ public class RingOfGix extends mage.sets.urzaslegacy.RingOfGix {
 
     public RingOfGix(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 280;
+        this.cardNumber = "280";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RitesOfInitiation.java b/Mage.Sets/src/mage/sets/vintagemasters/RitesOfInitiation.java
index 987948e7ab..864eef8a20 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RitesOfInitiation.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RitesOfInitiation.java
@@ -38,7 +38,7 @@ public class RitesOfInitiation extends mage.sets.odyssey.RitesOfInitiation {
 
     public RitesOfInitiation(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 182;
+        this.cardNumber = "182";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RoarOfTheWurm.java b/Mage.Sets/src/mage/sets/vintagemasters/RoarOfTheWurm.java
index 4a99c9473f..541616406d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RoarOfTheWurm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RoarOfTheWurm.java
@@ -37,7 +37,7 @@ public class RoarOfTheWurm extends mage.sets.odyssey.RoarOfTheWurm {
 
     public RoarOfTheWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 228;
+        this.cardNumber = "228";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RockyTarPit.java b/Mage.Sets/src/mage/sets/vintagemasters/RockyTarPit.java
index abe6bc4665..a7aaa9eda3 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RockyTarPit.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RockyTarPit.java
@@ -37,7 +37,7 @@ public class RockyTarPit extends mage.sets.mirage.RockyTarPit {
 
     public RockyTarPit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 309;
+        this.cardNumber = "309";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RofellosLlanowarEmissary.java b/Mage.Sets/src/mage/sets/vintagemasters/RofellosLlanowarEmissary.java
index 6bbb374ac4..bda752e8ca 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RofellosLlanowarEmissary.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RofellosLlanowarEmissary.java
@@ -37,7 +37,7 @@ public class RofellosLlanowarEmissary extends mage.sets.urzasdestiny.RofellosLla
 
     public RofellosLlanowarEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 229;
+        this.cardNumber = "229";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/RorixBladewing.java b/Mage.Sets/src/mage/sets/vintagemasters/RorixBladewing.java
index cca2b93389..9c9ecffe31 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/RorixBladewing.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/RorixBladewing.java
@@ -37,7 +37,7 @@ public class RorixBladewing extends mage.sets.planechase.RorixBladewing {
 
     public RorixBladewing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 183;
+        this.cardNumber = "183";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SaltFlats.java b/Mage.Sets/src/mage/sets/vintagemasters/SaltFlats.java
index 8ca9cf219b..8ed5209163 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SaltFlats.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SaltFlats.java
@@ -38,7 +38,7 @@ public class SaltFlats extends mage.sets.tempest.SaltFlats {
 
     public SaltFlats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 310;
+        this.cardNumber = "310";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Sarcomancy.java b/Mage.Sets/src/mage/sets/vintagemasters/Sarcomancy.java
index dacf809fbd..ee554f4af4 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Sarcomancy.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Sarcomancy.java
@@ -38,7 +38,7 @@ public class Sarcomancy extends mage.sets.tempest.Sarcomancy {
 
     public Sarcomancy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 139;
+        this.cardNumber = "139";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Savannah.java b/Mage.Sets/src/mage/sets/vintagemasters/Savannah.java
index 106a8ecca6..87b8849406 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Savannah.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Savannah.java
@@ -37,7 +37,7 @@ public class Savannah extends mage.sets.limitedalpha.Savannah {
 
     public Savannah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 311;
+        this.cardNumber = "311";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Scabland.java b/Mage.Sets/src/mage/sets/vintagemasters/Scabland.java
index e7b67997bd..f637cac439 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Scabland.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Scabland.java
@@ -38,7 +38,7 @@ public class Scabland extends mage.sets.tempest.Scabland {
 
     public Scabland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 312;
+        this.cardNumber = "312";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Scrivener.java b/Mage.Sets/src/mage/sets/vintagemasters/Scrivener.java
index 441318721e..93aa7caca3 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Scrivener.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Scrivener.java
@@ -38,7 +38,7 @@ public class Scrivener extends mage.sets.exodus.Scrivener {
 
     public Scrivener(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Scrubland.java b/Mage.Sets/src/mage/sets/vintagemasters/Scrubland.java
index dc0b04c027..9b3454960d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Scrubland.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Scrubland.java
@@ -37,7 +37,7 @@ public class Scrubland extends mage.sets.limitedalpha.Scrubland {
 
     public Scrubland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 313;
+        this.cardNumber = "313";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SeaDrake.java b/Mage.Sets/src/mage/sets/vintagemasters/SeaDrake.java
index 35d5a960a8..d97bb411ea 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SeaDrake.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SeaDrake.java
@@ -38,7 +38,7 @@ public class SeaDrake extends mage.sets.masterseditionii.SeaDrake {
 
     public SeaDrake(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 92;
+        this.cardNumber = "92";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SealOfCleansing.java b/Mage.Sets/src/mage/sets/vintagemasters/SealOfCleansing.java
index 9905f06918..22617c343d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SealOfCleansing.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SealOfCleansing.java
@@ -37,7 +37,7 @@ public class SealOfCleansing extends mage.sets.nemesis.SealOfCleansing {
 
     public SealOfCleansing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SecludedSteppe.java b/Mage.Sets/src/mage/sets/vintagemasters/SecludedSteppe.java
index b65c07f3f6..bb8188b145 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SecludedSteppe.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SecludedSteppe.java
@@ -37,7 +37,7 @@ public class SecludedSteppe extends mage.sets.onslaught.SecludedSteppe {
 
     public SecludedSteppe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 314;
+        this.cardNumber = "314";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Shelter.java b/Mage.Sets/src/mage/sets/vintagemasters/Shelter.java
index dc06921ae1..1e23abc0d0 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Shelter.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Shelter.java
@@ -37,7 +37,7 @@ public class Shelter extends mage.sets.odyssey.Shelter {
 
     public Shelter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SidarJabari.java b/Mage.Sets/src/mage/sets/vintagemasters/SidarJabari.java
index 64c268a955..5a608ed402 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SidarJabari.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SidarJabari.java
@@ -38,7 +38,7 @@ public class SidarJabari extends mage.sets.mirage.SidarJabari {
 
     public SidarJabari(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SilvosRogueElemental.java b/Mage.Sets/src/mage/sets/vintagemasters/SilvosRogueElemental.java
index 922a755f03..14fa1a4c48 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SilvosRogueElemental.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SilvosRogueElemental.java
@@ -37,7 +37,7 @@ public class SilvosRogueElemental extends mage.sets.onslaught.SilvosRogueElement
 
     public SilvosRogueElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 231;
+        this.cardNumber = "231";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SimianGrunts.java b/Mage.Sets/src/mage/sets/vintagemasters/SimianGrunts.java
index d19e2c5f2c..a5898dd36e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SimianGrunts.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SimianGrunts.java
@@ -37,7 +37,7 @@ public class SimianGrunts extends mage.sets.urzaslegacy.SimianGrunts {
 
     public SimianGrunts(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 232;
+        this.cardNumber = "232";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SkirkDrillSergeant.java b/Mage.Sets/src/mage/sets/vintagemasters/SkirkDrillSergeant.java
index cdbc1ecd76..ddf7f160ad 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SkirkDrillSergeant.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SkirkDrillSergeant.java
@@ -38,7 +38,7 @@ public class SkirkDrillSergeant extends mage.sets.elvesvsgoblins.SkirkDrillSerge
 
     public SkirkDrillSergeant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 185;
+        this.cardNumber = "185";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SkirkProspector.java b/Mage.Sets/src/mage/sets/vintagemasters/SkirkProspector.java
index b4e70aeed8..b3d297e0c8 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SkirkProspector.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SkirkProspector.java
@@ -37,7 +37,7 @@ public class SkirkProspector extends mage.sets.onslaught.SkirkProspector {
 
     public SkirkProspector(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 186;
+        this.cardNumber = "186";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Skullclamp.java b/Mage.Sets/src/mage/sets/vintagemasters/Skullclamp.java
index 2fc728e556..d758adfa7a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Skullclamp.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Skullclamp.java
@@ -38,7 +38,7 @@ public class Skullclamp extends mage.sets.darksteel.Skullclamp {
 
     public Skullclamp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 281;
+        this.cardNumber = "281";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SkyshroudForest.java b/Mage.Sets/src/mage/sets/vintagemasters/SkyshroudForest.java
index 4e29841fe7..dd9fbaa537 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SkyshroudForest.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SkyshroudForest.java
@@ -38,7 +38,7 @@ public class SkyshroudForest extends mage.sets.tempest.SkyshroudForest {
 
     public SkyshroudForest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 315;
+        this.cardNumber = "315";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SkywingAven.java b/Mage.Sets/src/mage/sets/vintagemasters/SkywingAven.java
index 66543897d2..878c72723d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SkywingAven.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SkywingAven.java
@@ -37,7 +37,7 @@ public class SkywingAven extends mage.sets.torment.SkywingAven {
 
     public SkywingAven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Smokestack.java b/Mage.Sets/src/mage/sets/vintagemasters/Smokestack.java
index 116edd91ce..1058cf05dc 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Smokestack.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Smokestack.java
@@ -37,7 +37,7 @@ public class Smokestack extends mage.sets.urzassaga.Smokestack {
 
     public Smokestack(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 282;
+        this.cardNumber = "282";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SolRing.java b/Mage.Sets/src/mage/sets/vintagemasters/SolRing.java
index baf7b889f4..d2bce32469 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SolRing.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SolRing.java
@@ -38,7 +38,7 @@ public class SolRing extends mage.sets.revisededition.SolRing {
 
     public SolRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 283;
+        this.cardNumber = "283";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SolarBlast.java b/Mage.Sets/src/mage/sets/vintagemasters/SolarBlast.java
index 762aa61b69..fa14148192 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SolarBlast.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SolarBlast.java
@@ -37,7 +37,7 @@ public class SolarBlast extends mage.sets.onslaught.SolarBlast {
 
     public SolarBlast(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 187;
+        this.cardNumber = "187";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SoltariEmissary.java b/Mage.Sets/src/mage/sets/vintagemasters/SoltariEmissary.java
index 19829f6885..2700d1762a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SoltariEmissary.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SoltariEmissary.java
@@ -38,7 +38,7 @@ public class SoltariEmissary extends mage.sets.tempest.SoltariEmissary {
 
     public SoltariEmissary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SoltariTrooper.java b/Mage.Sets/src/mage/sets/vintagemasters/SoltariTrooper.java
index a20a423ce2..8752eec7be 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SoltariTrooper.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SoltariTrooper.java
@@ -37,7 +37,7 @@ public class SoltariTrooper extends mage.sets.tempest.SoltariTrooper {
 
     public SoltariTrooper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SphereOfResistance.java b/Mage.Sets/src/mage/sets/vintagemasters/SphereOfResistance.java
index 95da8c47a1..c553fdea0d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SphereOfResistance.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SphereOfResistance.java
@@ -37,7 +37,7 @@ public class SphereOfResistance extends mage.sets.exodus.SphereOfResistance {
 
     public SphereOfResistance(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 284;
+        this.cardNumber = "284";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SpiritMirror.java b/Mage.Sets/src/mage/sets/vintagemasters/SpiritMirror.java
index fb42a5795b..e868d32f7f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SpiritMirror.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SpiritMirror.java
@@ -37,7 +37,7 @@ public class SpiritMirror extends mage.sets.tempest.SpiritMirror {
 
     public SpiritMirror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Spiritmonger.java b/Mage.Sets/src/mage/sets/vintagemasters/Spiritmonger.java
index b8b352ac86..647e0b3ea5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Spiritmonger.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Spiritmonger.java
@@ -37,7 +37,7 @@ public class Spiritmonger extends mage.sets.apocalypse.Spiritmonger {
 
     public Spiritmonger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 262;
+        this.cardNumber = "262";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Starstorm.java b/Mage.Sets/src/mage/sets/vintagemasters/Starstorm.java
index 04e9178d39..5208b5bfc9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Starstorm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Starstorm.java
@@ -37,7 +37,7 @@ public class Starstorm extends mage.sets.onslaught.Starstorm {
 
     public Starstorm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 189;
+        this.cardNumber = "189";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/StripMine.java b/Mage.Sets/src/mage/sets/vintagemasters/StripMine.java
index 797858618f..6f1bae2146 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/StripMine.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/StripMine.java
@@ -38,7 +38,7 @@ public class StripMine extends mage.sets.fourthedition.StripMine {
 
     public StripMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 316;
+        this.cardNumber = "316";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/vintagemasters/StrokeOfGenius.java
index 2df32b6957..4a3f7fcfcf 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/StrokeOfGenius.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/StrokeOfGenius.java
@@ -37,7 +37,7 @@ public class StrokeOfGenius extends mage.sets.urzassaga.StrokeOfGenius {
 
     public StrokeOfGenius(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SuddenStrength.java b/Mage.Sets/src/mage/sets/vintagemasters/SuddenStrength.java
index 72309dd421..df0c9d2f36 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SuddenStrength.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SuddenStrength.java
@@ -37,7 +37,7 @@ public class SuddenStrength extends mage.sets.judgment.SuddenStrength {
 
     public SuddenStrength(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 233;
+        this.cardNumber = "233";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SulfuricVortex.java b/Mage.Sets/src/mage/sets/vintagemasters/SulfuricVortex.java
index 9980eeb95a..3ce8438ace 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SulfuricVortex.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SulfuricVortex.java
@@ -37,7 +37,7 @@ public class SulfuricVortex extends mage.sets.scourge.SulfuricVortex {
 
     public SulfuricVortex(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 190;
+        this.cardNumber = "190";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/sets/vintagemasters/SurvivalOfTheFittest.java
index 1f7ae6cda7..80a42689ec 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SurvivalOfTheFittest.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SurvivalOfTheFittest.java
@@ -37,7 +37,7 @@ public class SurvivalOfTheFittest extends mage.sets.exodus.SurvivalOfTheFittest
 
     public SurvivalOfTheFittest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 234;
+        this.cardNumber = "234";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/vintagemasters/SwordsToPlowshares.java
index a4797927e1..4ba62be66e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SwordsToPlowshares.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SwordsToPlowshares.java
@@ -37,7 +37,7 @@ public class SwordsToPlowshares extends mage.sets.fourthedition.SwordsToPlowshar
 
     public SwordsToPlowshares(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SylvanLibrary.java b/Mage.Sets/src/mage/sets/vintagemasters/SylvanLibrary.java
index 3e73ddb521..39c3e6a32b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SylvanLibrary.java
@@ -37,7 +37,7 @@ public class SylvanLibrary extends mage.sets.fifthedition.SylvanLibrary {
 
     public SylvanLibrary(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 235;
+        this.cardNumber = "235";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SymbioticWurm.java b/Mage.Sets/src/mage/sets/vintagemasters/SymbioticWurm.java
index 67ce17fd7d..8c61cd4a1c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/SymbioticWurm.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SymbioticWurm.java
@@ -38,7 +38,7 @@ public class SymbioticWurm extends mage.sets.onslaught.SymbioticWurm {
 
     public SymbioticWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 236;
+        this.cardNumber = "236";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Taiga.java b/Mage.Sets/src/mage/sets/vintagemasters/Taiga.java
index 5c4bc779dc..a9c0466b4a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Taiga.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Taiga.java
@@ -37,7 +37,7 @@ public class Taiga extends mage.sets.limitedalpha.Taiga {
 
     public Taiga(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 317;
+        this.cardNumber = "317";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Tangle.java b/Mage.Sets/src/mage/sets/vintagemasters/Tangle.java
index 4f0d21e609..6cf6b9fc82 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Tangle.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Tangle.java
@@ -38,7 +38,7 @@ public class Tangle extends mage.sets.invasion.Tangle {
 
     public Tangle(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 237;
+        this.cardNumber = "237";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TemporalFissure.java b/Mage.Sets/src/mage/sets/vintagemasters/TemporalFissure.java
index f19e9ecf92..91f2732ff4 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TemporalFissure.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TemporalFissure.java
@@ -37,7 +37,7 @@ public class TemporalFissure extends mage.sets.scourge.TemporalFissure {
 
     public TemporalFissure(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TendrilsOfAgony.java b/Mage.Sets/src/mage/sets/vintagemasters/TendrilsOfAgony.java
index 18335ffddb..0b2ec18bed 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TendrilsOfAgony.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TendrilsOfAgony.java
@@ -37,7 +37,7 @@ public class TendrilsOfAgony extends mage.sets.scourge.TendrilsOfAgony {
 
     public TendrilsOfAgony(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 142;
+        this.cardNumber = "142";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ThalakosDrifters.java b/Mage.Sets/src/mage/sets/vintagemasters/ThalakosDrifters.java
index 5e6ff29627..fd7900ab90 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ThalakosDrifters.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ThalakosDrifters.java
@@ -37,7 +37,7 @@ public class ThalakosDrifters extends mage.sets.tempestremastered.ThalakosDrifte
 
     public ThalakosDrifters(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 97;
+        this.cardNumber = "97";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TimeVault.java b/Mage.Sets/src/mage/sets/vintagemasters/TimeVault.java
index a4a829e2a1..db03db6f66 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TimeVault.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TimeVault.java
@@ -38,7 +38,7 @@ public class TimeVault extends mage.sets.unlimitededition.TimeVault {
 
     public TimeVault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 287;
+        this.cardNumber = "287";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TimeWalk.java b/Mage.Sets/src/mage/sets/vintagemasters/TimeWalk.java
index e1003297ed..4f124d18b6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TimeWalk.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TimeWalk.java
@@ -38,7 +38,7 @@ public class TimeWalk extends mage.sets.limitedalpha.TimeWalk {
 
     public TimeWalk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Timetwister.java b/Mage.Sets/src/mage/sets/vintagemasters/Timetwister.java
index 7464f09352..a2345089e8 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Timetwister.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Timetwister.java
@@ -38,7 +38,7 @@ public class Timetwister extends mage.sets.limitedalpha.Timetwister {
 
     public Timetwister(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.BONUS;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TolarianAcademy.java b/Mage.Sets/src/mage/sets/vintagemasters/TolarianAcademy.java
index a332775585..4831cc2e0e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TolarianAcademy.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TolarianAcademy.java
@@ -38,7 +38,7 @@ public class TolarianAcademy extends mage.sets.urzassaga.TolarianAcademy {
 
     public TolarianAcademy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 319;
+        this.cardNumber = "319";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TradewindRider.java b/Mage.Sets/src/mage/sets/vintagemasters/TradewindRider.java
index 6a64db21f4..5e5cffe63f 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TradewindRider.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TradewindRider.java
@@ -37,7 +37,7 @@ public class TradewindRider extends mage.sets.tempest.TradewindRider {
 
     public TradewindRider(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 98;
+        this.cardNumber = "98";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TranquilThicket.java b/Mage.Sets/src/mage/sets/vintagemasters/TranquilThicket.java
index 856a776b60..fe9eebf4b8 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TranquilThicket.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TranquilThicket.java
@@ -37,7 +37,7 @@ public class TranquilThicket extends mage.sets.onslaught.TranquilThicket {
 
     public TranquilThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 320;
+        this.cardNumber = "320";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TributeToTheWild.java b/Mage.Sets/src/mage/sets/vintagemasters/TributeToTheWild.java
index cf4428d61d..29cd19fe32 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TributeToTheWild.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TributeToTheWild.java
@@ -38,7 +38,7 @@ public class TributeToTheWild extends mage.sets.commander.TributeToTheWild {
 
     public TributeToTheWild(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 238;
+        this.cardNumber = "238";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TropicalIsland.java b/Mage.Sets/src/mage/sets/vintagemasters/TropicalIsland.java
index efb5d047d2..968d7aea22 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TropicalIsland.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TropicalIsland.java
@@ -37,7 +37,7 @@ public class TropicalIsland extends mage.sets.limitedalpha.TropicalIsland {
 
     public TropicalIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 321;
+        this.cardNumber = "321";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Tundra.java b/Mage.Sets/src/mage/sets/vintagemasters/Tundra.java
index abf0e37740..f5a1a554d9 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Tundra.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Tundra.java
@@ -37,7 +37,7 @@ public class Tundra extends mage.sets.limitedalpha.Tundra {
 
     public Tundra(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 322;
+        this.cardNumber = "322";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Turnabout.java b/Mage.Sets/src/mage/sets/vintagemasters/Turnabout.java
index a4f1098bbd..f591297b28 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Turnabout.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Turnabout.java
@@ -37,7 +37,7 @@ public class Turnabout extends mage.sets.urzassaga.Turnabout {
 
     public Turnabout(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/TyrantsChoice.java b/Mage.Sets/src/mage/sets/vintagemasters/TyrantsChoice.java
index b655df48f6..ab7e04feb6 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/TyrantsChoice.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/TyrantsChoice.java
@@ -37,7 +37,7 @@ public class TyrantsChoice extends mage.sets.conspiracy.TyrantsChoice {
 
     public TyrantsChoice(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/UndergroundSea.java b/Mage.Sets/src/mage/sets/vintagemasters/UndergroundSea.java
index aaf1bf164a..958ea330cf 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/UndergroundSea.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/UndergroundSea.java
@@ -37,7 +37,7 @@ public class UndergroundSea extends mage.sets.limitedalpha.UndergroundSea {
 
     public UndergroundSea(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 323;
+        this.cardNumber = "323";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/Upheaval.java b/Mage.Sets/src/mage/sets/vintagemasters/Upheaval.java
index 3ab0b12aa7..05b038761c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/Upheaval.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/Upheaval.java
@@ -38,7 +38,7 @@ public class Upheaval extends mage.sets.odyssey.Upheaval {
 
     public Upheaval(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/UrborgUprising.java b/Mage.Sets/src/mage/sets/vintagemasters/UrborgUprising.java
index 4d1baadc87..3b487fec70 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/UrborgUprising.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/UrborgUprising.java
@@ -9,7 +9,7 @@ public class UrborgUprising extends mage.sets.apocalypse.UrborgUprising {
 
     public UrborgUprising(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 144;
+        this.cardNumber = "144";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/VampiricTutor.java b/Mage.Sets/src/mage/sets/vintagemasters/VampiricTutor.java
index 7254ea69ec..f0ace93e20 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/VampiricTutor.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/VampiricTutor.java
@@ -37,7 +37,7 @@ public class VampiricTutor extends mage.sets.visions.VampiricTutor {
 
     public VampiricTutor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 145;
+        this.cardNumber = "145";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/VisaraTheDreadful.java b/Mage.Sets/src/mage/sets/vintagemasters/VisaraTheDreadful.java
index 14fc07c201..f913f39316 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/VisaraTheDreadful.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/VisaraTheDreadful.java
@@ -37,7 +37,7 @@ public class VisaraTheDreadful extends mage.sets.onslaught.VisaraTheDreadful {
 
     public VisaraTheDreadful(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 146;
+        this.cardNumber = "146";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/VolcanicIsland.java b/Mage.Sets/src/mage/sets/vintagemasters/VolcanicIsland.java
index bae68b7c2b..8da00511b8 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/VolcanicIsland.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/VolcanicIsland.java
@@ -37,7 +37,7 @@ public class VolcanicIsland extends mage.sets.unlimitededition.VolcanicIsland {
 
     public VolcanicIsland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 324;
+        this.cardNumber = "324";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/WallOfDiffusion.java b/Mage.Sets/src/mage/sets/vintagemasters/WallOfDiffusion.java
index fb60c20abd..663b03ab5b 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/WallOfDiffusion.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/WallOfDiffusion.java
@@ -37,7 +37,7 @@ public class WallOfDiffusion extends mage.sets.tempest.WallOfDiffusion {
 
     public WallOfDiffusion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 191;
+        this.cardNumber = "191";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/WaterfrontBouncer.java b/Mage.Sets/src/mage/sets/vintagemasters/WaterfrontBouncer.java
index c8fc0478dc..a16eb99c9a 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/WaterfrontBouncer.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/WaterfrontBouncer.java
@@ -38,7 +38,7 @@ public class WaterfrontBouncer extends mage.sets.mercadianmasques.WaterfrontBoun
 
     public WaterfrontBouncer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 102;
+        this.cardNumber = "102";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/WheelOfFortune.java b/Mage.Sets/src/mage/sets/vintagemasters/WheelOfFortune.java
index df67a0a460..c5a61b79d5 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/WheelOfFortune.java
@@ -38,7 +38,7 @@ public class WheelOfFortune extends mage.sets.limitedalpha.WheelOfFortune {
 
     public WheelOfFortune(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 192;
+        this.cardNumber = "192";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/WildMongrel.java b/Mage.Sets/src/mage/sets/vintagemasters/WildMongrel.java
index af23725ae7..0d2c6821e4 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/WildMongrel.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/WildMongrel.java
@@ -37,7 +37,7 @@ public class WildMongrel extends mage.sets.odyssey.WildMongrel {
 
     public WildMongrel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 239;
+        this.cardNumber = "239";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/WindsOfRath.java b/Mage.Sets/src/mage/sets/vintagemasters/WindsOfRath.java
index 891d447e45..a1249a035d 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/WindsOfRath.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/WindsOfRath.java
@@ -37,7 +37,7 @@ public class WindsOfRath extends mage.sets.heroesvsmonsters.WindsOfRath {
 
     public WindsOfRath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/WorldgorgerDragon.java b/Mage.Sets/src/mage/sets/vintagemasters/WorldgorgerDragon.java
index 2b1ce0021b..7ad149ff2c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/WorldgorgerDragon.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/WorldgorgerDragon.java
@@ -37,7 +37,7 @@ public class WorldgorgerDragon extends mage.sets.judgment.WorldgorgerDragon {
 
     public WorldgorgerDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 193;
+        this.cardNumber = "193";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/YavimayaElder.java b/Mage.Sets/src/mage/sets/vintagemasters/YavimayaElder.java
index f3e5076e89..3e78fb70bb 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/YavimayaElder.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/YavimayaElder.java
@@ -38,7 +38,7 @@ public class YavimayaElder extends mage.sets.commander.YavimayaElder {
 
     public YavimayaElder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 240;
+        this.cardNumber = "240";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/YavimayaHollow.java b/Mage.Sets/src/mage/sets/vintagemasters/YavimayaHollow.java
index 08521254ac..60765cd998 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/YavimayaHollow.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/YavimayaHollow.java
@@ -37,7 +37,7 @@ public class YavimayaHollow extends mage.sets.urzasdestiny.YavimayaHollow {
 
     public YavimayaHollow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 325;
+        this.cardNumber = "325";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsWill.java b/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsWill.java
index 170459127f..b6c23de796 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsWill.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/YawgmothsWill.java
@@ -38,7 +38,7 @@ public class YawgmothsWill extends mage.sets.urzassaga.YawgmothsWill {
 
     public YawgmothsWill(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 148;
+        this.cardNumber = "148";
         this.expansionSetCode = "VMA";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ZhalfirinCrusader.java b/Mage.Sets/src/mage/sets/vintagemasters/ZhalfirinCrusader.java
index 1720e354f3..211940142c 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/ZhalfirinCrusader.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ZhalfirinCrusader.java
@@ -37,7 +37,7 @@ public class ZhalfirinCrusader extends mage.sets.visions.ZhalfirinCrusader {
 
     public ZhalfirinCrusader(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "VMA";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Archangel.java b/Mage.Sets/src/mage/sets/visions/Archangel.java
index 31f503c30d..7b931dca05 100644
--- a/Mage.Sets/src/mage/sets/visions/Archangel.java
+++ b/Mage.Sets/src/mage/sets/visions/Archangel.java
@@ -38,7 +38,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel {
 
     public Archangel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 101;
+        this.cardNumber = "101";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/CloudElemental.java b/Mage.Sets/src/mage/sets/visions/CloudElemental.java
index 16c4d3ff52..23bc44b50e 100644
--- a/Mage.Sets/src/mage/sets/visions/CloudElemental.java
+++ b/Mage.Sets/src/mage/sets/visions/CloudElemental.java
@@ -37,7 +37,7 @@ public class CloudElemental extends mage.sets.tenthedition.CloudElemental {
 
     public CloudElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/CoralAtoll.java b/Mage.Sets/src/mage/sets/visions/CoralAtoll.java
index 7fbb578fcc..f8ce962124 100644
--- a/Mage.Sets/src/mage/sets/visions/CoralAtoll.java
+++ b/Mage.Sets/src/mage/sets/visions/CoralAtoll.java
@@ -37,7 +37,7 @@ public class CoralAtoll extends mage.sets.commander2014.CoralAtoll {
 
     public CoralAtoll(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 160;
+        this.cardNumber = "160";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/CreepingMold.java b/Mage.Sets/src/mage/sets/visions/CreepingMold.java
index 3ef59bc450..6ddd545d6c 100644
--- a/Mage.Sets/src/mage/sets/visions/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/visions/CreepingMold.java
@@ -37,7 +37,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
 
     public CreepingMold(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/DormantVolcano.java b/Mage.Sets/src/mage/sets/visions/DormantVolcano.java
index 3471ec66ed..039d474d79 100644
--- a/Mage.Sets/src/mage/sets/visions/DormantVolcano.java
+++ b/Mage.Sets/src/mage/sets/visions/DormantVolcano.java
@@ -37,7 +37,7 @@ public class DormantVolcano extends mage.sets.commander2014.DormantVolcano {
 
     public DormantVolcano(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 161;
+        this.cardNumber = "161";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Everglades.java b/Mage.Sets/src/mage/sets/visions/Everglades.java
index 2d444a0e7f..bd18cd35ad 100644
--- a/Mage.Sets/src/mage/sets/visions/Everglades.java
+++ b/Mage.Sets/src/mage/sets/visions/Everglades.java
@@ -37,7 +37,7 @@ public class Everglades extends mage.sets.commander2014.Everglades {
 
     public Everglades(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 162;
+        this.cardNumber = "162";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/FuneralCharm.java b/Mage.Sets/src/mage/sets/visions/FuneralCharm.java
index 08ce0a5ae4..75cbfd2c48 100644
--- a/Mage.Sets/src/mage/sets/visions/FuneralCharm.java
+++ b/Mage.Sets/src/mage/sets/visions/FuneralCharm.java
@@ -38,7 +38,7 @@ public class FuneralCharm extends mage.sets.timeshifted.FuneralCharm {
 
     public FuneralCharm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/GiantCaterpillar.java b/Mage.Sets/src/mage/sets/visions/GiantCaterpillar.java
index f182762e3b..7d70e6e9b3 100644
--- a/Mage.Sets/src/mage/sets/visions/GiantCaterpillar.java
+++ b/Mage.Sets/src/mage/sets/visions/GiantCaterpillar.java
@@ -37,7 +37,7 @@ public class GiantCaterpillar extends mage.sets.mercadianmasques.GiantCaterpilla
 
     public GiantCaterpillar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/InfantryVeteran.java b/Mage.Sets/src/mage/sets/visions/InfantryVeteran.java
index ba6975d139..01e700660e 100644
--- a/Mage.Sets/src/mage/sets/visions/InfantryVeteran.java
+++ b/Mage.Sets/src/mage/sets/visions/InfantryVeteran.java
@@ -37,7 +37,7 @@ public class InfantryVeteran extends mage.sets.magic2011.InfantryVeteran {
 
     public InfantryVeteran(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 109;
+        this.cardNumber = "109";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Inspiration.java b/Mage.Sets/src/mage/sets/visions/Inspiration.java
index 4582d1fc31..809962f294 100644
--- a/Mage.Sets/src/mage/sets/visions/Inspiration.java
+++ b/Mage.Sets/src/mage/sets/visions/Inspiration.java
@@ -37,7 +37,7 @@ public class Inspiration extends mage.sets.returntoravnica.Inspiration {
 
     public Inspiration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/JungleBasin.java b/Mage.Sets/src/mage/sets/visions/JungleBasin.java
index 7f4cbaf6db..12938c4904 100644
--- a/Mage.Sets/src/mage/sets/visions/JungleBasin.java
+++ b/Mage.Sets/src/mage/sets/visions/JungleBasin.java
@@ -37,7 +37,7 @@ public class JungleBasin extends mage.sets.commander2014.JungleBasin {
 
     public JungleBasin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Karoo.java b/Mage.Sets/src/mage/sets/visions/Karoo.java
index 6837d66eb1..cf09684a0e 100644
--- a/Mage.Sets/src/mage/sets/visions/Karoo.java
+++ b/Mage.Sets/src/mage/sets/visions/Karoo.java
@@ -37,7 +37,7 @@ public class Karoo extends mage.sets.commander2014.Karoo {
 
     public Karoo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 165;
+        this.cardNumber = "165";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/KingCheetah.java b/Mage.Sets/src/mage/sets/visions/KingCheetah.java
index 6ac99eb6a1..d135ab1b7e 100644
--- a/Mage.Sets/src/mage/sets/visions/KingCheetah.java
+++ b/Mage.Sets/src/mage/sets/visions/KingCheetah.java
@@ -38,7 +38,7 @@ public class KingCheetah extends mage.sets.ninthedition.KingCheetah {
 
     public KingCheetah(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/LongbowArcher.java b/Mage.Sets/src/mage/sets/visions/LongbowArcher.java
index abcc4bfed1..5a97a6b1fb 100644
--- a/Mage.Sets/src/mage/sets/visions/LongbowArcher.java
+++ b/Mage.Sets/src/mage/sets/visions/LongbowArcher.java
@@ -37,7 +37,7 @@ public class LongbowArcher extends mage.sets.seventhedition.LongbowArcher {
 
     public LongbowArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 112;
+        this.cardNumber = "112";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Nekrataal.java b/Mage.Sets/src/mage/sets/visions/Nekrataal.java
index 6b76ec242a..bbbb3bc5e7 100644
--- a/Mage.Sets/src/mage/sets/visions/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/visions/Nekrataal.java
@@ -38,7 +38,7 @@ public class Nekrataal extends mage.sets.ninthedition.Nekrataal {
 
     public Nekrataal(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Prosperity.java b/Mage.Sets/src/mage/sets/visions/Prosperity.java
index 5d236a4e16..bc613d60b8 100644
--- a/Mage.Sets/src/mage/sets/visions/Prosperity.java
+++ b/Mage.Sets/src/mage/sets/visions/Prosperity.java
@@ -37,7 +37,7 @@ public class Prosperity extends mage.sets.commander2013.Prosperity {
 
     public Prosperity(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Quicksand.java b/Mage.Sets/src/mage/sets/visions/Quicksand.java
index 1733a3f1d0..7ed0a33036 100644
--- a/Mage.Sets/src/mage/sets/visions/Quicksand.java
+++ b/Mage.Sets/src/mage/sets/visions/Quicksand.java
@@ -37,7 +37,7 @@ public class Quicksand extends mage.sets.tenthedition.Quicksand {
 
     public Quicksand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 166;
+        this.cardNumber = "166";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/RelentlessAssault.java b/Mage.Sets/src/mage/sets/visions/RelentlessAssault.java
index 551680e33b..ed3f189c75 100644
--- a/Mage.Sets/src/mage/sets/visions/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/visions/RelentlessAssault.java
@@ -37,7 +37,7 @@ public class RelentlessAssault extends mage.sets.seventhedition.RelentlessAssaul
 
     public RelentlessAssault(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/RiverBoa.java b/Mage.Sets/src/mage/sets/visions/RiverBoa.java
index 335983658f..8254aa8f3c 100644
--- a/Mage.Sets/src/mage/sets/visions/RiverBoa.java
+++ b/Mage.Sets/src/mage/sets/visions/RiverBoa.java
@@ -38,7 +38,7 @@ public class RiverBoa extends mage.sets.zendikar.RiverBoa {
 
     public RiverBoa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/Rowen.java b/Mage.Sets/src/mage/sets/visions/Rowen.java
index b0000cb887..9b2da2f907 100644
--- a/Mage.Sets/src/mage/sets/visions/Rowen.java
+++ b/Mage.Sets/src/mage/sets/visions/Rowen.java
@@ -37,7 +37,7 @@ public class Rowen extends mage.sets.seventhedition.Rowen {
 
     public Rowen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/SisaysRing.java b/Mage.Sets/src/mage/sets/visions/SisaysRing.java
index d75fe19d1d..d62a543d83 100644
--- a/Mage.Sets/src/mage/sets/visions/SisaysRing.java
+++ b/Mage.Sets/src/mage/sets/visions/SisaysRing.java
@@ -38,7 +38,7 @@ public class SisaysRing extends mage.sets.seventhedition.SisaysRing {
 
     public SisaysRing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 154;
+        this.cardNumber = "154";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/StampedingWildebeests.java b/Mage.Sets/src/mage/sets/visions/StampedingWildebeests.java
index 7bec9d8582..48683ca866 100644
--- a/Mage.Sets/src/mage/sets/visions/StampedingWildebeests.java
+++ b/Mage.Sets/src/mage/sets/visions/StampedingWildebeests.java
@@ -37,7 +37,7 @@ public class StampedingWildebeests extends mage.sets.tenthedition.StampedingWild
 
     public StampedingWildebeests(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/SummerBloom.java b/Mage.Sets/src/mage/sets/visions/SummerBloom.java
index 7e2061e31e..602b76302d 100644
--- a/Mage.Sets/src/mage/sets/visions/SummerBloom.java
+++ b/Mage.Sets/src/mage/sets/visions/SummerBloom.java
@@ -37,7 +37,7 @@ public class SummerBloom extends mage.sets.ninthedition.SummerBloom {
 
     public SummerBloom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/SuqAtaLancer.java b/Mage.Sets/src/mage/sets/visions/SuqAtaLancer.java
index 79f87a3e3a..390a0658dc 100644
--- a/Mage.Sets/src/mage/sets/visions/SuqAtaLancer.java
+++ b/Mage.Sets/src/mage/sets/visions/SuqAtaLancer.java
@@ -38,7 +38,7 @@ public class SuqAtaLancer extends mage.sets.timeshifted.SuqAtaLancer {
 
     public SuqAtaLancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 96;
+        this.cardNumber = "96";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/TeferisPuzzleBox.java b/Mage.Sets/src/mage/sets/visions/TeferisPuzzleBox.java
index 76a06f39f8..0a2ab3e4c2 100644
--- a/Mage.Sets/src/mage/sets/visions/TeferisPuzzleBox.java
+++ b/Mage.Sets/src/mage/sets/visions/TeferisPuzzleBox.java
@@ -37,7 +37,7 @@ public class TeferisPuzzleBox extends mage.sets.ninthedition.TeferisPuzzleBox {
 
     public TeferisPuzzleBox(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Tremor.java b/Mage.Sets/src/mage/sets/visions/Tremor.java
index 0c0501d76a..68f9f224d1 100644
--- a/Mage.Sets/src/mage/sets/visions/Tremor.java
+++ b/Mage.Sets/src/mage/sets/visions/Tremor.java
@@ -37,7 +37,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor {
 
     public Tremor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/TriangleOfWar.java b/Mage.Sets/src/mage/sets/visions/TriangleOfWar.java
index b3b03108af..5e81144801 100644
--- a/Mage.Sets/src/mage/sets/visions/TriangleOfWar.java
+++ b/Mage.Sets/src/mage/sets/visions/TriangleOfWar.java
@@ -38,7 +38,7 @@ public class TriangleOfWar extends mage.sets.vintagemasters.TriangleOfWar {
 
     public TriangleOfWar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 158;
+        this.cardNumber = "158";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.RARE;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/Undo.java b/Mage.Sets/src/mage/sets/visions/Undo.java
index 9addffe6d7..e4e4986ee6 100644
--- a/Mage.Sets/src/mage/sets/visions/Undo.java
+++ b/Mage.Sets/src/mage/sets/visions/Undo.java
@@ -38,7 +38,7 @@ public class Undo extends mage.sets.starter1999.Undo {
 
     public Undo(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "VIS";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/visions/ViashinoSandstalker.java b/Mage.Sets/src/mage/sets/visions/ViashinoSandstalker.java
index 520710641b..8be30785ba 100644
--- a/Mage.Sets/src/mage/sets/visions/ViashinoSandstalker.java
+++ b/Mage.Sets/src/mage/sets/visions/ViashinoSandstalker.java
@@ -38,7 +38,7 @@ public class ViashinoSandstalker extends mage.sets.ninthedition.ViashinoSandstal
 
     public ViashinoSandstalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/WarriorsHonor.java b/Mage.Sets/src/mage/sets/visions/WarriorsHonor.java
index a94d35bbc8..ec040d3086 100644
--- a/Mage.Sets/src/mage/sets/visions/WarriorsHonor.java
+++ b/Mage.Sets/src/mage/sets/visions/WarriorsHonor.java
@@ -37,7 +37,7 @@ public class WarriorsHonor extends mage.sets.tenthedition.WarriorsHonor {
 
     public WarriorsHonor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 124;
+        this.cardNumber = "124";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/WaterspoutDjinn.java b/Mage.Sets/src/mage/sets/visions/WaterspoutDjinn.java
index a9c141a4b1..53550d6ed7 100644
--- a/Mage.Sets/src/mage/sets/visions/WaterspoutDjinn.java
+++ b/Mage.Sets/src/mage/sets/visions/WaterspoutDjinn.java
@@ -37,7 +37,7 @@ public class WaterspoutDjinn extends mage.sets.jacevschandra.WaterspoutDjinn {
 
     public WaterspoutDjinn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "VIS";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java b/Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java
index da8c2dbf9e..6905d9b373 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java
@@ -37,7 +37,7 @@ public class AEtherFlash extends mage.sets.seventhedition.AEtherFlash {
 
     public AEtherFlash(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 88;
+        this.cardNumber = "88";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/AbyssalGatekeeper.java b/Mage.Sets/src/mage/sets/weatherlight/AbyssalGatekeeper.java
index d4e04622f3..8030a7fa98 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/AbyssalGatekeeper.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/AbyssalGatekeeper.java
@@ -37,7 +37,7 @@ public class AbyssalGatekeeper extends mage.sets.divinevsdemonic.AbyssalGatekeep
 
     public AbyssalGatekeeper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/AgonizingMemories.java b/Mage.Sets/src/mage/sets/weatherlight/AgonizingMemories.java
index b51e3b459a..a87c4fd049 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/AgonizingMemories.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/AgonizingMemories.java
@@ -37,7 +37,7 @@ public class AgonizingMemories extends mage.sets.seventhedition.AgonizingMemorie
 
     public AgonizingMemories(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/AlabasterDragon.java b/Mage.Sets/src/mage/sets/weatherlight/AlabasterDragon.java
index e1d123c4af..d6b5491e20 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/AlabasterDragon.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/AlabasterDragon.java
@@ -37,7 +37,7 @@ public class AlabasterDragon extends mage.sets.portal.AlabasterDragon {
 
     public AlabasterDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 118;
+        this.cardNumber = "118";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java b/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java
index be61e7487b..27672c29c7 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java
@@ -38,7 +38,7 @@ public class ArdentMilitia extends mage.sets.eighthedition.ArdentMilitia {
 
     public ArdentMilitia(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/ArgivianRestoration.java b/Mage.Sets/src/mage/sets/weatherlight/ArgivianRestoration.java
index 3ae39dbc41..044a6b85ff 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/ArgivianRestoration.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/ArgivianRestoration.java
@@ -37,7 +37,7 @@ public class ArgivianRestoration extends mage.sets.elspethvstezzeret.ArgivianRes
 
     public ArgivianRestoration(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/BenalishKnight.java b/Mage.Sets/src/mage/sets/weatherlight/BenalishKnight.java
index dd993f134a..97834fb2f4 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/BenalishKnight.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/BenalishKnight.java
@@ -37,7 +37,7 @@ public class BenalishKnight extends mage.sets.tenthedition.BenalishKnight {
 
     public BenalishKnight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 125;
+        this.cardNumber = "125";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/BloodrockCyclops.java b/Mage.Sets/src/mage/sets/weatherlight/BloodrockCyclops.java
index 9fb1caabda..d653236e74 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/BloodrockCyclops.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/BloodrockCyclops.java
@@ -37,7 +37,7 @@ public class BloodrockCyclops extends mage.sets.tenthedition.BloodrockCyclops {
 
     public BloodrockCyclops(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 90;
+        this.cardNumber = "90";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/BogardanFirefiend.java b/Mage.Sets/src/mage/sets/weatherlight/BogardanFirefiend.java
index 2b539cd441..1637ec262f 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/BogardanFirefiend.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/BogardanFirefiend.java
@@ -37,7 +37,7 @@ public class BogardanFirefiend extends mage.sets.planechase.BogardanFirefiend {
 
     public BogardanFirefiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 91;
+        this.cardNumber = "91";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/BuriedAlive.java b/Mage.Sets/src/mage/sets/weatherlight/BuriedAlive.java
index d7280c824d..878300a58b 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/BuriedAlive.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/BuriedAlive.java
@@ -37,7 +37,7 @@ public class BuriedAlive extends mage.sets.commander.BuriedAlive {
 
     public BuriedAlive(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/CinderWall.java b/Mage.Sets/src/mage/sets/weatherlight/CinderWall.java
index df9936bf25..d56ccc1b7f 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/CinderWall.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/CinderWall.java
@@ -37,7 +37,7 @@ public class CinderWall extends mage.sets.knightsvsdragons.CinderWall {
 
     public CinderWall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 94;
+        this.cardNumber = "94";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/ConeOfFlame.java b/Mage.Sets/src/mage/sets/weatherlight/ConeOfFlame.java
index c659ebc2d8..5c0a133a73 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 95;
+        this.cardNumber = "95";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/Disrupt.java b/Mage.Sets/src/mage/sets/weatherlight/Disrupt.java
index 2e32076e0b..220e04ae83 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/Disrupt.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/Disrupt.java
@@ -39,7 +39,7 @@ public class Disrupt extends mage.sets.invasion.Disrupt {
 
     public Disrupt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/EmpyrialArmor.java b/Mage.Sets/src/mage/sets/weatherlight/EmpyrialArmor.java
index 89a8da86c2..e8095a28b0 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/EmpyrialArmor.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/EmpyrialArmor.java
@@ -38,7 +38,7 @@ public class EmpyrialArmor extends mage.sets.vintagemasters.EmpyrialArmor {
 
     public EmpyrialArmor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 129;
+        this.cardNumber = "129";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/FamiliarGround.java b/Mage.Sets/src/mage/sets/weatherlight/FamiliarGround.java
index f9fd340408..f237ffabad 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/FamiliarGround.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/FamiliarGround.java
@@ -37,7 +37,7 @@ public class FamiliarGround extends mage.sets.seventhedition.FamiliarGround {
 
     public FamiliarGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/Fervor.java b/Mage.Sets/src/mage/sets/weatherlight/Fervor.java
index d3236fb341..f9fef18272 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/Fervor.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/Fervor.java
@@ -37,7 +37,7 @@ public class Fervor extends mage.sets.magic2013.Fervor {
 
     public Fervor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 99;
+        this.cardNumber = "99";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/FireWhip.java b/Mage.Sets/src/mage/sets/weatherlight/FireWhip.java
index db61a09f7c..8295c3ff02 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/FireWhip.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/FireWhip.java
@@ -38,7 +38,7 @@ public class FireWhip extends mage.sets.timeshifted.FireWhip {
 
     public FireWhip(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 100;
+        this.cardNumber = "100";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/FogElemental.java b/Mage.Sets/src/mage/sets/weatherlight/FogElemental.java
index 739e2806dc..ab7395c4a9 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/FogElemental.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/FogElemental.java
@@ -38,7 +38,7 @@ public class FogElemental extends mage.sets.tenthedition.FogElemental {
 
     public FogElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/GaeasBlessing.java b/Mage.Sets/src/mage/sets/weatherlight/GaeasBlessing.java
index b6731cd904..ac900d667b 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/GaeasBlessing.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/GaeasBlessing.java
@@ -38,7 +38,7 @@ public class GaeasBlessing extends mage.sets.timeshifted.GaeasBlessing {
 
     public GaeasBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java b/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java
index d8ff657a53..b5f263002f 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java
@@ -38,7 +38,7 @@ public class GemstoneMine extends mage.sets.timeshifted.GemstoneMine {
 
     public GemstoneMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 164;
+        this.cardNumber = "164";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/GerrardsWisdom.java b/Mage.Sets/src/mage/sets/weatherlight/GerrardsWisdom.java
index cc3367fd42..ac1def5b50 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/GerrardsWisdom.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/GerrardsWisdom.java
@@ -39,7 +39,7 @@ public class GerrardsWisdom extends mage.sets.starter1999.GerrardsWisdom {
 
     public GerrardsWisdom(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 131;
+        this.cardNumber = "131";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/HeavyBallista.java b/Mage.Sets/src/mage/sets/weatherlight/HeavyBallista.java
index 82ab0cd928..acdeeab5ba 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/HeavyBallista.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/HeavyBallista.java
@@ -38,7 +38,7 @@ public class HeavyBallista extends mage.sets.seventhedition.HeavyBallista {
 
     public HeavyBallista(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 133;
+        this.cardNumber = "133";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/HiddenHorror.java b/Mage.Sets/src/mage/sets/weatherlight/HiddenHorror.java
index edc19462f1..280ecdffc1 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/HiddenHorror.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/HiddenHorror.java
@@ -37,7 +37,7 @@ public class HiddenHorror extends mage.sets.tenthedition.HiddenHorror {
 
     public HiddenHorror(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/LlanowarBehemoth.java b/Mage.Sets/src/mage/sets/weatherlight/LlanowarBehemoth.java
index 13249e78dd..b8cf79f58a 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/LlanowarBehemoth.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/LlanowarBehemoth.java
@@ -37,7 +37,7 @@ public class LlanowarBehemoth extends mage.sets.ninthedition.LlanowarBehemoth {
 
     public LlanowarBehemoth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 74;
+        this.cardNumber = "74";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/MindStone.java b/Mage.Sets/src/mage/sets/weatherlight/MindStone.java
index 132040c531..59eee9963e 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/MindStone.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/MindStone.java
@@ -38,7 +38,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 153;
+        this.cardNumber = "153";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/MistmoonGriffin.java b/Mage.Sets/src/mage/sets/weatherlight/MistmoonGriffin.java
index d3c11e7092..6d4726f9f6 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/MistmoonGriffin.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/MistmoonGriffin.java
@@ -38,7 +38,7 @@ public class MistmoonGriffin extends mage.sets.vintagemasters.MistmoonGriffin {
 
     public MistmoonGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 137;
+        this.cardNumber = "137";
         this.expansionSetCode = "WTH";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/weatherlight/NaturesResurgence.java b/Mage.Sets/src/mage/sets/weatherlight/NaturesResurgence.java
index 8bad3f3363..4ab79f98f6 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/NaturesResurgence.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/NaturesResurgence.java
@@ -37,7 +37,7 @@ public class NaturesResurgence extends mage.sets.seventhedition.NaturesResurgenc
 
     public NaturesResurgence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/Ophidian.java b/Mage.Sets/src/mage/sets/weatherlight/Ophidian.java
index af4484bb83..bb5da5f3a7 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/Ophidian.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/Ophidian.java
@@ -37,7 +37,7 @@ public class Ophidian extends mage.sets.vintagemasters.Ophidian {
 
     public Ophidian(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/PhantomWarrior.java b/Mage.Sets/src/mage/sets/weatherlight/PhantomWarrior.java
index e6ebfe5c5e..d5434add5a 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/PhantomWarrior.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/PhantomWarrior.java
@@ -37,7 +37,7 @@ public class PhantomWarrior extends mage.sets.magic2010.PhantomWarrior {
 
     public PhantomWarrior(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/PhantomWings.java b/Mage.Sets/src/mage/sets/weatherlight/PhantomWings.java
index afd43aa50f..4b4a81b8cf 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/PhantomWings.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/PhantomWings.java
@@ -37,7 +37,7 @@ public class PhantomWings extends mage.sets.betrayersofkamigawa.PhantomWings {
 
     public PhantomWings(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/RazortoothRats.java b/Mage.Sets/src/mage/sets/weatherlight/RazortoothRats.java
index eda6e385cb..f47de3eac0 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/RazortoothRats.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/RazortoothRats.java
@@ -37,7 +37,7 @@ public class RazortoothRats extends mage.sets.ninthedition.RazortoothRats {
 
     public RazortoothRats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/SageOwl.java b/Mage.Sets/src/mage/sets/weatherlight/SageOwl.java
index 58ef5fb4bd..aec11ab517 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/SageOwl.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/SageOwl.java
@@ -37,7 +37,7 @@ public class SageOwl extends mage.sets.magic2010.SageOwl {
 
     public SageOwl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/SerrasBlessing.java b/Mage.Sets/src/mage/sets/weatherlight/SerrasBlessing.java
index 210f4db19f..825d7cd3ee 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/SerrasBlessing.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/SerrasBlessing.java
@@ -37,7 +37,7 @@ public class SerrasBlessing extends mage.sets.ninthedition.SerrasBlessing {
 
     public SerrasBlessing(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 141;
+        this.cardNumber = "141";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/SerratedBiskelion.java b/Mage.Sets/src/mage/sets/weatherlight/SerratedBiskelion.java
index 13a1861d3f..b130232582 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/SerratedBiskelion.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/SerratedBiskelion.java
@@ -37,7 +37,7 @@ public class SerratedBiskelion extends mage.sets.elspethvstezzeret.SerratedBiske
 
     public SerratedBiskelion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 156;
+        this.cardNumber = "156";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/SouthernPaladin.java b/Mage.Sets/src/mage/sets/weatherlight/SouthernPaladin.java
index 001dea9971..6b9d3fe7a7 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/SouthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/SouthernPaladin.java
@@ -38,7 +38,7 @@ public class SouthernPaladin extends mage.sets.seventhedition.SouthernPaladin {
 
     public SouthernPaladin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 143;
+        this.cardNumber = "143";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/SteelGolem.java b/Mage.Sets/src/mage/sets/weatherlight/SteelGolem.java
index 131654b931..486071df90 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/SteelGolem.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/SteelGolem.java
@@ -37,7 +37,7 @@ public class SteelGolem extends mage.sets.tenthedition.SteelGolem {
 
     public SteelGolem(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 157;
+        this.cardNumber = "157";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/StrandsOfNight.java b/Mage.Sets/src/mage/sets/weatherlight/StrandsOfNight.java
index 9d565cd7f0..1a314310e4 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/StrandsOfNight.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/StrandsOfNight.java
@@ -37,7 +37,7 @@ public class StrandsOfNight extends mage.sets.seventhedition.StrandsOfNight {
 
     public StrandsOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/Thunderbolt.java b/Mage.Sets/src/mage/sets/weatherlight/Thunderbolt.java
index 98c70837ee..09d9baf2bc 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/Thunderbolt.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/Thunderbolt.java
@@ -37,7 +37,7 @@ public class Thunderbolt extends mage.sets.avacynrestored.Thunderbolt {
 
     public Thunderbolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 115;
+        this.cardNumber = "115";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/Thundermare.java b/Mage.Sets/src/mage/sets/weatherlight/Thundermare.java
index 3333fc1448..9e5f538c13 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/Thundermare.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/Thundermare.java
@@ -37,7 +37,7 @@ public class Thundermare extends mage.sets.portal.Thundermare {
 
     public Thundermare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 116;
+        this.cardNumber = "116";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/VeteranExplorer.java b/Mage.Sets/src/mage/sets/weatherlight/VeteranExplorer.java
index 06d0148057..68c8299c78 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/VeteranExplorer.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/VeteranExplorer.java
@@ -37,7 +37,7 @@ public class VeteranExplorer extends mage.sets.commander.VeteranExplorer {
 
     public VeteranExplorer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 86;
+        this.cardNumber = "86";
         this.expansionSetCode = "WTH";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/AegisAngel.java b/Mage.Sets/src/mage/sets/welcomedeck2016/AegisAngel.java
index 2e232c5134..1753de6505 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/AegisAngel.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/AegisAngel.java
@@ -37,7 +37,7 @@ public class AegisAngel extends mage.sets.magic2012.AegisAngel {
 
     public AegisAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/AirServant.java b/Mage.Sets/src/mage/sets/welcomedeck2016/AirServant.java
index efc9115077..d34e356ffc 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/AirServant.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/AirServant.java
@@ -37,7 +37,7 @@ public class AirServant extends mage.sets.magic2011.AirServant {
 
     public AirServant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/BorderlandMarauder.java b/Mage.Sets/src/mage/sets/welcomedeck2016/BorderlandMarauder.java
index 04a3846f3c..b8a206a3c9 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/BorderlandMarauder.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/BorderlandMarauder.java
@@ -37,7 +37,7 @@ public class BorderlandMarauder extends mage.sets.magic2015.BorderlandMarauder {
 
     public BorderlandMarauder(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/ConeOfFlame.java b/Mage.Sets/src/mage/sets/welcomedeck2016/ConeOfFlame.java
index b21f99199f..224c5f3cba 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/ConeOfFlame.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/ConeOfFlame.java
@@ -37,7 +37,7 @@ public class ConeOfFlame extends mage.sets.knightsvsdragons.ConeOfFlame {
 
     public ConeOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/Disperse.java b/Mage.Sets/src/mage/sets/welcomedeck2016/Disperse.java
index 3b369ac4f8..3d593fd2e8 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/Disperse.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/Disperse.java
@@ -37,7 +37,7 @@ public class Disperse extends mage.sets.scarsofmirrodin.Disperse {
 
     public Disperse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/IncrementalGrowth.java b/Mage.Sets/src/mage/sets/welcomedeck2016/IncrementalGrowth.java
index a80151c22d..b0e2f6ab0a 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/IncrementalGrowth.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/IncrementalGrowth.java
@@ -37,7 +37,7 @@ public class IncrementalGrowth extends mage.sets.modernmasters.IncrementalGrowth
 
     public IncrementalGrowth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/MarkedByHonor.java b/Mage.Sets/src/mage/sets/welcomedeck2016/MarkedByHonor.java
index c47300c9f3..d9e86592c2 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/MarkedByHonor.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/MarkedByHonor.java
@@ -37,7 +37,7 @@ public class MarkedByHonor extends mage.sets.magic2015.MarkedByHonor {
 
     public MarkedByHonor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/MindRot.java b/Mage.Sets/src/mage/sets/welcomedeck2016/MindRot.java
index 117a982d95..dea44cd461 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/MindRot.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/MindRot.java
@@ -37,7 +37,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot {
 
     public MindRot(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/Nightmare.java b/Mage.Sets/src/mage/sets/welcomedeck2016/Nightmare.java
index f9a08258a9..689c069080 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/Nightmare.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/Nightmare.java
@@ -37,7 +37,7 @@ public class Nightmare extends mage.sets.tenthedition.Nightmare {
 
     public Nightmare(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/Oakenform.java b/Mage.Sets/src/mage/sets/welcomedeck2016/Oakenform.java
index 69b163d7a9..a07c98a3ec 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/Oakenform.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/Oakenform.java
@@ -37,7 +37,7 @@ public class Oakenform extends mage.sets.magic2010.Oakenform {
 
     public Oakenform(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/SengirVampire.java b/Mage.Sets/src/mage/sets/welcomedeck2016/SengirVampire.java
index d8e3c8d010..45f96c3330 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/SengirVampire.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/SengirVampire.java
@@ -38,7 +38,7 @@ public class SengirVampire extends mage.sets.tenthedition.SengirVampire {
 
     public SengirVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "W16";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/SerraAngel.java b/Mage.Sets/src/mage/sets/welcomedeck2016/SerraAngel.java
index 2956d87e2d..e980727514 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/SerraAngel.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/SerraAngel.java
@@ -37,7 +37,7 @@ public class SerraAngel extends mage.sets.tenthedition.SerraAngel {
 
     public SerraAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/ShivanDragon.java b/Mage.Sets/src/mage/sets/welcomedeck2016/ShivanDragon.java
index e3ac85132f..13d2846b1e 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/ShivanDragon.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/ShivanDragon.java
@@ -37,7 +37,7 @@ public class ShivanDragon extends mage.sets.tenthedition.ShivanDragon {
 
     public ShivanDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/SoulOfTheHarvest.java b/Mage.Sets/src/mage/sets/welcomedeck2016/SoulOfTheHarvest.java
index d4275fce51..467fa29674 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/SoulOfTheHarvest.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/SoulOfTheHarvest.java
@@ -37,7 +37,7 @@ public class SoulOfTheHarvest extends mage.sets.avacynrestored.SoulOfTheHarvest
 
     public SoulOfTheHarvest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/SphinxOfMagosi.java b/Mage.Sets/src/mage/sets/welcomedeck2016/SphinxOfMagosi.java
index 68c53885b6..233e97b7b3 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/SphinxOfMagosi.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/SphinxOfMagosi.java
@@ -37,7 +37,7 @@ public class SphinxOfMagosi extends mage.sets.riseoftheeldrazi.SphinxOfMagosi {
 
     public SphinxOfMagosi(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/welcomedeck2016/WalkingCorpse.java b/Mage.Sets/src/mage/sets/welcomedeck2016/WalkingCorpse.java
index 0fd07b3af1..e33238b95b 100644
--- a/Mage.Sets/src/mage/sets/welcomedeck2016/WalkingCorpse.java
+++ b/Mage.Sets/src/mage/sets/welcomedeck2016/WalkingCorpse.java
@@ -37,7 +37,7 @@ public class WalkingCorpse extends mage.sets.innistrad.WalkingCorpse {
 
     public WalkingCorpse(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "W16";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/AbruptDecay.java b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/AbruptDecay.java
index 8594892d5d..d60e7efcce 100644
--- a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/AbruptDecay.java
+++ b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/AbruptDecay.java
@@ -37,7 +37,7 @@ public class AbruptDecay extends mage.sets.returntoravnica.AbruptDecay {
 
     public AbruptDecay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "WMCQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/GeistOfSaintTraft.java b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/GeistOfSaintTraft.java
index 59834ba2ff..745466fd9b 100644
--- a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/GeistOfSaintTraft.java
+++ b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/GeistOfSaintTraft.java
@@ -37,7 +37,7 @@ public class GeistOfSaintTraft extends mage.sets.innistrad.GeistOfSaintTraft {
 
     public GeistOfSaintTraft(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "WMCQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/LilianaOfTheVeil.java b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/LilianaOfTheVeil.java
index f3a813cbd0..b013f92d6e 100644
--- a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/LilianaOfTheVeil.java
+++ b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/LilianaOfTheVeil.java
@@ -37,7 +37,7 @@ public class LilianaOfTheVeil extends mage.sets.innistrad.LilianaOfTheVeil {
 
     public LilianaOfTheVeil(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "WMCQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/SnapcasterMage.java b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/SnapcasterMage.java
index 54b3e9317f..5907388061 100644
--- a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/SnapcasterMage.java
+++ b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/SnapcasterMage.java
@@ -37,7 +37,7 @@ public class SnapcasterMage extends mage.sets.innistrad.SnapcasterMage {
 
     public SnapcasterMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "WMCQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/ThaliaGuardianOfThraben.java b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/ThaliaGuardianOfThraben.java
index b9ab3c534d..c9c896f13b 100644
--- a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/ThaliaGuardianOfThraben.java
+++ b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/ThaliaGuardianOfThraben.java
@@ -37,7 +37,7 @@ public class ThaliaGuardianOfThraben extends mage.sets.darkascension.ThaliaGuard
 
     public ThaliaGuardianOfThraben(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "WMCQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/Vengevine.java b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/Vengevine.java
index cab7d5a91b..bae0d66f75 100644
--- a/Mage.Sets/src/mage/sets/worldmagiccupqualifier/Vengevine.java
+++ b/Mage.Sets/src/mage/sets/worldmagiccupqualifier/Vengevine.java
@@ -37,7 +37,7 @@ public class Vengevine extends mage.sets.riseoftheeldrazi.Vengevine {
 
     public Vengevine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "WMCQ";
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/Quicksand.java b/Mage.Sets/src/mage/sets/worldwake/Quicksand.java
index 3c155e6a51..9a47d42a35 100644
--- a/Mage.Sets/src/mage/sets/worldwake/Quicksand.java
+++ b/Mage.Sets/src/mage/sets/worldwake/Quicksand.java
@@ -38,7 +38,7 @@ public class Quicksand extends mage.sets.tenthedition.Quicksand {
 
     public Quicksand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 140;
+        this.cardNumber = "140";
         this.rarity = Rarity.COMMON;
         this.expansionSetCode = "WWK";
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Auramancer.java b/Mage.Sets/src/mage/sets/wpngateway/Auramancer.java
index 13272d23e4..22ca1311f0 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Auramancer.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Auramancer.java
@@ -38,7 +38,7 @@ public class Auramancer extends mage.sets.magic2012.Auramancer {
 
     public Auramancer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 77;
+        this.cardNumber = "77";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/BloodcrazedNeonate.java b/Mage.Sets/src/mage/sets/wpngateway/BloodcrazedNeonate.java
index df351e3831..a6bc22add8 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/BloodcrazedNeonate.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/BloodcrazedNeonate.java
@@ -38,7 +38,7 @@ public class BloodcrazedNeonate extends mage.sets.innistrad.BloodcrazedNeonate {
 
     public BloodcrazedNeonate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 83;
+        this.cardNumber = "83";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/BoggartRamGang.java b/Mage.Sets/src/mage/sets/wpngateway/BoggartRamGang.java
index d84c510cc5..ef614b6eef 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/BoggartRamGang.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/BoggartRamGang.java
@@ -38,7 +38,7 @@ public class BoggartRamGang extends mage.sets.shadowmoor.BoggartRamGang {
 
     public BoggartRamGang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/BoneyardWurm.java b/Mage.Sets/src/mage/sets/wpngateway/BoneyardWurm.java
index a3084e6f29..8d76dd2bb1 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/BoneyardWurm.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/BoneyardWurm.java
@@ -38,7 +38,7 @@ public class BoneyardWurm extends mage.sets.innistrad.BoneyardWurm {
 
     public BoneyardWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 84;
+        this.cardNumber = "84";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Boomerang.java b/Mage.Sets/src/mage/sets/wpngateway/Boomerang.java
index b23a00d89f..6f0c5065da 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Boomerang.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Boomerang.java
@@ -38,7 +38,7 @@ public class Boomerang extends mage.sets.tenthedition.Boomerang {
 
     public Boomerang(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Calciderm.java b/Mage.Sets/src/mage/sets/wpngateway/Calciderm.java
index 9e4dd8fa90..f3ede3cad8 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Calciderm.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Calciderm.java
@@ -38,7 +38,7 @@ public class Calciderm extends mage.sets.planarchaos.Calciderm {
 
     public Calciderm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/CennsTactician.java b/Mage.Sets/src/mage/sets/wpngateway/CennsTactician.java
index 9efd35027d..5e0493e7d4 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/CennsTactician.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/CennsTactician.java
@@ -38,7 +38,7 @@ public class CennsTactician extends mage.sets.morningtide.CennsTactician {
 
     public CennsTactician(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/CircleOfFlame.java b/Mage.Sets/src/mage/sets/wpngateway/CircleOfFlame.java
index 51f53b9f43..e6d8c491a7 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/CircleOfFlame.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/CircleOfFlame.java
@@ -38,7 +38,7 @@ public class CircleOfFlame extends mage.sets.magic2012.CircleOfFlame {
 
     public CircleOfFlame(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 78;
+        this.cardNumber = "78";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/sets/wpngateway/CurseOfTheBloodyTome.java
index fb5481ece5..8a6e29f6f9 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/CurseOfTheBloodyTome.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/CurseOfTheBloodyTome.java
@@ -38,7 +38,7 @@ public class CurseOfTheBloodyTome extends mage.sets.innistrad.CurseOfTheBloodyTo
 
     public CurseOfTheBloodyTome(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 80;
+        this.cardNumber = "80";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/CurseOfThirst.java b/Mage.Sets/src/mage/sets/wpngateway/CurseOfThirst.java
index 3537583de5..f7d740bb44 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/CurseOfThirst.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/CurseOfThirst.java
@@ -38,7 +38,7 @@ public class CurseOfThirst extends mage.sets.darkascension.CurseOfThirst {
 
     public CurseOfThirst(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 81;
+        this.cardNumber = "81";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/CurseOfWizardry.java b/Mage.Sets/src/mage/sets/wpngateway/CurseOfWizardry.java
index 1d0b145ac0..a9a9103e1b 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/CurseOfWizardry.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/CurseOfWizardry.java
@@ -38,7 +38,7 @@ public class CurseOfWizardry extends mage.sets.riseoftheeldrazi.CurseOfWizardry
 
     public CurseOfWizardry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/DauntlessDourbark.java b/Mage.Sets/src/mage/sets/wpngateway/DauntlessDourbark.java
index e513826632..51ac587229 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/DauntlessDourbark.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/DauntlessDourbark.java
@@ -38,7 +38,7 @@ public class DauntlessDourbark extends mage.sets.lorwyn.DauntlessDourbark {
 
     public DauntlessDourbark(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/DeathlessAngel.java b/Mage.Sets/src/mage/sets/wpngateway/DeathlessAngel.java
index c57236b780..a34f439c5c 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/DeathlessAngel.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/DeathlessAngel.java
@@ -38,7 +38,7 @@ public class DeathlessAngel extends mage.sets.riseoftheeldrazi.DeathlessAngel {
 
     public DeathlessAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/DuergarHedgeMage.java b/Mage.Sets/src/mage/sets/wpngateway/DuergarHedgeMage.java
index 50e8c71fc5..9bacf100f2 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/DuergarHedgeMage.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/DuergarHedgeMage.java
@@ -38,7 +38,7 @@ public class DuergarHedgeMage extends mage.sets.commander.DuergarHedgeMage {
 
     public DuergarHedgeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/EmeriaAngel.java b/Mage.Sets/src/mage/sets/wpngateway/EmeriaAngel.java
index dcfb0c77f4..55415bd721 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/EmeriaAngel.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/EmeriaAngel.java
@@ -38,7 +38,7 @@ public class EmeriaAngel extends mage.sets.zendikar.EmeriaAngel {
 
     public EmeriaAngel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/FieryTemper.java b/Mage.Sets/src/mage/sets/wpngateway/FieryTemper.java
index 703740046a..fd2a872f39 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/FieryTemper.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/FieryTemper.java
@@ -37,7 +37,7 @@ public class FieryTemper extends mage.sets.timeshifted.FieryTemper {
 
     public FieryTemper(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "GRC";
     }
 
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Fling.java b/Mage.Sets/src/mage/sets/wpngateway/Fling.java
index aa02398078..27a3be5862 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Fling.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Fling.java
@@ -38,7 +38,7 @@ public class Fling extends mage.sets.magic2011.Fling {
 
     public Fling(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/GatherTheTownsfolk.java b/Mage.Sets/src/mage/sets/wpngateway/GatherTheTownsfolk.java
index d4082cbcf5..d9df92b12f 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/GatherTheTownsfolk.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/GatherTheTownsfolk.java
@@ -38,7 +38,7 @@ public class GatherTheTownsfolk extends mage.sets.darkascension.GatherTheTownsfo
 
     public GatherTheTownsfolk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 79;
+        this.cardNumber = "79";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/GolemsHeart.java b/Mage.Sets/src/mage/sets/wpngateway/GolemsHeart.java
index b37e84e60a..9b8651a646 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/GolemsHeart.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/GolemsHeart.java
@@ -38,7 +38,7 @@ public class GolemsHeart extends mage.sets.scarsofmirrodin.GolemsHeart {
 
     public GolemsHeart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Gravedigger.java b/Mage.Sets/src/mage/sets/wpngateway/Gravedigger.java
index d3662e4a26..520cd98478 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Gravedigger.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Gravedigger.java
@@ -38,7 +38,7 @@ public class Gravedigger extends mage.sets.tenthedition.Gravedigger {
 
     public Gravedigger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/HadaFreeblade.java b/Mage.Sets/src/mage/sets/wpngateway/HadaFreeblade.java
index b4d369f70d..5bf36a7bf7 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/HadaFreeblade.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/HadaFreeblade.java
@@ -38,7 +38,7 @@ public class HadaFreeblade extends mage.sets.worldwake.HadaFreeblade {
 
     public HadaFreeblade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/HellsparkElemental.java b/Mage.Sets/src/mage/sets/wpngateway/HellsparkElemental.java
index e3584a5dd0..ffd2670fa5 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/HellsparkElemental.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/HellsparkElemental.java
@@ -38,7 +38,7 @@ public class HellsparkElemental extends mage.sets.conflux.HellsparkElemental {
 
     public HellsparkElemental(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java
index c70e020699..e4e51230f6 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java
@@ -38,7 +38,7 @@ public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelinee
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/wpngateway/KalastriaHighborn.java
index d74c085737..bd1fac4f2a 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/KalastriaHighborn.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/KalastriaHighborn.java
@@ -38,7 +38,7 @@ public class KalastriaHighborn extends mage.sets.worldwake.KalastriaHighborn {
 
     public KalastriaHighborn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/KorDuelist.java b/Mage.Sets/src/mage/sets/wpngateway/KorDuelist.java
index bb38f97b16..5327302305 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/KorDuelist.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/KorDuelist.java
@@ -38,7 +38,7 @@ public class KorDuelist extends mage.sets.zendikar.KorDuelist {
 
     public KorDuelist(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/KorFirewalker.java b/Mage.Sets/src/mage/sets/wpngateway/KorFirewalker.java
index bc2a1dee09..a9e4283454 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/KorFirewalker.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/KorFirewalker.java
@@ -38,7 +38,7 @@ public class KorFirewalker extends mage.sets.worldwake.KorFirewalker {
 
     public KorFirewalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/LavaAxe.java b/Mage.Sets/src/mage/sets/wpngateway/LavaAxe.java
index e69decc8bf..a56db916dd 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/LavaAxe.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/LavaAxe.java
@@ -38,7 +38,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe {
 
     public LavaAxe(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/LeatherbackBaloth.java b/Mage.Sets/src/mage/sets/wpngateway/LeatherbackBaloth.java
index 7f2c44a243..0e33f90ea0 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/LeatherbackBaloth.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/LeatherbackBaloth.java
@@ -38,7 +38,7 @@ public class LeatherbackBaloth extends mage.sets.worldwake.LeatherbackBaloth {
 
     public LeatherbackBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/LlanowarElves.java b/Mage.Sets/src/mage/sets/wpngateway/LlanowarElves.java
index 009803b64e..0fe184ff40 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/LlanowarElves.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/LlanowarElves.java
@@ -38,7 +38,7 @@ public class LlanowarElves extends mage.sets.tenthedition.LlanowarElves {
 
     public LlanowarElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MarisisTwinclaws.java b/Mage.Sets/src/mage/sets/wpngateway/MarisisTwinclaws.java
index b3c97aed80..367291cb97 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MarisisTwinclaws.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MarisisTwinclaws.java
@@ -38,7 +38,7 @@ public class MarisisTwinclaws extends mage.sets.alarareborn.MarisisTwinclaws {
 
     public MarisisTwinclaws(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MastersCall.java b/Mage.Sets/src/mage/sets/wpngateway/MastersCall.java
index 650d0605ac..567e57e7e7 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MastersCall.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MastersCall.java
@@ -38,7 +38,7 @@ public class MastersCall extends mage.sets.mirrodinbesieged.MastersCall {
 
     public MastersCall(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 64;
+        this.cardNumber = "64";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MaulSplicer.java b/Mage.Sets/src/mage/sets/wpngateway/MaulSplicer.java
index 632963a035..f219dd6234 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MaulSplicer.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MaulSplicer.java
@@ -38,7 +38,7 @@ public class MaulSplicer extends mage.sets.newphyrexia.MaulSplicer {
 
     public MaulSplicer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 72;
+        this.cardNumber = "72";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MindControl.java b/Mage.Sets/src/mage/sets/wpngateway/MindControl.java
index 34142d27d3..e7db36c80f 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MindControl.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MindControl.java
@@ -38,7 +38,7 @@ public class MindControl extends mage.sets.magic2010.MindControl {
 
     public MindControl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MindStone.java b/Mage.Sets/src/mage/sets/wpngateway/MindStone.java
index 97838a3a97..ca891cc556 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MindStone.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MindStone.java
@@ -38,7 +38,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MoggFanatic.java b/Mage.Sets/src/mage/sets/wpngateway/MoggFanatic.java
index 14ff53393b..a869e41023 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MoggFanatic.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MoggFanatic.java
@@ -38,7 +38,7 @@ public class MoggFanatic extends mage.sets.tempest.MoggFanatic {
 
     public MoggFanatic(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/MycoidShepherd.java b/Mage.Sets/src/mage/sets/wpngateway/MycoidShepherd.java
index 53d51c6140..033dd02784 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/MycoidShepherd.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/MycoidShepherd.java
@@ -38,7 +38,7 @@ public class MycoidShepherd extends mage.sets.alarareborn.MycoidShepherd {
 
     public MycoidShepherd(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/NayaSojourners.java b/Mage.Sets/src/mage/sets/wpngateway/NayaSojourners.java
index a0f0f138d0..c31b878915 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/NayaSojourners.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/NayaSojourners.java
@@ -38,7 +38,7 @@ public class NayaSojourners extends mage.sets.alarareborn.NayaSojourners {
 
     public NayaSojourners(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/NearheathStalker.java b/Mage.Sets/src/mage/sets/wpngateway/NearheathStalker.java
index 473ba337bc..e0540423bf 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/NearheathStalker.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/NearheathStalker.java
@@ -38,7 +38,7 @@ public class NearheathStalker extends mage.sets.darkascension.NearheathStalker {
 
     public NearheathStalker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 82;
+        this.cardNumber = "82";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/NissasChosen.java b/Mage.Sets/src/mage/sets/wpngateway/NissasChosen.java
index daeec44755..2460e93f40 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/NissasChosen.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/NissasChosen.java
@@ -38,7 +38,7 @@ public class NissasChosen extends mage.sets.zendikar.NissasChosen {
 
     public NissasChosen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/OonasBlackguard.java b/Mage.Sets/src/mage/sets/wpngateway/OonasBlackguard.java
index 1562c75c88..3738f111ae 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/OonasBlackguard.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/OonasBlackguard.java
@@ -38,7 +38,7 @@ public class OonasBlackguard extends mage.sets.morningtide.OonasBlackguard {
 
     public OonasBlackguard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/PathToExile.java b/Mage.Sets/src/mage/sets/wpngateway/PathToExile.java
index ecef543f38..083d252d68 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/PathToExile.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/PathToExile.java
@@ -38,7 +38,7 @@ public class PathToExile extends mage.sets.conflux.PathToExile {
 
     public PathToExile(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/PathrazerOfUlamog.java b/Mage.Sets/src/mage/sets/wpngateway/PathrazerOfUlamog.java
index cbae21b3e7..44857fb456 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/PathrazerOfUlamog.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/PathrazerOfUlamog.java
@@ -38,7 +38,7 @@ public class PathrazerOfUlamog extends mage.sets.riseoftheeldrazi.PathrazerOfUla
 
     public PathrazerOfUlamog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/PlagueMyr.java b/Mage.Sets/src/mage/sets/wpngateway/PlagueMyr.java
index a8639d4944..2f870d5df8 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/PlagueMyr.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/PlagueMyr.java
@@ -38,7 +38,7 @@ public class PlagueMyr extends mage.sets.mirrodinbesieged.PlagueMyr {
 
     public PlagueMyr(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/PlagueStinger.java b/Mage.Sets/src/mage/sets/wpngateway/PlagueStinger.java
index 7a1515c1b6..f338c60b2f 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/PlagueStinger.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/PlagueStinger.java
@@ -38,7 +38,7 @@ public class PlagueStinger extends mage.sets.scarsofmirrodin.PlagueStinger {
 
     public PlagueStinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/RecklessWurm.java b/Mage.Sets/src/mage/sets/wpngateway/RecklessWurm.java
index dafb6ec064..c087282a80 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/RecklessWurm.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/RecklessWurm.java
@@ -38,7 +38,7 @@ public class RecklessWurm extends mage.sets.planarchaos.RecklessWurm {
 
     public RecklessWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/wpngateway/RiseFromTheGrave.java
index 94ca7d0002..2979e26fee 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/RiseFromTheGrave.java
@@ -38,7 +38,7 @@ public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
 
     public RiseFromTheGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/SelkieHedgeMage.java b/Mage.Sets/src/mage/sets/wpngateway/SelkieHedgeMage.java
index 4d16c840d9..0a6db3a63e 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/SelkieHedgeMage.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/SelkieHedgeMage.java
@@ -38,7 +38,7 @@ public class SelkieHedgeMage extends mage.sets.eventide.SelkieHedgeMage {
 
     public SelkieHedgeMage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/ShrineOfBurningRage.java b/Mage.Sets/src/mage/sets/wpngateway/ShrineOfBurningRage.java
index 9a06a945d4..24fec63e4f 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/ShrineOfBurningRage.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/ShrineOfBurningRage.java
@@ -38,7 +38,7 @@ public class ShrineOfBurningRage extends mage.sets.newphyrexia.ShrineOfBurningRa
 
     public ShrineOfBurningRage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 73;
+        this.cardNumber = "73";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/SignalPest.java b/Mage.Sets/src/mage/sets/wpngateway/SignalPest.java
index c23b491c77..744edea8b7 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/SignalPest.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/SignalPest.java
@@ -38,7 +38,7 @@ public class SignalPest extends mage.sets.mirrodinbesieged.SignalPest {
 
     public SignalPest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Skinrender.java b/Mage.Sets/src/mage/sets/wpngateway/Skinrender.java
index 368fc5012d..bb3046bb7a 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Skinrender.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Skinrender.java
@@ -38,7 +38,7 @@ public class Skinrender extends mage.sets.scarsofmirrodin.Skinrender {
 
     public Skinrender(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/SlaveOfBolas.java b/Mage.Sets/src/mage/sets/wpngateway/SlaveOfBolas.java
index 761b9fcecd..82f7594460 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/SlaveOfBolas.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/SlaveOfBolas.java
@@ -38,7 +38,7 @@ public class SlaveOfBolas extends mage.sets.alarareborn.SlaveOfBolas {
 
     public SlaveOfBolas(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/SproutingThrinax.java b/Mage.Sets/src/mage/sets/wpngateway/SproutingThrinax.java
index 8d3ab64d7c..8e9d46ff54 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/SproutingThrinax.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/SproutingThrinax.java
@@ -38,7 +38,7 @@ public class SproutingThrinax extends mage.sets.shardsofalara.SproutingThrinax {
 
     public SproutingThrinax(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/Staggershock.java b/Mage.Sets/src/mage/sets/wpngateway/Staggershock.java
index efaf2f208f..cd2a8dcabe 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/Staggershock.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/Staggershock.java
@@ -38,7 +38,7 @@ public class Staggershock extends mage.sets.riseoftheeldrazi.Staggershock {
 
     public Staggershock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/SylvanRanger.java b/Mage.Sets/src/mage/sets/wpngateway/SylvanRanger.java
index 4526ad9f5e..3f606f5dc8 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/SylvanRanger.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/SylvanRanger.java
@@ -38,7 +38,7 @@ public class SylvanRanger extends mage.sets.magic2011.SylvanRanger {
 
     public SylvanRanger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 70;
+        this.cardNumber = "70";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/SyphonMind.java b/Mage.Sets/src/mage/sets/wpngateway/SyphonMind.java
index 8337b910ab..6b2d45942e 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/SyphonMind.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/SyphonMind.java
@@ -38,7 +38,7 @@ public class SyphonMind extends mage.sets.onslaught.SyphonMind {
 
     public SyphonMind(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/TormentedSoul.java b/Mage.Sets/src/mage/sets/wpngateway/TormentedSoul.java
index 4d03525a4c..955e38511a 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/TormentedSoul.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/TormentedSoul.java
@@ -38,7 +38,7 @@ public class TormentedSoul extends mage.sets.magic2012.TormentedSoul {
 
     public TormentedSoul(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 76;
+        this.cardNumber = "76";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/VampireNighthawk.java b/Mage.Sets/src/mage/sets/wpngateway/VampireNighthawk.java
index 0eccd3c277..49ad1aa9a0 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/VampireNighthawk.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/VampireNighthawk.java
@@ -38,7 +38,7 @@ public class VampireNighthawk extends mage.sets.zendikar.VampireNighthawk {
 
     public VampireNighthawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/VaultSkirge.java b/Mage.Sets/src/mage/sets/wpngateway/VaultSkirge.java
index e35a271a4d..91f3ded08f 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/VaultSkirge.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/VaultSkirge.java
@@ -38,7 +38,7 @@ public class VaultSkirge extends mage.sets.newphyrexia.VaultSkirge {
 
     public VaultSkirge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 71;
+        this.cardNumber = "71";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/WiltLeafCavaliers.java b/Mage.Sets/src/mage/sets/wpngateway/WiltLeafCavaliers.java
index d20f4556cd..31d7318f94 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/WiltLeafCavaliers.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/WiltLeafCavaliers.java
@@ -38,7 +38,7 @@ public class WiltLeafCavaliers extends mage.sets.shadowmoor.WiltLeafCavaliers {
 
     public WiltLeafCavaliers(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/WoodElves.java b/Mage.Sets/src/mage/sets/wpngateway/WoodElves.java
index 93aba3ff6a..381b668a74 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/WoodElves.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/WoodElves.java
@@ -38,7 +38,7 @@ public class WoodElves extends mage.sets.ninthedition.WoodElves {
 
     public WoodElves(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/WoollyThoctar.java b/Mage.Sets/src/mage/sets/wpngateway/WoollyThoctar.java
index 879b05c315..16594e2699 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/WoollyThoctar.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/WoollyThoctar.java
@@ -38,7 +38,7 @@ public class WoollyThoctar extends mage.sets.shardsofalara.WoollyThoctar {
 
     public WoollyThoctar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/YixlidJailer.java b/Mage.Sets/src/mage/sets/wpngateway/YixlidJailer.java
index 0b225e16d2..5a1ab83852 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/YixlidJailer.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/YixlidJailer.java
@@ -38,7 +38,7 @@ public class YixlidJailer extends mage.sets.futuresight.YixlidJailer {
 
     public YixlidJailer(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/wpngateway/ZoeticCavern.java b/Mage.Sets/src/mage/sets/wpngateway/ZoeticCavern.java
index e1804c2265..13a811912e 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/ZoeticCavern.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/ZoeticCavern.java
@@ -38,7 +38,7 @@ public class ZoeticCavern extends mage.sets.commander2014.ZoeticCavern {
 
     public ZoeticCavern(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "GRC";
         this.rarity = Rarity.SPECIAL;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/Cancel.java b/Mage.Sets/src/mage/sets/zendikar/Cancel.java
index 26e15260a9..e293bde749 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Cancel.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Cancel.java
@@ -38,7 +38,7 @@ public class Cancel extends mage.sets.tenthedition.Cancel {
 
     public Cancel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "ZEN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/Demolish.java b/Mage.Sets/src/mage/sets/zendikar/Demolish.java
index 2a34a28301..ed063bc78c 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Demolish.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Demolish.java
@@ -38,7 +38,7 @@ public class Demolish extends mage.sets.tenthedition.Demolish {
 
     public Demolish(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 121;
+        this.cardNumber = "121";
         this.expansionSetCode = "ZEN";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/AncientTomb.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/AncientTomb.java
index f52285cc92..5f9a8dcd00 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/AncientTomb.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/AncientTomb.java
@@ -38,7 +38,7 @@ public class AncientTomb extends mage.sets.tempest.AncientTomb {
 
     public AncientTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 36;
+        this.cardNumber = "36";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/AridMesa.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/AridMesa.java
index c74cea7246..9c9ff49bbc 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/AridMesa.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/AridMesa.java
@@ -38,7 +38,7 @@ public class AridMesa extends mage.sets.zendikar.AridMesa {
 
     public AridMesa(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodCrypt.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodCrypt.java
index 75f2c346c3..7c89f85ba6 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodCrypt.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodCrypt.java
@@ -38,7 +38,7 @@ public class BloodCrypt extends mage.sets.dissension.BloodCrypt {
 
     public BloodCrypt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodstainedMire.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodstainedMire.java
index 30f5956274..2fd4fcb10b 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodstainedMire.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/BloodstainedMire.java
@@ -38,7 +38,7 @@ public class BloodstainedMire extends mage.sets.onslaught.BloodstainedMire {
 
     public BloodstainedMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/BreedingPool.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/BreedingPool.java
index a7a407d5b3..ba4a1c8c14 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/BreedingPool.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/BreedingPool.java
@@ -38,7 +38,7 @@ public class BreedingPool extends mage.sets.dissension.BreedingPool {
 
     public BreedingPool(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/CanopyVista.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/CanopyVista.java
index 15a45bb0ae..386dfdfbf8 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/CanopyVista.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/CanopyVista.java
@@ -38,7 +38,7 @@ public class CanopyVista extends mage.sets.battleforzendikar.CanopyVista {
 
     public CanopyVista(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/CascadeBluffs.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/CascadeBluffs.java
index fdd2559240..a99c39b0b3 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/CascadeBluffs.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/CascadeBluffs.java
@@ -38,7 +38,7 @@ public class CascadeBluffs extends mage.sets.eventide.CascadeBluffs {
 
     public CascadeBluffs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/CinderGlade.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/CinderGlade.java
index c81265ccb5..85b11d51ce 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/CinderGlade.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/CinderGlade.java
@@ -38,7 +38,7 @@ public class CinderGlade extends mage.sets.battleforzendikar.CinderGlade {
 
     public CinderGlade(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/DustBowl.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/DustBowl.java
index efe527074c..32e4a2f277 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/DustBowl.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/DustBowl.java
@@ -38,7 +38,7 @@ public class DustBowl extends mage.sets.mercadianmasques.DustBowl {
 
     public DustBowl(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 37;
+        this.cardNumber = "37";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/EyeOfUgin.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/EyeOfUgin.java
index 7914f68c32..2ba4415220 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/EyeOfUgin.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/EyeOfUgin.java
@@ -37,7 +37,7 @@ public class EyeOfUgin extends mage.sets.worldwake.EyeOfUgin {
 
     public EyeOfUgin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 38;
+        this.cardNumber = "38";
         this.expansionSetCode = "EXP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/FetidHeath.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/FetidHeath.java
index 4e4d3f7e62..e3ab1f387f 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/FetidHeath.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/FetidHeath.java
@@ -38,7 +38,7 @@ public class FetidHeath extends mage.sets.eventide.FetidHeath {
 
     public FetidHeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/FireLitThicket.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/FireLitThicket.java
index 65bb65e239..2389e2e5e1 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/FireLitThicket.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/FireLitThicket.java
@@ -38,7 +38,7 @@ public class FireLitThicket extends mage.sets.shadowmoor.FireLitThicket {
 
     public FireLitThicket(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedGrove.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedGrove.java
index f38b1bbcb8..399a420ebc 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedGrove.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedGrove.java
@@ -38,7 +38,7 @@ public class FloodedGrove extends mage.sets.eventide.FloodedGrove {
 
     public FloodedGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 35;
+        this.cardNumber = "35";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedStrand.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedStrand.java
index f1da51bfc1..36d7ba6a40 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedStrand.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/FloodedStrand.java
@@ -38,7 +38,7 @@ public class FloodedStrand extends mage.sets.onslaught.FloodedStrand {
 
     public FloodedStrand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/ForbiddenOrchard.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/ForbiddenOrchard.java
index 90de4c9a7f..3a14f83fd6 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/ForbiddenOrchard.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/ForbiddenOrchard.java
@@ -38,7 +38,7 @@ public class ForbiddenOrchard extends mage.sets.championsofkamigawa.ForbiddenOrc
 
     public ForbiddenOrchard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 39;
+        this.cardNumber = "39";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/GodlessShrine.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/GodlessShrine.java
index 92fb6f5717..19afb5f93a 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/GodlessShrine.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/GodlessShrine.java
@@ -38,7 +38,7 @@ public class GodlessShrine extends mage.sets.guildpact.GodlessShrine {
 
     public GodlessShrine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/GravenCairns.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/GravenCairns.java
index 952e53afcf..9b318c4b67 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/GravenCairns.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/GravenCairns.java
@@ -38,7 +38,7 @@ public class GravenCairns extends mage.sets.shadowmoor.GravenCairns {
 
     public GravenCairns(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/HallowedFountain.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/HallowedFountain.java
index a222124914..23b95880b6 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/HallowedFountain.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/HallowedFountain.java
@@ -38,7 +38,7 @@ public class HallowedFountain extends mage.sets.dissension.HallowedFountain {
 
     public HallowedFountain(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/HorizonCanopy.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/HorizonCanopy.java
index a9745ae98d..bbf875697a 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/HorizonCanopy.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/HorizonCanopy.java
@@ -38,7 +38,7 @@ public class HorizonCanopy extends mage.sets.futuresight.HorizonCanopy {
 
     public HorizonCanopy(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 40;
+        this.cardNumber = "40";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/KorHaven.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/KorHaven.java
index bf476029f7..40d3a77353 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/KorHaven.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/KorHaven.java
@@ -38,7 +38,7 @@ public class KorHaven extends mage.sets.nemesis.KorHaven {
 
     public KorHaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/ManaConfluence.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/ManaConfluence.java
index 95539128a9..d3b8a3358b 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/ManaConfluence.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/ManaConfluence.java
@@ -38,7 +38,7 @@ public class ManaConfluence extends mage.sets.journeyintonyx.ManaConfluence {
 
     public ManaConfluence(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/MarshFlats.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/MarshFlats.java
index 030eb459e3..2a3304ac31 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/MarshFlats.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/MarshFlats.java
@@ -38,7 +38,7 @@ public class MarshFlats extends mage.sets.zendikar.MarshFlats {
 
     public MarshFlats(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 21;
+        this.cardNumber = "21";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/MistyRainforest.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/MistyRainforest.java
index 4c22fa52e1..fe4f6661ae 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/MistyRainforest.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/MistyRainforest.java
@@ -38,7 +38,7 @@ public class MistyRainforest extends mage.sets.zendikar.MistyRainforest {
 
     public MistyRainforest(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/MysticGate.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/MysticGate.java
index eadcab3181..a2daf09221 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/MysticGate.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/MysticGate.java
@@ -38,7 +38,7 @@ public class MysticGate extends mage.sets.shadowmoor.MysticGate {
 
     public MysticGate(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/OvergrownTomb.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/OvergrownTomb.java
index ae424e0f58..20f12a3c11 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/OvergrownTomb.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/OvergrownTomb.java
@@ -38,7 +38,7 @@ public class OvergrownTomb extends mage.sets.ravnica.OvergrownTomb {
 
     public OvergrownTomb(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/PollutedDelta.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/PollutedDelta.java
index 35fb00d05d..40fe647354 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/PollutedDelta.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/PollutedDelta.java
@@ -38,7 +38,7 @@ public class PollutedDelta extends mage.sets.onslaught.PollutedDelta {
 
     public PollutedDelta(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/PrairieStream.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/PrairieStream.java
index 54965a94fd..723bc80299 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/PrairieStream.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/PrairieStream.java
@@ -38,7 +38,7 @@ public class PrairieStream extends mage.sets.battleforzendikar.PrairieStream {
 
     public PrairieStream(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/RuggedPrairie.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/RuggedPrairie.java
index 304bdff6ac..e0fcca7a3e 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/RuggedPrairie.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/RuggedPrairie.java
@@ -38,7 +38,7 @@ public class RuggedPrairie extends mage.sets.eventide.RuggedPrairie {
 
     public RuggedPrairie(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/SacredFoundry.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/SacredFoundry.java
index 25d51b68ba..b1da082674 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/SacredFoundry.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/SacredFoundry.java
@@ -38,7 +38,7 @@ public class SacredFoundry extends mage.sets.ravnica.SacredFoundry {
 
     public SacredFoundry(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/ScaldingTarn.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/ScaldingTarn.java
index 1d4a9534d3..715f432ba8 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/ScaldingTarn.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/ScaldingTarn.java
@@ -38,7 +38,7 @@ public class ScaldingTarn extends mage.sets.zendikar.ScaldingTarn {
 
     public ScaldingTarn(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/SmolderingMarsh.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/SmolderingMarsh.java
index 3a9b4adabc..ad070e2f42 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/SmolderingMarsh.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/SmolderingMarsh.java
@@ -38,7 +38,7 @@ public class SmolderingMarsh extends mage.sets.battleforzendikar.SmolderingMarsh
 
     public SmolderingMarsh(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/SteamVents.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/SteamVents.java
index 5f9f5adfc8..63a416cbf3 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/SteamVents.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/SteamVents.java
@@ -38,7 +38,7 @@ public class SteamVents extends mage.sets.guildpact.SteamVents {
 
     public SteamVents(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/StompingGround.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/StompingGround.java
index 06acf8a4b5..c635912a30 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/StompingGround.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/StompingGround.java
@@ -38,7 +38,7 @@ public class StompingGround extends mage.sets.guildpact.StompingGround {
 
     public StompingGround(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9;
+        this.cardNumber = "9";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/StripMine.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/StripMine.java
index 10d3f2c97f..610de031ac 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/StripMine.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/StripMine.java
@@ -38,7 +38,7 @@ public class StripMine extends mage.sets.fourthedition.StripMine {
 
     public StripMine(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenHollow.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenHollow.java
index 8ea9fe8546..ee2f8413a5 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenHollow.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenHollow.java
@@ -38,7 +38,7 @@ public class SunkenHollow extends mage.sets.battleforzendikar.SunkenHollow {
 
     public SunkenHollow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenRuins.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenRuins.java
index adf7df4df0..89d8e34c97 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenRuins.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/SunkenRuins.java
@@ -38,7 +38,7 @@ public class SunkenRuins extends mage.sets.shadowmoor.SunkenRuins {
 
     public SunkenRuins(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 27;
+        this.cardNumber = "27";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/TectonicEdge.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/TectonicEdge.java
index be3970a221..d4368c7c37 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/TectonicEdge.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/TectonicEdge.java
@@ -38,7 +38,7 @@ public class TectonicEdge extends mage.sets.worldwake.TectonicEdge {
 
     public TectonicEdge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/TempleGarden.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/TempleGarden.java
index 60feb64b6e..a2adec3a40 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/TempleGarden.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/TempleGarden.java
@@ -38,7 +38,7 @@ public class TempleGarden extends mage.sets.ravnica.TempleGarden {
 
     public TempleGarden(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/TwilightMire.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/TwilightMire.java
index 5b5172ba10..9f69ab534a 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/TwilightMire.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/TwilightMire.java
@@ -38,7 +38,7 @@ public class TwilightMire extends mage.sets.eventide.TwilightMire {
 
     public TwilightMire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/VerdantCatacombs.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/VerdantCatacombs.java
index 339425a636..0c23272966 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/VerdantCatacombs.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/VerdantCatacombs.java
@@ -38,7 +38,7 @@ public class VerdantCatacombs extends mage.sets.zendikar.VerdantCatacombs {
 
     public VerdantCatacombs(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/Wasteland.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/Wasteland.java
index f463c8a411..fb14579bf9 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/Wasteland.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/Wasteland.java
@@ -38,7 +38,7 @@ public class Wasteland extends mage.sets.tempest.Wasteland {
 
     public Wasteland(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/WateryGrave.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/WateryGrave.java
index 3cfc578132..5f54932a2e 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/WateryGrave.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/WateryGrave.java
@@ -38,7 +38,7 @@ public class WateryGrave extends mage.sets.ravnica.WateryGrave {
 
     public WateryGrave(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/WindsweptHeath.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/WindsweptHeath.java
index 7513ad9be8..a11f56e6e6 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/WindsweptHeath.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/WindsweptHeath.java
@@ -38,7 +38,7 @@ public class WindsweptHeath extends mage.sets.onslaught.WindsweptHeath {
 
     public WindsweptHeath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedBastion.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedBastion.java
index 4449c45550..b0502e27bf 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedBastion.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedBastion.java
@@ -38,7 +38,7 @@ public class WoodedBastion extends mage.sets.shadowmoor.WoodedBastion {
 
     public WoodedBastion(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedFoothills.java b/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedFoothills.java
index 30909248a9..f7cce98f7c 100644
--- a/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedFoothills.java
+++ b/Mage.Sets/src/mage/sets/zendikarexpeditions/WoodedFoothills.java
@@ -38,7 +38,7 @@ public class WoodedFoothills extends mage.sets.onslaught.WoodedFoothills {
 
     public WoodedFoothills(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "EXP";
         this.rarity = Rarity.MYTHIC;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/AffaGuardHound.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/AffaGuardHound.java
index 5124a2cef4..173fd0a312 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/AffaGuardHound.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/AffaGuardHound.java
@@ -37,7 +37,7 @@ public class AffaGuardHound extends mage.sets.riseoftheeldrazi.AffaGuardHound {
 
     public AffaGuardHound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 2;
+        this.cardNumber = "2";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/AkoumRefuge.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/AkoumRefuge.java
index b1224e4e78..e4b7baf3d0 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/AkoumRefuge.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/AkoumRefuge.java
@@ -37,7 +37,7 @@ public class AkoumRefuge extends mage.sets.zendikar.AkoumRefuge {
 
     public AkoumRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 67;
+        this.cardNumber = "67";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ArtisanOfKozilek.java
index 50e551ec19..4d86c8fd9d 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ArtisanOfKozilek.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ArtisanOfKozilek.java
@@ -37,7 +37,7 @@ public class ArtisanOfKozilek extends mage.sets.riseoftheeldrazi.ArtisanOfKozile
 
     public ArtisanOfKozilek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 42;
+        this.cardNumber = "42";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/AvengerOfZendikar.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/AvengerOfZendikar.java
index 8a943c4719..7ef702a776 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/AvengerOfZendikar.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/AvengerOfZendikar.java
@@ -37,7 +37,7 @@ public class AvengerOfZendikar extends mage.sets.worldwake.AvengerOfZendikar {
 
     public AvengerOfZendikar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 1;
+        this.cardNumber = "1";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/BeastbreakerOfBalaGed.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/BeastbreakerOfBalaGed.java
index c6186f3bac..3f6e38af2f 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/BeastbreakerOfBalaGed.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/BeastbreakerOfBalaGed.java
@@ -37,7 +37,7 @@ public class BeastbreakerOfBalaGed extends mage.sets.riseoftheeldrazi.Beastbreak
 
     public BeastbreakerOfBalaGed(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 10;
+        this.cardNumber = "10";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodriteInvoker.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodriteInvoker.java
index 6882416b53..537df8f6ab 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodriteInvoker.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodriteInvoker.java
@@ -37,7 +37,7 @@ public class BloodriteInvoker extends mage.sets.riseoftheeldrazi.BloodriteInvoke
 
     public BloodriteInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 45;
+        this.cardNumber = "45";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodthroneVampire.java
index df217b22dc..a12ff75071 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodthroneVampire.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/BloodthroneVampire.java
@@ -37,7 +37,7 @@ public class BloodthroneVampire extends mage.sets.riseoftheeldrazi.BloodthroneVa
 
     public BloodthroneVampire(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 46;
+        this.cardNumber = "46";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ButcherOfMalakir.java
index b6cc30b4eb..56d10d9caa 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ButcherOfMalakir.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ButcherOfMalakir.java
@@ -37,7 +37,7 @@ public class ButcherOfMalakir extends mage.sets.worldwake.ButcherOfMalakir {
 
     public ButcherOfMalakir(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 47;
+        this.cardNumber = "47";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/CadaverImp.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/CadaverImp.java
index b29ded2282..2796cc5645 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/CadaverImp.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/CadaverImp.java
@@ -37,7 +37,7 @@ public class CadaverImp extends mage.sets.riseoftheeldrazi.CadaverImp {
 
     public CadaverImp(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 48;
+        this.cardNumber = "48";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/CaravanEscort.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/CaravanEscort.java
index ca835f7380..1b41e536e5 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/CaravanEscort.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/CaravanEscort.java
@@ -37,7 +37,7 @@ public class CaravanEscort extends mage.sets.riseoftheeldrazi.CaravanEscort {
 
     public CaravanEscort(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 3;
+        this.cardNumber = "3";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ConsumeTheMeek.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ConsumeTheMeek.java
index f0ab133945..3eae71def0 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ConsumeTheMeek.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ConsumeTheMeek.java
@@ -37,7 +37,7 @@ public class ConsumeTheMeek extends mage.sets.riseoftheeldrazi.ConsumeTheMeek {
 
     public ConsumeTheMeek(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 49;
+        this.cardNumber = "49";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Corpsehatch.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Corpsehatch.java
index d773fac09f..40165037de 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Corpsehatch.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Corpsehatch.java
@@ -37,7 +37,7 @@ public class Corpsehatch extends mage.sets.riseoftheeldrazi.Corpsehatch {
 
     public Corpsehatch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 50;
+        this.cardNumber = "50";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/DaggerbackBasilisk.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/DaggerbackBasilisk.java
index 12a2bf2ecf..eb3cc64886 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/DaggerbackBasilisk.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/DaggerbackBasilisk.java
@@ -37,7 +37,7 @@ public class DaggerbackBasilisk extends mage.sets.riseoftheeldrazi.DaggerbackBas
 
     public DaggerbackBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 11;
+        this.cardNumber = "11";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/DominatorDrone.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/DominatorDrone.java
index 10b9f0dedd..4efd761115 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/DominatorDrone.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/DominatorDrone.java
@@ -37,7 +37,7 @@ public class DominatorDrone extends mage.sets.battleforzendikar.DominatorDrone {
 
     public DominatorDrone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 51;
+        this.cardNumber = "51";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/EldraziTemple.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/EldraziTemple.java
index c8e18c7664..49224d7507 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/EldraziTemple.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/EldraziTemple.java
@@ -38,7 +38,7 @@ public class EldraziTemple extends mage.sets.riseoftheeldrazi.EldraziTemple {
 
     public EldraziTemple(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 68;
+        this.cardNumber = "68";
         this.expansionSetCode = "DDP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/EmrakulsHatcher.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/EmrakulsHatcher.java
index 2f19778d32..4b8e650da6 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/EmrakulsHatcher.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/EmrakulsHatcher.java
@@ -37,7 +37,7 @@ public class EmrakulsHatcher extends mage.sets.riseoftheeldrazi.EmrakulsHatcher
 
     public EmrakulsHatcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 59;
+        this.cardNumber = "59";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/EvolvingWilds.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/EvolvingWilds.java
index e958eaa429..3ffe4b203b 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/EvolvingWilds.java
@@ -37,7 +37,7 @@ public class EvolvingWilds extends mage.sets.riseoftheeldrazi.EvolvingWilds {
 
     public EvolvingWilds(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 31;
+        this.cardNumber = "31";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ExplorersScope.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ExplorersScope.java
index 2a2ea95697..4c66c57fd5 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ExplorersScope.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ExplorersScope.java
@@ -38,7 +38,7 @@ public class ExplorersScope extends mage.sets.zendikar.ExplorersScope {
 
     public ExplorersScope(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 28;
+        this.cardNumber = "28";
         this.expansionSetCode = "DDP";
         this.rarity = Rarity.UNCOMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ForkedBolt.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ForkedBolt.java
index 3722dea752..7d5e1279a5 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ForkedBolt.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ForkedBolt.java
@@ -37,7 +37,7 @@ public class ForkedBolt extends mage.sets.riseoftheeldrazi.ForkedBolt {
 
     public ForkedBolt(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 60;
+        this.cardNumber = "60";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/FrontierGuide.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/FrontierGuide.java
index b4843dd070..9bf28abb1e 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/FrontierGuide.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/FrontierGuide.java
@@ -37,7 +37,7 @@ public class FrontierGuide extends mage.sets.zendikar.FrontierGuide {
 
     public FrontierGuide(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 12;
+        this.cardNumber = "12";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltHunter.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltHunter.java
index c173909d57..fd2a2d8238 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltHunter.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltHunter.java
@@ -37,7 +37,7 @@ public class GraypeltHunter extends mage.sets.worldwake.GraypeltHunter {
 
     public GraypeltHunter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 13;
+        this.cardNumber = "13";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltRefuge.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltRefuge.java
index 62ed8e05e3..019efc214d 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltRefuge.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/GraypeltRefuge.java
@@ -37,7 +37,7 @@ public class GraypeltRefuge extends mage.sets.zendikar.GraypeltRefuge {
 
     public GraypeltRefuge(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 32;
+        this.cardNumber = "32";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/GrazingGladehart.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/GrazingGladehart.java
index 67aad1851b..0c99d246d3 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/GrazingGladehart.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/GrazingGladehart.java
@@ -37,7 +37,7 @@ public class GrazingGladehart extends mage.sets.zendikar.GrazingGladehart {
 
     public GrazingGladehart(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 14;
+        this.cardNumber = "14";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Groundswell.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Groundswell.java
index 0744ac7192..3c5bc59e32 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Groundswell.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Groundswell.java
@@ -37,7 +37,7 @@ public class Groundswell extends mage.sets.worldwake.Groundswell {
 
     public Groundswell(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 15;
+        this.cardNumber = "15";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Harrow.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Harrow.java
index d8fa9e400f..668be022ab 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Harrow.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Harrow.java
@@ -37,7 +37,7 @@ public class Harrow extends mage.sets.zendikar.Harrow {
 
     public Harrow(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 16;
+        this.cardNumber = "16";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/HeartstabberMosquito.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/HeartstabberMosquito.java
index 7951e57aed..1f9f4b8536 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/HeartstabberMosquito.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/HeartstabberMosquito.java
@@ -37,7 +37,7 @@ public class HeartstabberMosquito extends mage.sets.zendikar.HeartstabberMosquit
 
     public HeartstabberMosquito(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 52;
+        this.cardNumber = "52";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/HellionEruption.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/HellionEruption.java
index 0144b2c535..56d29bff10 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/HellionEruption.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/HellionEruption.java
@@ -37,7 +37,7 @@ public class HellionEruption extends mage.sets.riseoftheeldrazi.HellionEruption
 
     public HellionEruption(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 61;
+        this.cardNumber = "61";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/InduceDespair.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/InduceDespair.java
index 976002758b..87e374bb1e 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/InduceDespair.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/InduceDespair.java
@@ -37,7 +37,7 @@ public class InduceDespair extends mage.sets.riseoftheeldrazi.InduceDespair {
 
     public InduceDespair(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 53;
+        this.cardNumber = "53";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ItThatBetrays.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ItThatBetrays.java
index bb8f9ec715..0390fd5775 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ItThatBetrays.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ItThatBetrays.java
@@ -37,7 +37,7 @@ public class ItThatBetrays extends mage.sets.riseoftheeldrazi.ItThatBetrays {
 
     public ItThatBetrays(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 43;
+        this.cardNumber = "43";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/JoragaBard.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/JoragaBard.java
index 77ef10b33e..57f1171eb2 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/JoragaBard.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/JoragaBard.java
@@ -37,7 +37,7 @@ public class JoragaBard extends mage.sets.zendikar.JoragaBard {
 
     public JoragaBard(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 17;
+        this.cardNumber = "17";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/KabiraVindicator.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/KabiraVindicator.java
index 82aecd4d55..7b21a9b486 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/KabiraVindicator.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/KabiraVindicator.java
@@ -37,7 +37,7 @@ public class KabiraVindicator extends mage.sets.riseoftheeldrazi.KabiraVindicato
 
     public KabiraVindicator(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 4;
+        this.cardNumber = "4";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/KhalniHeartExpedition.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/KhalniHeartExpedition.java
index 7364cfa8cf..3277829aa5 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/KhalniHeartExpedition.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/KhalniHeartExpedition.java
@@ -37,7 +37,7 @@ public class KhalniHeartExpedition extends mage.sets.zendikar.KhalniHeartExpedit
 
     public KhalniHeartExpedition(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 18;
+        this.cardNumber = "18";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/KnightOfCliffhaven.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/KnightOfCliffhaven.java
index 3ba6d8f6b5..be6c06512d 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/KnightOfCliffhaven.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/KnightOfCliffhaven.java
@@ -37,7 +37,7 @@ public class KnightOfCliffhaven extends mage.sets.riseoftheeldrazi.KnightOfCliff
 
     public KnightOfCliffhaven(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 5;
+        this.cardNumber = "5";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Magmaw.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Magmaw.java
index 54a13892c1..26651fc7f5 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Magmaw.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Magmaw.java
@@ -37,7 +37,7 @@ public class Magmaw extends mage.sets.riseoftheeldrazi.Magmaw {
 
     public Magmaw(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 62;
+        this.cardNumber = "62";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/MakindiGriffin.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/MakindiGriffin.java
index 9b932dc326..0f2a6f7ed6 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/MakindiGriffin.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/MakindiGriffin.java
@@ -37,7 +37,7 @@ public class MakindiGriffin extends mage.sets.riseoftheeldrazi.MakindiGriffin {
 
     public MakindiGriffin(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 6;
+        this.cardNumber = "6";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/MarshCasualties.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/MarshCasualties.java
index d0e6f06ba6..2a47215f67 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/MarshCasualties.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/MarshCasualties.java
@@ -37,7 +37,7 @@ public class MarshCasualties extends mage.sets.zendikar.MarshCasualties {
 
     public MarshCasualties(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 54;
+        this.cardNumber = "54";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/MindStone.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/MindStone.java
index c6188c788b..688a80434d 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/MindStone.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/MindStone.java
@@ -37,7 +37,7 @@ public class MindStone extends mage.sets.tenthedition.MindStone {
 
     public MindStone(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 65;
+        this.cardNumber = "65";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/OblivionSower.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/OblivionSower.java
index bb7a3bf3a1..c0b6873548 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/OblivionSower.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/OblivionSower.java
@@ -37,7 +37,7 @@ public class OblivionSower extends mage.sets.battleforzendikar.OblivionSower {
 
     public OblivionSower(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 41;
+        this.cardNumber = "41";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/OnduGiant.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/OnduGiant.java
index fcd3f7da7d..dc0c84b590 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/OnduGiant.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/OnduGiant.java
@@ -37,7 +37,7 @@ public class OnduGiant extends mage.sets.riseoftheeldrazi.OnduGiant {
 
     public OnduGiant(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 19;
+        this.cardNumber = "19";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Oust.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Oust.java
index 4c697dae8b..eaaaef04e9 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Oust.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Oust.java
@@ -37,7 +37,7 @@ public class Oust extends mage.sets.riseoftheeldrazi.Oust {
 
     public Oust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 7;
+        this.cardNumber = "7";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/PawnOfUlamog.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/PawnOfUlamog.java
index a21afa97ad..ce3626d563 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/PawnOfUlamog.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/PawnOfUlamog.java
@@ -37,7 +37,7 @@ public class PawnOfUlamog extends mage.sets.riseoftheeldrazi.PawnOfUlamog {
 
     public PawnOfUlamog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 55;
+        this.cardNumber = "55";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/PrimalCommand.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/PrimalCommand.java
index c4972bf4ee..bc02995ffa 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/PrimalCommand.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/PrimalCommand.java
@@ -37,7 +37,7 @@ public class PrimalCommand extends mage.sets.lorwyn.PrimalCommand {
 
     public PrimalCommand(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 20;
+        this.cardNumber = "20";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ReadTheBones.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ReadTheBones.java
index 501b0e742e..85bf8afb68 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ReadTheBones.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ReadTheBones.java
@@ -37,7 +37,7 @@ public class ReadTheBones extends mage.sets.theros.ReadTheBones {
 
     public ReadTheBones(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 56;
+        this.cardNumber = "56";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/RepelTheDarkness.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/RepelTheDarkness.java
index f81bb35304..d7fc076124 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/RepelTheDarkness.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/RepelTheDarkness.java
@@ -37,7 +37,7 @@ public class RepelTheDarkness extends mage.sets.riseoftheeldrazi.RepelTheDarknes
 
     public RepelTheDarkness(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 8;
+        this.cardNumber = "8";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/RockyTarPit.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/RockyTarPit.java
index 993dcce4f9..aac2851bd7 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/RockyTarPit.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/RockyTarPit.java
@@ -37,7 +37,7 @@ public class RockyTarPit extends mage.sets.mirage.RockyTarPit {
 
     public RockyTarPit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 69;
+        this.cardNumber = "69";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/RunedServitor.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/RunedServitor.java
index 9def3c5dff..93a265c9ee 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/RunedServitor.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/RunedServitor.java
@@ -37,7 +37,7 @@ public class RunedServitor extends mage.sets.riseoftheeldrazi.RunedServitor {
 
     public RunedServitor(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 66;
+        this.cardNumber = "66";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ScuteMob.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ScuteMob.java
index 5e469dcb1d..edd0a77875 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/ScuteMob.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/ScuteMob.java
@@ -37,7 +37,7 @@ public class ScuteMob extends mage.sets.zendikar.ScuteMob {
 
     public ScuteMob(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 22;
+        this.cardNumber = "22";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/SeersSundial.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/SeersSundial.java
index f62a7e72f9..1d910ea654 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/SeersSundial.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/SeersSundial.java
@@ -37,7 +37,7 @@ public class SeersSundial extends mage.sets.worldwake.SeersSundial {
 
     public SeersSundial(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 29;
+        this.cardNumber = "29";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Smother.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Smother.java
index be12e7e00e..4374ca057e 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/Smother.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/Smother.java
@@ -37,7 +37,7 @@ public class Smother extends mage.sets.worldwake.Smother {
 
     public Smother(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 57;
+        this.cardNumber = "57";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/StirringWildwood.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/StirringWildwood.java
index 10277a1dc7..f7ceaf2a1b 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/StirringWildwood.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/StirringWildwood.java
@@ -37,7 +37,7 @@ public class StirringWildwood extends mage.sets.worldwake.StirringWildwood {
 
     public StirringWildwood(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 33;
+        this.cardNumber = "33";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/StoneworkPuma.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/StoneworkPuma.java
index 131308063a..4dbd4bcaa2 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/StoneworkPuma.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/StoneworkPuma.java
@@ -37,7 +37,7 @@ public class StoneworkPuma extends mage.sets.zendikar.StoneworkPuma {
 
     public StoneworkPuma(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 30;
+        this.cardNumber = "30";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TajuruArcher.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TajuruArcher.java
index ee274b7ed7..4c3373b33d 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TajuruArcher.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TajuruArcher.java
@@ -37,7 +37,7 @@ public class TajuruArcher extends mage.sets.zendikar.TajuruArcher {
 
     public TajuruArcher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 23;
+        this.cardNumber = "23";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TerritorialBaloth.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TerritorialBaloth.java
index 3cf3a4057c..0f1527dfc3 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TerritorialBaloth.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TerritorialBaloth.java
@@ -37,7 +37,7 @@ public class TerritorialBaloth extends mage.sets.zendikar.TerritorialBaloth {
 
     public TerritorialBaloth(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 24;
+        this.cardNumber = "24";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TorchSlinger.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TorchSlinger.java
index e3b0961677..134a7b4d48 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TorchSlinger.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TorchSlinger.java
@@ -37,7 +37,7 @@ public class TorchSlinger extends mage.sets.zendikar.TorchSlinger {
 
     public TorchSlinger(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 63;
+        this.cardNumber = "63";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberBasilisk.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberBasilisk.java
index 9cd597887d..2dd6ada336 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberBasilisk.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberBasilisk.java
@@ -37,7 +37,7 @@ public class TurntimberBasilisk extends mage.sets.zendikar.TurntimberBasilisk {
 
     public TurntimberBasilisk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 25;
+        this.cardNumber = "25";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberGrove.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberGrove.java
index ee78b72004..70f98ef14d 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberGrove.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/TurntimberGrove.java
@@ -37,7 +37,7 @@ public class TurntimberGrove extends mage.sets.zendikar.TurntimberGrove {
 
     public TurntimberGrove(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 34;
+        this.cardNumber = "34";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/UlamogsCrusher.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/UlamogsCrusher.java
index d9955f5181..c743a21cd2 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/UlamogsCrusher.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/UlamogsCrusher.java
@@ -37,7 +37,7 @@ public class UlamogsCrusher extends mage.sets.riseoftheeldrazi.UlamogsCrusher {
 
     public UlamogsCrusher(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 44;
+        this.cardNumber = "44";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/VampireNighthawk.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/VampireNighthawk.java
index 62f3c0a0fa..f24a16149a 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/VampireNighthawk.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/VampireNighthawk.java
@@ -37,7 +37,7 @@ public class VampireNighthawk extends mage.sets.zendikar.VampireNighthawk {
 
     public VampireNighthawk(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 58;
+        this.cardNumber = "58";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/WildheartInvoker.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/WildheartInvoker.java
index a2d95524a8..74fa88966c 100644
--- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/WildheartInvoker.java
+++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/WildheartInvoker.java
@@ -37,7 +37,7 @@ public class WildheartInvoker extends mage.sets.riseoftheeldrazi.WildheartInvoke
 
     public WildheartInvoker(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 26;
+        this.cardNumber = "26";
         this.expansionSetCode = "DDP";
     }
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java
index cf52e083ff..b4b2379e71 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java
@@ -49,14 +49,14 @@ public class DeckValidatorTest extends CardTestPlayerBase {
 
         String name;
         String setCode;
-        int cardNumber;
+        String cardNumber;
 
         int number;
 
         public CardNameAmount(String setCode, int cardNumber, int number) {
             this.name = "";
             this.setCode = setCode;
-            this.cardNumber = cardNumber;
+            this.cardNumber = String.valueOf(cardNumber);
             this.number = number;
         }
 
@@ -77,7 +77,7 @@ public class DeckValidatorTest extends CardTestPlayerBase {
             return setCode;
         }
 
-        public int getCardNumber() {
+        public String getCardNumber() {
             return cardNumber;
         }
 
diff --git a/Mage/src/main/java/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java
index 5befb3d3a5..1dc0eb94e6 100644
--- a/Mage/src/main/java/mage/cards/Card.java
+++ b/Mage/src/main/java/mage/cards/Card.java
@@ -46,7 +46,7 @@ public interface Card extends MageObject {
 
     UUID getOwnerId();
 
-    int getCardNumber();
+    String getCardNumber();
 
     Rarity getRarity();
 
diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java
index 18f7d19208..df2158119d 100644
--- a/Mage/src/main/java/mage/cards/CardImpl.java
+++ b/Mage/src/main/java/mage/cards/CardImpl.java
@@ -71,7 +71,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
     private static final Logger logger = Logger.getLogger(CardImpl.class);
 
     protected UUID ownerId;
-    protected int cardNumber;
+    protected String cardNumber;
     public String expansionSetCode;
     protected String tokenSetCode;
     protected Rarity rarity;
@@ -86,10 +86,14 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
     protected boolean morphCard;
 
     public CardImpl(UUID ownerId, int cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs) {
+        this(ownerId, String.valueOf(cardNumber), name, rarity, cardTypes, costs, SpellAbilityType.BASE);
+    }
+
+    public CardImpl(UUID ownerId, String cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs) {
         this(ownerId, cardNumber, name, rarity, cardTypes, costs, SpellAbilityType.BASE);
     }
 
-    public CardImpl(UUID ownerId, int cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs, SpellAbilityType spellAbilityType) {
+    public CardImpl(UUID ownerId, String cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs, SpellAbilityType spellAbilityType) {
         this(ownerId, name);
         this.rarity = rarity;
         this.cardNumber = cardNumber;
@@ -183,7 +187,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
     }
 
     @Override
-    public int getCardNumber() {
+    public String getCardNumber() {
         return cardNumber;
     }
 
diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java
index 4cd380b3fb..0ddb5a8828 100644
--- a/Mage/src/main/java/mage/cards/Sets.java
+++ b/Mage/src/main/java/mage/cards/Sets.java
@@ -163,10 +163,10 @@ public class Sets extends HashMap<String, ExpansionSet> {
             }
 
             for (Map.Entry<String, DeckCardInfo> entry: deckCards.entrySet()) {
-                out.printf("%d [%s:%d] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName());
+                out.printf("%d [%s:%s] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName());
             }
             for (Map.Entry<String, DeckCardInfo> entry: sideboard.entrySet()) {
-                out.printf("SB: %d [%s:%d] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName());
+                out.printf("SB: %d [%s:%s] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName());
             }
         }
         finally {
diff --git a/Mage/src/main/java/mage/cards/SplitCard.java b/Mage/src/main/java/mage/cards/SplitCard.java
index 9c8b93a4f3..94a9f25eee 100644
--- a/Mage/src/main/java/mage/cards/SplitCard.java
+++ b/Mage/src/main/java/mage/cards/SplitCard.java
@@ -50,6 +50,10 @@ public abstract class SplitCard extends CardImpl {
     protected Card rightHalfCard;
 
     public SplitCard(UUID ownerId, int cardNumber, String nameLeft, String nameRight, Rarity rarity, CardType[] cardTypes, String costsLeft, String costsRight, boolean fused) {
+        this(ownerId, String.valueOf(cardNumber), nameLeft, nameRight, rarity, cardTypes, costsLeft, costsRight, fused);
+    }
+
+    public SplitCard(UUID ownerId, String cardNumber, String nameLeft, String nameRight, Rarity rarity, CardType[] cardTypes, String costsLeft, String costsRight, boolean fused) {
         super(ownerId, cardNumber, new StringBuilder(nameLeft).append(" // ").append(nameRight).toString(), rarity, cardTypes, costsLeft + costsRight, (fused ? SpellAbilityType.SPLIT_FUSED : SpellAbilityType.SPLIT));
         leftHalfCard = new SplitCardHalfImpl(this.getOwnerId(), this.getCardNumber(), nameLeft, this.rarity, cardTypes, costsLeft, this, SpellAbilityType.SPLIT_LEFT);
         rightHalfCard = new SplitCardHalfImpl(this.getOwnerId(), this.getCardNumber(), nameRight, this.rarity, cardTypes, costsRight, this, SpellAbilityType.SPLIT_RIGHT);
diff --git a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java
index bc807755fc..60abba999c 100644
--- a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java
+++ b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java
@@ -21,7 +21,7 @@ public class SplitCardHalfImpl extends CardImpl implements SplitCardHalf {
 
     SplitCard splitCardParent;
 
-    public SplitCardHalfImpl(UUID ownerId, int cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs, SplitCard splitCardParent, SpellAbilityType spellAbilityType) {
+    public SplitCardHalfImpl(UUID ownerId, String cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs, SplitCard splitCardParent, SpellAbilityType spellAbilityType) {
         super(ownerId, cardNumber, name, rarity, cardTypes, costs, spellAbilityType);
         this.splitCardParent = splitCardParent;
     }
@@ -47,7 +47,7 @@ public class SplitCardHalfImpl extends CardImpl implements SplitCardHalf {
     }
 
     @Override
-    public int getCardNumber() {
+    public String getCardNumber() {
         return splitCardParent.getCardNumber();
     }
 
diff --git a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java
index 0d1b2fc040..7b90094667 100644
--- a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java
+++ b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java
@@ -41,6 +41,10 @@ import mage.cards.CardImpl;
 public abstract class BasicLand extends CardImpl {
 
     public BasicLand(UUID ownerId, int cardNumber, String name, ManaAbility mana) {
+        this(ownerId, String.valueOf(cardNumber), name, mana);
+    }
+
+    public BasicLand(UUID ownerId, String cardNumber, String name, ManaAbility mana) {
         super(ownerId, cardNumber, name, Rarity.LAND, new CardType[]{CardType.LAND}, null);
         this.supertype.add("Basic");
         this.subtype.add(name);
diff --git a/Mage/src/main/java/mage/cards/basiclands/Forest.java b/Mage/src/main/java/mage/cards/basiclands/Forest.java
index 59e9eb593d..abecdb2a85 100644
--- a/Mage/src/main/java/mage/cards/basiclands/Forest.java
+++ b/Mage/src/main/java/mage/cards/basiclands/Forest.java
@@ -38,6 +38,10 @@ import mage.abilities.mana.GreenManaAbility;
 public abstract class Forest extends BasicLand {
 
     public Forest(UUID ownerId, int cardNumber) {
+        this(ownerId, String.valueOf(cardNumber));
+    }
+
+    public Forest(UUID ownerId, String cardNumber) {
         super(ownerId, cardNumber, "Forest", new GreenManaAbility());
     }
 
diff --git a/Mage/src/main/java/mage/cards/basiclands/Island.java b/Mage/src/main/java/mage/cards/basiclands/Island.java
index 0f57585e79..74d53377ea 100644
--- a/Mage/src/main/java/mage/cards/basiclands/Island.java
+++ b/Mage/src/main/java/mage/cards/basiclands/Island.java
@@ -38,6 +38,10 @@ import mage.abilities.mana.BlueManaAbility;
 public abstract class Island extends BasicLand {
 
     public Island(UUID ownerId, int cardNumber) {
+        this(ownerId, String.valueOf(cardNumber));
+    }
+
+    public Island(UUID ownerId, String cardNumber) {
         super(ownerId, cardNumber, "Island", new BlueManaAbility());
     }
 
diff --git a/Mage/src/main/java/mage/cards/basiclands/Mountain.java b/Mage/src/main/java/mage/cards/basiclands/Mountain.java
index dafe5949e1..3616be6cb7 100644
--- a/Mage/src/main/java/mage/cards/basiclands/Mountain.java
+++ b/Mage/src/main/java/mage/cards/basiclands/Mountain.java
@@ -38,6 +38,10 @@ import mage.abilities.mana.RedManaAbility;
 public abstract class Mountain extends BasicLand {
 
     public Mountain(UUID ownerId, int cardNumber) {
+        this(ownerId, String.valueOf(cardNumber));
+    }
+
+    public Mountain(UUID ownerId, String cardNumber) {
         super(ownerId, cardNumber, "Mountain", new RedManaAbility());
     }
 
diff --git a/Mage/src/main/java/mage/cards/basiclands/Plains.java b/Mage/src/main/java/mage/cards/basiclands/Plains.java
index 04cb214dfb..a69f349656 100644
--- a/Mage/src/main/java/mage/cards/basiclands/Plains.java
+++ b/Mage/src/main/java/mage/cards/basiclands/Plains.java
@@ -38,6 +38,10 @@ import mage.abilities.mana.WhiteManaAbility;
 public abstract class Plains extends BasicLand {
 
     public Plains(UUID ownerId, int cardNumber) {
+        this(ownerId, String.valueOf(cardNumber));
+    }
+
+    public Plains(UUID ownerId, String cardNumber) {
         super(ownerId, cardNumber, "Plains", new WhiteManaAbility());
     }
 
diff --git a/Mage/src/main/java/mage/cards/basiclands/Swamp.java b/Mage/src/main/java/mage/cards/basiclands/Swamp.java
index 3317ae8847..d6df027b69 100644
--- a/Mage/src/main/java/mage/cards/basiclands/Swamp.java
+++ b/Mage/src/main/java/mage/cards/basiclands/Swamp.java
@@ -38,6 +38,10 @@ import mage.abilities.mana.BlackManaAbility;
 public abstract class Swamp extends BasicLand {
 
     public Swamp(UUID ownerId, int cardNumber) {
+        this(ownerId, String.valueOf(cardNumber));
+    }
+
+    public Swamp(UUID ownerId, String cardNumber) {
         super(ownerId, cardNumber, "Swamp", new BlackManaAbility());
     }
 
diff --git a/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java b/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java
index 5c2cc229b0..65a6216c35 100644
--- a/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java
+++ b/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java
@@ -38,14 +38,14 @@ public class DeckCardInfo implements Serializable {
 
     private String cardName;
     private String setCode;
-    private int cardNum;
+    private String cardNum;
     private int quantity;
 
-    public DeckCardInfo(String cardName, int cardNum, String setCode) {
+    public DeckCardInfo(String cardName, String cardNum, String setCode) {
         this(cardName, cardNum, setCode, 1);
     }
 
-    public DeckCardInfo(String cardName, int cardNum, String setCode, int quantity) {
+    public DeckCardInfo(String cardName, String cardNum, String setCode, int quantity) {
         this.cardName = cardName;
         this.cardNum = cardNum;
         this.setCode = setCode;
@@ -60,7 +60,7 @@ public class DeckCardInfo implements Serializable {
         return setCode;
     }
 
-    public int getCardNum() {
+    public String getCardNum() {
         return cardNum;
     }
 
diff --git a/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java
index e53c65f358..24adc25b3d 100644
--- a/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java
+++ b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java
@@ -40,7 +40,7 @@ import mage.cards.repository.CardRepository;
  */
 public class DckDeckImporter extends DeckImporter {
 
-    private static final Pattern pattern = Pattern.compile("(SB:)?\\s*(\\d*)\\s*\\[([a-zA-Z0-9]{2,5}):(\\d*)\\].*");
+    private static final Pattern pattern = Pattern.compile("(SB:)?\\s*(\\d*)\\s*\\[([a-zA-Z0-9]{2,5}):([0-9]*[a-z]*)\\].*");
 
     @Override
     protected void readLine(String line, DeckCardLists deckList) {
@@ -57,7 +57,7 @@ public class DckDeckImporter extends DeckImporter {
             }
             int count = Integer.parseInt(m.group(2));
             String setCode = m.group(3);
-            int cardNum = Integer.parseInt(m.group(4));
+            String cardNum = m.group(4);
 
             DeckCardInfo deckCardInfo = null;
             CardInfo cardInfo = CardRepository.instance.findCard(setCode, cardNum);
diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java
index 1174e5056d..6b2e157642 100644
--- a/Mage/src/main/java/mage/cards/repository/CardInfo.java
+++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java
@@ -60,7 +60,7 @@ public class CardInfo {
     @DatabaseField(indexName = "name_index")
     protected String name;
     @DatabaseField(indexName = "setCode_cardNumber_index")
-    protected int cardNumber;
+    protected String cardNumber;
     @DatabaseField(indexName = "setCode_cardNumber_index")
     protected String setCode;
     @DatabaseField(unique = true, indexName = "className_index")
@@ -295,7 +295,7 @@ public class CardInfo {
         return className;
     }
 
-    public int getCardNumber() {
+    public String getCardNumber() {
         return cardNumber;
     }
 
diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java
index fe9f3f061d..6f0b2e7885 100644
--- a/Mage/src/main/java/mage/cards/repository/CardRepository.java
+++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java
@@ -61,9 +61,9 @@ public enum CardRepository {
     private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
     private static final String VERSION_ENTITY_NAME = "card";
     // raise this if db structure was changed
-    private static final long CARD_DB_VERSION = 43;
+    private static final long CARD_DB_VERSION = 44;
     // raise this if new cards were added to the server
-    private static final long CARD_CONTENT_VERSION = 54;
+    private static final long CARD_CONTENT_VERSION = 55;
 
     private final Random random = new Random();
     private Dao<CardInfo, Object> cardDao;
@@ -273,7 +273,7 @@ public enum CardRepository {
         return landTypes;
     }
 
-    public CardInfo findCard(String setCode, int cardNumber) {
+    public CardInfo findCard(String setCode, String cardNumber) {
         try {
             QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder();
             queryBuilder.where().eq("setCode", new SelectArg(setCode)).and().eq("cardNumber", cardNumber).and().eq("nightCard", false);
diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java
index a7497bb4c5..7319a51a11 100644
--- a/Mage/src/main/java/mage/game/permanent/Permanent.java
+++ b/Mage/src/main/java/mage/game/permanent/Permanent.java
@@ -91,7 +91,7 @@ public interface Permanent extends Card, Controllable {
 
     void setRenowned(boolean value);
 
-    void setCardNumber(int cid);
+    void setCardNumber(String cid);
 
     void setExpansionSetCode(String expansionSetCode);
 
diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
index 16a1726137..5f8f776318 100644
--- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
@@ -1365,7 +1365,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
     }
 
     @Override
-    public void setCardNumber(int cid) {
+    public void setCardNumber(String cid) {
         this.cardNumber = cid;
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java
index 984f9a7e88..c79011f507 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Token.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Token.java
@@ -53,7 +53,7 @@ public class Token extends MageObjectImpl {
     private final ArrayList<UUID> lastAddedTokenIds = new ArrayList<>();
     private UUID lastAddedTokenId;
     private int tokenType;
-    private int originalCardNumber;
+    private String originalCardNumber;
     private String originalExpansionSetCode;
     private boolean expansionSetCodeChecked;
     private Card copySourceCard; // the card the Token is a copy from
@@ -235,11 +235,11 @@ public class Token extends MageObjectImpl {
         this.tokenType = tokenType;
     }
 
-    public int getOriginalCardNumber() {
+    public String getOriginalCardNumber() {
         return originalCardNumber;
     }
 
-    public void setOriginalCardNumber(int originalCardNumber) {
+    public void setOriginalCardNumber(String originalCardNumber) {
         this.originalCardNumber = originalCardNumber;
     }
 
diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java
index d747ac38a7..e6252d91ed 100644
--- a/Mage/src/main/java/mage/game/stack/Spell.java
+++ b/Mage/src/main/java/mage/game/stack/Spell.java
@@ -732,7 +732,7 @@ public class Spell extends StackObjImpl implements Card {
     }
 
     @Override
-    public int getCardNumber() {
+    public String getCardNumber() {
         return card.getCardNumber();
     }